diff options
| author | Kevin DeKorte <kdekorte@gmail.com> | 2009-07-17 14:43:42 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-07-17 14:43:42 -0400 |
| commit | 79a170108f1d9cad949cd2a34e4de597beae72db (patch) | |
| tree | 5fb20919e64a5727ca3e65f2acf7deb218dff684 | |
| parent | c4ab08a0cdddd05f53810490f4ded5838acd1217 (diff) | |
R6xx/r7xx: warning fixes
patch from Kevin DeKorte with some minor fixes from me.
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_emit.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_texstate.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_clear.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common_context.c | 4 |
5 files changed, 11 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_context.h b/src/mesa/drivers/dri/r600/r600_context.h index 7957be6e0d7..bcb33e1386f 100644 --- a/src/mesa/drivers/dri/r600/r600_context.h +++ b/src/mesa/drivers/dri/r600/r600_context.h @@ -49,6 +49,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/colormac.h" #include "r700_chip.h" +#include "r600_tex.h" +#include "r700_oglprog.h" struct r600_context; typedef struct r600_context context_t; diff --git a/src/mesa/drivers/dri/r600/r600_emit.h b/src/mesa/drivers/dri/r600/r600_emit.h index d3c9ef59eb3..661774d11ea 100644 --- a/src/mesa/drivers/dri/r600/r600_emit.h +++ b/src/mesa/drivers/dri/r600/r600_emit.h @@ -41,6 +41,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r600_cmdbuf.h" #include "radeon_reg.h" +void r600EmitCacheFlush(context_t *rmesa); + extern GLboolean r600EmitShader(GLcontext * ctx, void ** shaderbo, GLvoid * data, diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c index f56cc970d40..2466aa95950 100644 --- a/src/mesa/drivers/dri/r600/r600_texstate.c +++ b/src/mesa/drivers/dri/r600/r600_texstate.c @@ -49,6 +49,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_mipmap_tree.h" #include "r600_tex.h" +void r600UpdateTextureState(GLcontext * ctx); + void r600UpdateTextureState(GLcontext * ctx) { context_t *context = R700_CONTEXT(ctx); diff --git a/src/mesa/drivers/dri/r600/r700_clear.c b/src/mesa/drivers/dri/r600/r700_clear.c index 46a70103635..e84be386221 100644 --- a/src/mesa/drivers/dri/r600/r700_clear.c +++ b/src/mesa/drivers/dri/r600/r700_clear.c @@ -37,6 +37,7 @@ #include "r700_shaderinst.h" #include "r600_emit.h" +#include "r700_clear.h" static GLboolean r700ClearFast(context_t *context, GLbitfield mask) { diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index bbe7225ee6c..285e015c924 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c @@ -46,6 +46,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "swrast_setup/swrast_setup.h" #include "tnl/tnl.h" +#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R600) /* +r6/r7 */ +#include "r600_context.h" +#endif + #define DRIVER_DATE "20090101" #ifndef RADEON_DEBUG |