Attachment 120896 Details for Bug 93426 – Patch that solved the problem without piglit regressions

Patch that solved the problem without piglit regressions

0001-mesa-Move-sanity-check-of-BindVertexBuffer-for-OpenG.patch (text/plain), 1.83 KB, created by Marta Löfstedt on 2016-01-08 13:54:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marta Löfstedt

Created: 2016-01-08 13:54:07 UTC

Size: 1.83 KB

patch

obsolete

>From 49c77ff2f9acfe76c9caa7854aedfadbcee144b5 Mon Sep 17 00:00:00 2001
>From: Marta Lofstedt <marta.lofstedt@intel.com>
>Date: Fri, 18 Dec 2015 12:51:55 +0100
>Subject: [PATCH] mesa: Move sanity check of BindVertexBuffer for OpenGL ES 3.1
>
>Sanity check of BindVertexBuffer for OpenGL ES in
>_mesa_handle_bind_buffer_gen breaks OpenGL ES 2 conformance.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93426
>Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
>---
> src/mesa/main/bufferobj.c | 2 +-
> src/mesa/main/varray.c    | 8 +++++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
>index d7c5680..3ca1b3a 100644
>--- a/src/mesa/main/bufferobj.c
>+++ b/src/mesa/main/bufferobj.c
>@@ -953,7 +953,7 @@ _mesa_handle_bind_buffer_gen(struct gl_context *ctx,
> {
>    struct gl_buffer_object *buf = *buf_handle;
> 
>-   if (!buf && (ctx->API == API_OPENGL_CORE || _mesa_is_gles31(ctx))) {
>+   if (!buf && (ctx->API == API_OPENGL_CORE)) {
>       _mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-gen name)", caller);
>       return false;
>    }
>diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
>index c71e16a..a8d757b 100644
>--- a/src/mesa/main/varray.c
>+++ b/src/mesa/main/varray.c
>@@ -1754,8 +1754,14 @@ vertex_array_vertex_buffer(struct gl_context *ctx,
>        * Otherwise, we fall back to the same compat profile behavior as other
>        * object references (automatically gen it).
>        */
>-      if (!_mesa_handle_bind_buffer_gen(ctx, buffer, &vbo, func))
>+      if (!_mesa_handle_bind_buffer_gen(ctx, buffer, &vbo, func)) {
>+          return;
>+      }
>+
>+      if (!vbo && _mesa_is_gles31(ctx)) {
>+         _mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-gen name)", func);
>          return;
>+      }
>    } else {
>       /* The ARB_vertex_attrib_binding spec says:
>        *
>-- 
>2.1.4
>

Actions: View

Attachments on bug 93426: 120583 | 120896

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.