From 81c72a1dabe72ebe6a875bd048d2d7a676716cbf Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 29 Dec 2009 22:56:32 -0700 Subject: [PATCH] mesa: plug in GL_EXT_draw_buffers2 functions --- src/mesa/main/api_exec.c | 8 ++++++++ src/mesa/main/dlist.c | 14 ++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index 1559984f43a..6c3c98994aa 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -746,4 +746,12 @@ _mesa_init_exec_table(struct _glapi_table *exec) /* GL_ARB_vertex_array_object */ SET_BindVertexArray(exec, _mesa_BindVertexArray); SET_GenVertexArrays(exec, _mesa_GenVertexArrays); + + /* GL_EXT_draw_buffers2 */ + SET_ColorMaskIndexedEXT(exec, _mesa_ColorMaskIndexed); + SET_GetBooleanIndexedvEXT(exec, _mesa_GetBooleanIndexedv); + SET_GetIntegerIndexedvEXT(exec, _mesa_GetIntegerIndexedv); + SET_EnableIndexedEXT(exec, _mesa_EnableIndexed); + SET_DisableIndexedEXT(exec, _mesa_DisableIndexed); + SET_IsEnabledIndexedEXT(exec, _mesa_IsEnabledIndexed); } diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index d3090b4a3b8..9347b973290 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -1951,7 +1951,7 @@ save_DisableIndexed(GLuint index, GLenum cap) n[2].e = cap; } if (ctx->ExecuteFlag) { - /*CALL_DisableIndexedEXT(ctx->Exec, (index, cap));*/ + CALL_DisableIndexedEXT(ctx->Exec, (index, cap)); } } @@ -2026,7 +2026,7 @@ save_EnableIndexed(GLuint index, GLenum cap) n[2].e = cap; } if (ctx->ExecuteFlag) { - /*CALL_EnableIndexed(ctx->Exec, (index, cap));*/ + CALL_EnableIndexedEXT(ctx->Exec, (index, cap)); } } @@ -6832,7 +6832,7 @@ execute_list(GLcontext *ctx, GLuint list) CALL_Disable(ctx->Exec, (n[1].e)); break; case OPCODE_DISABLE_INDEXED: - /*CALL_DisableIndexed(ctx->Exec, (n[1].ui, n[2].e));*/ + CALL_DisableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e)); break; case OPCODE_DRAW_BUFFER: CALL_DrawBuffer(ctx->Exec, (n[1].e)); @@ -6850,7 +6850,7 @@ execute_list(GLcontext *ctx, GLuint list) CALL_Enable(ctx->Exec, (n[1].e)); break; case OPCODE_ENABLE_INDEXED: - /*CALL_EnableIndexed(ctx->Exec, (n[1].ui, n[2].e));*/ + CALL_EnableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e)); break; case OPCODE_EVALMESH1: CALL_EvalMesh1(ctx->Exec, (n[1].e, n[2].i, n[3].i)); @@ -8621,13 +8621,11 @@ _mesa_init_save_table(struct _glapi_table *table) SET_DepthMask(table, save_DepthMask); SET_DepthRange(table, save_DepthRange); SET_Disable(table, save_Disable); - /*SET_DisableIndexed(table, save_DisableIndexed);*/ - (void) save_DisableIndexed; + SET_DisableIndexedEXT(table, save_DisableIndexed); SET_DrawBuffer(table, save_DrawBuffer); SET_DrawPixels(table, save_DrawPixels); SET_Enable(table, save_Enable); - /*SET_EnableIndexed(table, save_EnableIndexed);*/ - (void) save_EnableIndexed; + SET_EnableIndexedEXT(table, save_EnableIndexed); SET_EndList(table, _mesa_EndList); SET_EvalMesh1(table, save_EvalMesh1); SET_EvalMesh2(table, save_EvalMesh2); -- 2.30.2