On 09/05/2012 03:09 PM, Ian Romanick wrote:
From: Ian Romanick <ian.d.roman...@intel.com>
NOTE: This is a candidate for the 9.0 branch
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
Ignore this patch. GL_OES_vertex_array_object is supported, so these
functions should be available. The unit test (added in the last patch)
is just wrong.
---
src/mesa/main/api_exec.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index c217ff7..9a73335 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -532,8 +532,10 @@ _mesa_create_exec_table(struct gl_context *ctx)
SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE);
}
/* Reused by ARB_vertex_array_object / OES_vertex_array_object */
- SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE);
- SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE);
+ if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
+ SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE);
+ SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE);
+ }
/* 282. GL_NV_fragment_program */
#if FEATURE_NV_fragment_program
@@ -820,8 +822,10 @@ _mesa_create_exec_table(struct gl_context *ctx)
}
/* GL_ARB_vertex_array_object / GL_OES_vertex_array_object */
- SET_BindVertexArray(exec, _mesa_BindVertexArray);
- SET_GenVertexArrays(exec, _mesa_GenVertexArrays);
+ if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
+ SET_BindVertexArray(exec, _mesa_BindVertexArray);
+ SET_GenVertexArrays(exec, _mesa_GenVertexArrays);
+ }
/* GL_EXT_draw_buffers2 */
if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
