From: Ian Romanick <[email protected]> v2: Add proper core-profile and GLES3 filtering.
Signed-off-by: Ian Romanick <[email protected]> --- src/mesa/main/APIspec.xml | 4 ---- src/mesa/main/bufferobj.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 5 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 fb30d1a..6ad0787 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -1039,7 +1039,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, case GL_STATIC_COPY_ARB: case GL_DYNAMIC_READ_ARB: case GL_DYNAMIC_COPY_ARB: - valid_usage = (ctx->API == API_OPENGL); + valid_usage = _mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx); break; default: @@ -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 = (ctx->API == API_OPENGL); 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 = (ctx->API == API_OPENGL); break; default: + valid_access = false; + break; + } + + if (!valid_access) { _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)"); return NULL; } -- 1.7.6.5 _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
