mesa: Remove support for GL_VERTEX_STATE_PROGRAMs and their execution.

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 0caa7676ee2cab498c663b3d44fb3fcab300f8e3..5a1fcbd18f5624f9b1db0eaaee4fb58444813fbc 100644 (file)
--- 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 4af9fe4d31775818448cf580f8def1e97755f67b..4de4cd36489e0cdecfbc7ee131adbf394fc14199 100644 (file)
--- 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 ad052b58da21ac004aee8e08714b7a8910dcadcf..7bc9dababb5fc3e18cf33d4a0946bb707d4503bd 100644 (file)
--- 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 04e03c1c8a7afa9568f8bc11880cb2270b76b80d..990f007fbc696543ac3a95a294738046acec09da 100644 (file)
--- 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 4d682cb58c3ed3329a84f9f369177faf91eb2c88..2648f241c4de2bc1cf5859cd9567023d07d013b1 100644 (file)
--- 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 6e767b6ef5c5b43b2b2383c556412d8be2de41e2..80fc649f54b43ac07f60d00fa07ff86709df5bee 100644 (file)
--- 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;