Module: Mesa Branch: master Commit: 93d109645a2b3d43b4b0106f2b496ece11970c01 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=93d109645a2b3d43b4b0106f2b496ece11970c01
Author: Ian Romanick <[email protected]> Date: Wed Jul 25 16:17:25 2012 -0700 mesa/es: Validate glMapBuffer access in Mesa code rather than the ES wrapper v2: Add proper core-profile and GLES3 filtering. v3: *Really* add proper core-profile and GLES3 filtering based on review feedback from Eric Anholt. It looks like previously there was some rebase / merge fail. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Eric Anholt <[email protected]> --- src/mesa/main/APIspec.xml | 4 ---- src/mesa/main/bufferobj.c | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml index 3d47624..83a32d8 100644 --- a/src/mesa/main/APIspec.xml +++ b/src/mesa/main/APIspec.xml @@ -1814,10 +1814,6 @@ <param name="target" type="GLenum"/> <param name="access" type="GLenum"/> </proto> - - <desc name="access"> - <value name="GL_WRITE_ONLY_OES"/> - </desc> </template> <template name="UnmapBuffer" direction="get"> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index a5c2a7a..d800a4f 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -1135,20 +1135,29 @@ _mesa_MapBufferARB(GLenum target, GLenum access) struct gl_buffer_object * bufObj; GLbitfield accessFlags; void *map; + bool valid_access; ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL); switch (access) { case GL_READ_ONLY_ARB: accessFlags = GL_MAP_READ_BIT; + valid_access = _mesa_is_desktop_gl(ctx); break; case GL_WRITE_ONLY_ARB: accessFlags = GL_MAP_WRITE_BIT; + valid_access = true; break; case GL_READ_WRITE_ARB: accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT; + valid_access = _mesa_is_desktop_gl(ctx); break; default: + valid_access = false; + break; + } + + if (!valid_access) { _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)"); return NULL; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
