From cc763f0f3f5558c4ce055e54da6ebd2279009322 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 9 Oct 2012 16:44:41 -0700 Subject: [PATCH] mesa: Remove support for GL_VERTEX_STATE_PROGRAMs and their execution. Reviewed-by: Brian Paul --- src/mesa/main/api_exec.c | 1 - src/mesa/main/arbprogram.c | 1 - src/mesa/main/dlist.c | 33 --------------------------------- src/mesa/main/nvprogram.c | 30 ------------------------------ src/mesa/main/nvprogram.h | 3 --- src/mesa/program/program.c | 1 - 6 files changed, 69 deletions(-) diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index 0caa7676ee2..5a1fcbd18f5 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -476,7 +476,6 @@ _mesa_create_exec_table(struct gl_context *ctx) if (ctx->API == API_OPENGL) { SET_BindProgramNV(exec, _mesa_BindProgram); SET_DeleteProgramsNV(exec, _mesa_DeletePrograms); - SET_ExecuteProgramNV(exec, _mesa_ExecuteProgramNV); SET_GenProgramsNV(exec, _mesa_GenPrograms); SET_AreProgramsResidentNV(exec, _mesa_AreProgramsResidentNV); SET_RequestResidentProgramsNV(exec, _mesa_RequestResidentProgramsNV); diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c index 4af9fe4d317..4de4cd36489 100644 --- a/src/mesa/main/arbprogram.c +++ b/src/mesa/main/arbprogram.c @@ -179,7 +179,6 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids) /* Unbind program if necessary */ switch (prog->Target) { case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */ - case GL_VERTEX_STATE_PROGRAM_NV: if (ctx->VertexProgram.Current && ctx->VertexProgram.Current->Base.Id == ids[i]) { /* unbind this currently bound program */ diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index ad052b58da2..7bc9dababb5 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -321,7 +321,6 @@ typedef enum OPCODE_WINDOW_POS_ARB, /* GL_NV_vertex_program */ OPCODE_BIND_PROGRAM_NV, - OPCODE_EXECUTE_PROGRAM_NV, OPCODE_REQUEST_RESIDENT_PROGRAMS_NV, OPCODE_LOAD_PROGRAM_NV, /* GL_NV_fragment_program */ @@ -4941,27 +4940,6 @@ save_ProgramEnvParameter4dvARB(GLenum target, GLuint index, } -static void GLAPIENTRY -save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params) -{ - GET_CURRENT_CONTEXT(ctx); - Node *n; - ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = alloc_instruction(ctx, OPCODE_EXECUTE_PROGRAM_NV, 6); - if (n) { - n[1].e = target; - n[2].ui = id; - n[3].f = params[0]; - n[4].f = params[1]; - n[5].f = params[2]; - n[6].f = params[3]; - } - if (ctx->ExecuteFlag) { - CALL_ExecuteProgramNV(ctx->Exec, (target, id, params)); - } -} - - static void GLAPIENTRY save_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte * program) @@ -8332,16 +8310,6 @@ execute_list(struct gl_context *ctx, GLuint list) case OPCODE_BIND_PROGRAM_NV: /* GL_NV_vertex_program */ CALL_BindProgramNV(ctx->Exec, (n[1].e, n[2].ui)); break; - case OPCODE_EXECUTE_PROGRAM_NV: - { - GLfloat v[4]; - v[0] = n[3].f; - v[1] = n[4].f; - v[2] = n[5].f; - v[3] = n[6].f; - CALL_ExecuteProgramNV(ctx->Exec, (n[1].e, n[2].ui, v)); - } - break; case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV: CALL_RequestResidentProgramsNV(ctx->Exec, (n[1].ui, (GLuint *) n[2].data)); @@ -10191,7 +10159,6 @@ _mesa_create_save_table(const struct gl_context *ctx) */ SET_BindProgramNV(table, save_BindProgramNV); SET_DeleteProgramsNV(table, _mesa_DeletePrograms); - SET_ExecuteProgramNV(table, save_ExecuteProgramNV); SET_GenProgramsNV(table, _mesa_GenPrograms); SET_AreProgramsResidentNV(table, _mesa_AreProgramsResidentNV); SET_RequestResidentProgramsNV(table, save_RequestResidentProgramsNV); diff --git a/src/mesa/main/nvprogram.c b/src/mesa/main/nvprogram.c index 04e03c1c8a7..990f007fbc6 100644 --- a/src/mesa/main/nvprogram.c +++ b/src/mesa/main/nvprogram.c @@ -51,36 +51,6 @@ #include "program/prog_parameter.h" - -/** - * Execute a vertex state program. - * \note Called from the GL API dispatcher. - */ -void GLAPIENTRY -_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params) -{ - struct gl_vertex_program *vprog; - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); - - if (target != GL_VERTEX_STATE_PROGRAM_NV) { - _mesa_error(ctx, GL_INVALID_ENUM, "glExecuteProgramNV"); - return; - } - - FLUSH_VERTICES(ctx, _NEW_PROGRAM); - - vprog = gl_vertex_program(_mesa_lookup_program(ctx, id)); - - if (!vprog || vprog->Base.Target != GL_VERTEX_STATE_PROGRAM_NV) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glExecuteProgramNV"); - return; - } - - _mesa_problem(ctx, "glExecuteProgramNV() not supported"); -} - - /** * Determine if a set of programs is resident in hardware. * \note Not compiled into display lists. diff --git a/src/mesa/main/nvprogram.h b/src/mesa/main/nvprogram.h index 4d682cb58c3..2648f241c4d 100644 --- a/src/mesa/main/nvprogram.h +++ b/src/mesa/main/nvprogram.h @@ -34,9 +34,6 @@ struct gl_context; struct gl_program; -extern void GLAPIENTRY -_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params); - extern GLboolean GLAPIENTRY _mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids, GLboolean *residences); diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index 6e767b6ef5c..80fc649f54b 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -311,7 +311,6 @@ _mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id) struct gl_program *prog; switch (target) { case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */ - case GL_VERTEX_STATE_PROGRAM_NV: prog = _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program), target, id ); break; -- 2.30.2