From bf92350b5b2c8e14515fb8bbfacd8c06502dfb98 Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Mon, 17 Sep 2007 13:22:51 +0100 Subject: Fix linux-dri-x86 build. --- src/mesa/state_tracker/st_atom_vs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mesa/state_tracker/st_atom_vs.c b/src/mesa/state_tracker/st_atom_vs.c index a1e6117bde..289a3e4f46 100644 --- a/src/mesa/state_tracker/st_atom_vs.c +++ b/src/mesa/state_tracker/st_atom_vs.c @@ -72,7 +72,7 @@ static void compile_vs( struct st_context *st ) #if defined(USE_X86_ASM) || defined(SLANG_X86) tgsi_emit_sse2( vp->vs.tokens, - &vp->vs.sse2_program ); + &vp->sse2_program ); #endif vp->dirty = 0; @@ -106,7 +106,7 @@ static void update_vs( struct st_context *st ) compile_vs( st ); #if defined(USE_X86_ASM) || defined(SLANG_X86) - vs.executable = (void *) x86_get_func( &vp->sse2_program ); + st->vp->vs.executable = (void *) x86_get_func( &vp->sse2_program ); #endif st->state.vs = st->vp->vs; -- cgit v1.2.3 From 5578f8ce3bf349107b04fb0ebb8b8d505bd9424d Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Mon, 17 Sep 2007 18:02:46 +0100 Subject: Remove non-meaningful region_idle() interface This is already handled by the semanics of map(), etc. --- src/mesa/pipe/failover/fo_context.c | 1 - src/mesa/pipe/i915simple/i915_regions.c | 6 ------ src/mesa/pipe/p_context.h | 2 -- src/mesa/pipe/softpipe/sp_region.c | 7 ------- src/mesa/state_tracker/st_cb_texture.c | 23 ----------------------- 5 files changed, 39 deletions(-) (limited to 'src') diff --git a/src/mesa/pipe/failover/fo_context.c b/src/mesa/pipe/failover/fo_context.c index c58fc9cedc..076d516583 100644 --- a/src/mesa/pipe/failover/fo_context.c +++ b/src/mesa/pipe/failover/fo_context.c @@ -139,7 +139,6 @@ struct pipe_context *failover_create( struct pipe_context *hw, failover->pipe.region_alloc = hw->region_alloc; failover->pipe.region_release = hw->region_release; - failover->pipe.region_idle = hw->region_idle; failover->pipe.region_map = hw->region_map; failover->pipe.region_unmap = hw->region_unmap; failover->pipe.region_data = hw->region_data; diff --git a/src/mesa/pipe/i915simple/i915_regions.c b/src/mesa/pipe/i915simple/i915_regions.c index bab256c763..cff90ab5dd 100644 --- a/src/mesa/pipe/i915simple/i915_regions.c +++ b/src/mesa/pipe/i915simple/i915_regions.c @@ -37,11 +37,6 @@ #include "i915_blit.h" -static void -i915_region_idle(struct pipe_context *pipe, struct pipe_region *region) -{ - -} static ubyte * @@ -302,7 +297,6 @@ i915_region_fill(struct pipe_context *pipe, void i915_init_region_functions(struct i915_context *i915) { - i915->pipe.region_idle = i915_region_idle; i915->pipe.region_map = i915_region_map; i915->pipe.region_unmap = i915_region_unmap; i915->pipe.region_alloc = i915_region_alloc; diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h index dafbef410e..ec5555c38e 100644 --- a/src/mesa/pipe/p_context.h +++ b/src/mesa/pipe/p_context.h @@ -182,8 +182,6 @@ struct pipe_context { void (*region_release)(struct pipe_context *pipe, struct pipe_region **r); - void (*region_idle)(struct pipe_context *pipe, struct pipe_region *region); - ubyte *(*region_map)(struct pipe_context *pipe, struct pipe_region *r); void (*region_unmap)(struct pipe_context *pipe, struct pipe_region *r); diff --git a/src/mesa/pipe/softpipe/sp_region.c b/src/mesa/pipe/softpipe/sp_region.c index ae05b1d0de..697b738e43 100644 --- a/src/mesa/pipe/softpipe/sp_region.c +++ b/src/mesa/pipe/softpipe/sp_region.c @@ -48,12 +48,6 @@ round_up(unsigned n, unsigned multiple) } -static void -sp_region_idle(struct pipe_context *pipe, struct pipe_region *region) -{ - -} - static ubyte * sp_region_map(struct pipe_context *pipe, struct pipe_region *region) @@ -283,7 +277,6 @@ sp_region_fill(struct pipe_context *pipe, void sp_init_region_functions(struct softpipe_context *sp) { - sp->pipe.region_idle = sp_region_idle; sp->pipe.region_map = sp_region_map; sp->pipe.region_unmap = sp_region_unmap; sp->pipe.region_alloc = sp_region_alloc; diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 770c871434..3ae9bd9003 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -705,14 +705,6 @@ st_TexImage(GLcontext * ctx, if (!pixels) return; - - if (stImage->mt) - pipe->region_idle(pipe, stImage->mt->region); - -#if 0 - LOCK_HARDWARE(intel); -#endif - if (stImage->mt) { texImage->Data = st_miptree_image_map(pipe, stImage->mt, @@ -766,10 +758,6 @@ st_TexImage(GLcontext * ctx, texImage->Data = NULL; } -#if 0 - UNLOCK_HARDWARE(intel); -#endif - #if 0 /* GL_SGIS_generate_mipmap -- this can be accelerated now. */ @@ -958,13 +946,6 @@ st_TexSubimage(GLcontext * ctx, if (!pixels) return; - if (stImage->mt) - pipe->region_idle(pipe, stImage->mt->region); - -#if 0 - LOCK_HARDWARE(intel); -#endif - /* Map buffer if necessary. Need to lock to prevent other contexts * from uploading the buffer under us. */ @@ -1004,10 +985,6 @@ st_TexSubimage(GLcontext * ctx, st_miptree_image_unmap(pipe, stImage->mt); texImage->Data = NULL; } - -#if 0 - UNLOCK_HARDWARE(intel); -#endif } -- cgit v1.2.3