Mesa (7.11): mesa: handle PBO access error in display list mode

Ian Romanick idr at kemper.freedesktop.org
Mon Oct 24 15:54:49 PDT 2011


Module: Mesa
Branch: 7.11
Commit: 4b7ad9199054be369707947f0017da9d484f83b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b7ad9199054be369707947f0017da9d484f83b7

Author: Yuanhan Liu <yuanhan.liu at linux.intel.com>
Date:   Wed Oct 19 11:20:18 2011 +0800

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 at linux.intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 46d5fb576a37bdd50cd4a2795b27852b4c8a8250)

---

 src/mesa/main/dlist.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 36b4220..476ecc4 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;
 }
 



More information about the mesa-commit mailing list