summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2006-09-14 12:11:46 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2006-09-14 12:11:46 +0000
commit269219dc05c5d27eb0822198d5707a3925a8d9d9 (patch)
treee210c3969b18f569e88747571ffffddd817a6e07 /src
parent5dbadd418c118731f12ec4ce61d899ec5a180b25 (diff)
Disable zero-copy texturing for now as it isn't such a win with the
newest memory manager code.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i915/intel_tex_image.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_tex_image.c b/src/mesa/drivers/dri/i915/intel_tex_image.c
index a9ff8640ef..af8170970a 100644
--- a/src/mesa/drivers/dri/i915/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i915/intel_tex_image.c
@@ -417,9 +417,12 @@ intelTexImage(GLcontext * ctx,
DBG("trying pbo upload\n");
/* Attempt to texture directly from PBO data (zero copy upload).
- * This is about twice as fast as regular uploads:
+ *
+ * Currently disable as it can lead to worse as well as better
+ * performance (in particular when intel_region_cow() is
+ * required).
*/
- if (intelObj->mt == intelImage->mt &&
+ if (0 && intelObj->mt == intelImage->mt &&
intelObj->mt->first_level == level &&
intelObj->mt->last_level == level) {
@@ -434,7 +437,6 @@ intelTexImage(GLcontext * ctx,
/* Otherwise, attempt to use the blitter for PBO image uploads.
- * This is about 20% faster than regular uploads:
*/
if (try_pbo_upload(intel, intelImage, unpack,
internalFormat,