diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/program/prog_parameter.c | 30 | ||||
| -rw-r--r-- | src/mesa/program/prog_parameter.h | 5 | 
2 files changed, 0 insertions, 35 deletions
| diff --git a/src/mesa/program/prog_parameter.c b/src/mesa/program/prog_parameter.c index 7e01f675d3..b3770f83b5 100644 --- a/src/mesa/program/prog_parameter.c +++ b/src/mesa/program/prog_parameter.c @@ -284,36 +284,6 @@ _mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList,     return pos;  } - -/** - * Add a uniform to the parameter list. - * Note that if the uniform is an array, size may be greater than - * what's implied by the datatype. - * \param name  uniform's name - * \param size  number of floats to allocate - * \param datatype  GL_FLOAT_VEC3, GL_FLOAT_MAT4, etc. - */ -GLint -_mesa_add_uniform(struct gl_program_parameter_list *paramList, -                  const char *name, GLuint size, GLenum datatype, -                  const GLfloat *values) -{ -   GLint i = _mesa_lookup_parameter_index(paramList, -1, name); -   ASSERT(datatype != GL_NONE); -   if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_UNIFORM) { -      ASSERT(paramList->Parameters[i].Size == size); -      ASSERT(paramList->Parameters[i].DataType == datatype); -      /* already in list */ -      return i; -   } -   else { -      i = _mesa_add_parameter(paramList, PROGRAM_UNIFORM, name, -                              size, datatype, values, NULL, 0x0); -      return i; -   } -} - -  /**   * Add a sampler to the parameter list.   * \param name  uniform's name diff --git a/src/mesa/program/prog_parameter.h b/src/mesa/program/prog_parameter.h index 5381a6dc0f..b3b11a9536 100644 --- a/src/mesa/program/prog_parameter.h +++ b/src/mesa/program/prog_parameter.h @@ -131,11 +131,6 @@ _mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList,                             GLuint *swizzleOut);  extern GLint -_mesa_add_uniform(struct gl_program_parameter_list *paramList, -                  const char *name, GLuint size, GLenum datatype, -                  const GLfloat *values); - -extern GLint  _mesa_add_sampler(struct gl_program_parameter_list *paramList,                    const char *name, GLenum datatype, int array_length); | 
