summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-09-28 10:02:20 -0600
committerBrian Paul <brianp@vmware.com>2009-09-28 10:02:20 -0600
commit8fda97afb8b7a03415dbca6d83691d2d6461126c (patch)
treed78b55385eed2b37baa4dcc8df8a63bcca95e6ac /src/mesa/drivers
parenteb82373abb08171d7fcb15b5f4f229fc9ca9aa91 (diff)
parenteeb7e04da64fdae3a40b1afdcde71dcded2481f3 (diff)
Merge branch 'mesa_7_6_branch'
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/intel/intel_buffer_objects.c5
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_copy.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index 7f6fb66d52..a0225936c8 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -229,7 +229,10 @@ intel_bufferobj_get_subdata(GLcontext * ctx,
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
assert(intel_obj);
- dri_bo_get_subdata(intel_obj->buffer, offset, size, data);
+ if (intel_obj->sys_buffer)
+ memcpy(data, (char *)intel_obj->sys_buffer + offset, size);
+ else
+ dri_bo_get_subdata(intel_obj->buffer, offset, size, data);
}
diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index ac557a9200..8f467e6514 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@ -75,6 +75,7 @@ get_teximage_source(struct intel_context *intel, GLenum internalFormat)
case GL_RGBA:
case GL_RGBA8:
case GL_RGB:
+ case GL_RGB8:
return intel_readbuf_region(intel);
default:
return NULL;