replace color table FloatTable boolean with Type enum

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

diff --git a/src/mesa/main/program.c b/src/mesa/main/program.c
index fe536566304a01b9846162b7a2fda1b6870377d2..6c1e36232212c6dca9a52dd6eb2e55605a4f14e4 100644 (file)
--- a/src/mesa/main/program.c
+++ b/src/mesa/main/program.c
@@ -149,7 +149,6 @@ static struct program * _mesa_init_program_struct( GLcontext *ctx,
       prog->RefCount = 1;
    }
 
-   fprintf(stderr, "%s %x %x\n", __FUNCTION__, target, prog);
    return prog;
 }
 
@@ -189,7 +188,6 @@ struct program * _mesa_init_vertex_program( GLcontext *ctx,
 struct program *
 _mesa_new_program(GLcontext *ctx, GLenum target, GLuint id)
 {
-   fprintf(stderr, "%s\n", __FUNCTION__);
    switch (target) {
    case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
       return _mesa_init_vertex_program( ctx, CALLOC_STRUCT(vertex_program),
@@ -391,6 +389,9 @@ _mesa_lookup_parameter_value(struct program_parameter_list *paramList,
 {
    GLuint i;
 
+   if (!paramList)
+      return NULL;
+
    if (nameLen == -1) {
       /* name is null-terminated */
       for (i = 0; i < paramList->NumParameters; i++) {
@@ -420,6 +421,9 @@ _mesa_lookup_parameter_index(struct program_parameter_list *paramList,
 {
    GLint i;
 
+   if (!paramList)
+      return -1;
+
    if (nameLen == -1) {
       /* name is null-terminated */
       for (i = 0; i < (GLint) paramList->NumParameters; i++) {
@@ -801,6 +805,10 @@ _mesa_load_state_parameters(GLcontext *ctx,
                             struct program_parameter_list *paramList)
 {
    GLuint i;
+
+   if (!paramList)
+      return;
+
    for (i = 0; i < paramList->NumParameters; i++) {
       if (paramList->Parameters[i].Type == STATE) {
          _mesa_fetch_state(ctx, paramList->Parameters[i].StateIndexes,