diff options
| author | Kevin DeKorte <[email protected]> | 2009-07-16 11:57:14 -0400 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2009-07-16 11:57:14 -0400 |
| commit | c42a6163144aa5441262235818b59b3108833a61 (patch) | |
| tree | 66fcba234d70acabb3b168a5f22cfc858c8e2488 /src/mesa | |
| parent | 0850776f1afa69d9db62c3991a36fbc343f75d66 (diff) | |
Warning fixes
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_cmdbuf.c | 15 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_cmdbuf.h | 19 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_clear.c | 1 |
3 files changed, 19 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c b/src/mesa/drivers/dri/r600/r600_cmdbuf.c index ca9dab8639e..74fec02584b 100644 --- a/src/mesa/drivers/dri/r600/r600_cmdbuf.c +++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.c @@ -52,22 +52,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_mipmap_tree.h" #include "radeon_reg.h" -struct r600_cs_manager_legacy -{ - struct radeon_cs_manager base; - struct radeon_context *ctx; - /* hack for scratch stuff */ - uint32_t pending_age; - uint32_t pending_count; -}; -struct r600_cs_reloc_legacy { - struct radeon_cs_reloc base; - uint32_t cindices; - uint32_t *indices; - uint32_t *reloc_indices; - struct offset_modifiers offset_mod; -}; static struct radeon_cs * r600_cs_create(struct radeon_cs_manager *csm, uint32_t ndw) diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.h b/src/mesa/drivers/dri/r600/r600_cmdbuf.h index 6c3ceb38fa6..bd1ed7fdff0 100644 --- a/src/mesa/drivers/dri/r600/r600_cmdbuf.h +++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.h @@ -118,6 +118,23 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define R600_IT_SET_CTL_CONST 0x00006F00 #define R600_IT_SURFACE_BASE_UPDATE 0x00007300 +struct r600_cs_manager_legacy +{ + struct radeon_cs_manager base; + struct radeon_context *ctx; + /* hack for scratch stuff */ + uint32_t pending_age; + uint32_t pending_count; +}; + +struct r600_cs_reloc_legacy { + struct radeon_cs_reloc base; + uint32_t cindices; + uint32_t *indices; + uint32_t *reloc_indices; + struct offset_modifiers offset_mod; +}; + extern int r600_cs_write_reloc(struct radeon_cs *cs, struct radeon_bo *bo, uint32_t read_domain, @@ -130,6 +147,8 @@ static inline void r600_cs_write_dword(struct radeon_cs *cs, uint32_t dword) cs->packets[cs->cdw++] = dword; } +struct radeon_cs_manager * r600_radeon_cs_manager_legacy_ctor(struct radeon_context *ctx); + /** * Write one dword to the command buffer. */ diff --git a/src/mesa/drivers/dri/r600/r700_clear.c b/src/mesa/drivers/dri/r600/r700_clear.c index e484845cc6c..46a70103635 100644 --- a/src/mesa/drivers/dri/r600/r700_clear.c +++ b/src/mesa/drivers/dri/r600/r700_clear.c @@ -63,7 +63,6 @@ void r700Clear(GLcontext * ctx, GLbitfield mask) { return; } - if (!context->radeon.radeonScreen->driScreen->dri2.enabled) { LOCK_HARDWARE(&context->radeon); UNLOCK_HARDWARE(&context->radeon); |