diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-09-17 12:07:29 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-09-17 12:07:29 -0600 |
| commit | 72d7d2bcc34e3d26f1c4de92f1508c9ddffb3421 (patch) | |
| tree | 9609eee41f408efc5850561a72e736df498e2be1 /src/mesa/state_tracker | |
| parent | f48e055c1072ca0f3ce3096606a8d892a559c599 (diff) | |
| parent | 5578f8ce3bf349107b04fb0ebb8b8d505bd9424d (diff) | |
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_vs.c | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 23 |
2 files changed, 2 insertions, 25 deletions
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; 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, @@ -767,10 +759,6 @@ st_TexImage(GLcontext * ctx, } #if 0 - UNLOCK_HARDWARE(intel); -#endif - -#if 0 /* GL_SGIS_generate_mipmap -- this can be accelerated now. */ if (level == texObj->BaseLevel && texObj->GenerateMipmap) { @@ -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 } |