summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-09-08 14:28:19 -0600
committerBrian Paul <[email protected]>2009-09-08 14:33:47 -0600
commit8e8d3470be3b1aae4ede7ccca097a28b0978dd1b (patch)
treef3d0ad5605c5a470393d55031dc8a88597f481a5
parentced699b37a048ea32434c222fcf83235048918bc (diff)
i965: use _mesa_is_bufferobj()
Also, remove unneeded call to _mesa_validate_pbo_access(). It's done by core Mesa as the comment suggested.
-rw-r--r--src/mesa/drivers/dri/intel/intel_pixel_read.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_read.c b/src/mesa/drivers/dri/intel/intel_pixel_read.c
index 8713463ace2..bc67f6242a1 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_read.c
@@ -180,16 +180,7 @@ do_blit_readpixels(GLcontext * ctx,
if (!src)
return GL_FALSE;
- if (pack->BufferObj->Name) {
- /* XXX This validation should be done by core mesa:
- */
- if (!_mesa_validate_pbo_access(2, pack, width, height, 1,
- format, type, pixels)) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawPixels");
- return GL_TRUE;
- }
- }
- else {
+ if (!_mesa_is_bufferobj(pack->BufferObj)) {
/* PBO only for now:
*/
if (INTEL_DEBUG & DEBUG_PIXEL)