summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuanhan Liu <yuanhan.liu@linux.intel.com>2011-10-19 11:20:18 +0800
committerIan Romanick <ian.d.romanick@intel.com>2011-10-24 15:54:31 -0700
commit4b7ad9199054be369707947f0017da9d484f83b7 (patch)
tree16baa59840b65b6c215d7c33b117b973dbf28369
parentcd114ba5038a6704476fdcbfac112441674d582f (diff)
mesa: handle PBO access error in display list mode
Simply generate GL_INVALID_OPERATION error at display list mode. As explained by Brian, we are going to access PBO data at compile time. No need to defer the error at execution time. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 46d5fb576a37bdd50cd4a2795b27852b4c8a8250)
-rw-r--r--src/mesa/main/dlist.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 36b42203cc5..476ecc4148a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -939,7 +939,9 @@ unpack_image(struct gl_context *ctx, GLuint dimensions,
}
return image;
}
+
/* bad access! */
+ _mesa_error(ctx, GL_INVALID_OPERATION, "invalid PBO access");
return NULL;
}