swrast: Remove support for GL_NV_vertex_program.

[mesa.git] / src / mesa / program / nvvertparse.c

diff --git a/src/mesa/program/nvvertparse.c b/src/mesa/program/nvvertparse.c
index bdd44a451333b390488d00ad99bc55a5c30afa63..6272c2f7fee3b7f0803a4cdf0e6d9aa1aa6cc6c5 100644 (file)
--- a/src/mesa/program/nvvertparse.c
+++ b/src/mesa/program/nvvertparse.c
@@ -1050,7 +1050,7 @@ Parse_PrintInstruction(struct parse_state *parseState, struct prog_instruction *
    for (len = 0; str[len] != '\''; len++) /* find closing quote */
       ;
    parseState->pos += len + 1;
-   msg = (GLubyte*) malloc(len + 1);
+   msg = malloc(len + 1);
 
    memcpy(msg, str, len);
    msg[len] = 0;
@@ -1293,7 +1293,7 @@ _mesa_parse_nv_vertex_program(struct gl_context *ctx, GLenum dstTarget,
    GLubyte *programString;
 
    /* Make a null-terminated copy of the program string */
-   programString = (GLubyte *) MALLOC(len + 1);
+   programString = malloc(len + 1);
    if (!programString) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
       return;
@@ -1382,14 +1382,10 @@ _mesa_parse_nv_vertex_program(struct gl_context *ctx, GLenum dstTarget,
 
       /* install the program */
       program->Base.Target = target;
-      if (program->Base.String) {
-         free(program->Base.String);
-      }
+      free(program->Base.String);
       program->Base.String = programString;
       program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
-      if (program->Base.Instructions) {
-         free(program->Base.Instructions);
-      }
+      free(program->Base.Instructions);
       program->Base.Instructions = newInst;
       program->Base.InputsRead = parseState.inputsRead;
       if (parseState.isPositionInvariant)
@@ -1424,10 +1420,11 @@ _mesa_parse_nv_vertex_program(struct gl_context *ctx, GLenum dstTarget,
         index = _mesa_add_state_reference(program->Base.Parameters,
                                           state_tokens);
         assert(index == i);
+        (void)index;
       }
       program->Base.NumParameters = program->Base.Parameters->NumParameters;
 
-      _mesa_setup_nv_temporary_count(ctx, &program->Base);
+      _mesa_setup_nv_temporary_count(&program->Base);
       _mesa_emit_nv_temp_initialization(ctx, &program->Base);
    }
    else {