summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_cb_texture.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/state_tracker/st_cb_texture.c')
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c23
1 files changed, 0 insertions, 23 deletions
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
}