diff options
| author | Marta Lofstedt <[email protected]> | 2016-01-08 14:55:55 +0100 |
|---|---|---|
| committer | Marta Lofstedt <[email protected]> | 2016-01-19 13:08:42 +0100 |
| commit | 2bcacc69b9935f073e271527771b4fb42081dcb6 (patch) | |
| tree | 92b61190ce1f63add318ac4b8cf1c69db431dfb3 /src/mesa | |
| parent | d018619d7f52b9a72d7c010d4afb70653d674f12 (diff) | |
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 <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/bufferobj.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 26f873bc9a9..8ede1f06e4e 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 c71e16a1e56..c2bf2951687 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1744,6 +1744,10 @@ vertex_array_vertex_buffer(struct gl_context *ctx, } else if (buffer != 0) { vbo = _mesa_lookup_bufferobj(ctx, buffer); + if (!vbo && _mesa_is_gles31(ctx)) { + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-gen name)", func); + return; + } /* From the GL_ARB_vertex_attrib_array spec: * * "[Core profile only:] |