On 08/24/2012 01:32 PM, Eric Anholt wrote:
Ian Romanick <[email protected]> writes:
  <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;

This hunk should be in 2/4.

Blarg. This (and the other one) look like rebase / merge fail. I'll fix them both.
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to