From 9ab1332d749e8e7eda2896c25725e245fd0f8444 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Tue, 24 Aug 2010 21:02:22 -0700
Subject: mesa: Remove now-unused _mesa_add_uniform.

We had to inline it to avoid doing a double-lookup in the process of
adding assertion checks.
---
 src/mesa/program/prog_parameter.c | 30 ------------------------------
 src/mesa/program/prog_parameter.h |  5 -----
 2 files changed, 35 deletions(-)

(limited to 'src')

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
@@ -130,11 +130,6 @@ _mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList,
                            const GLfloat values[4], GLuint size,
                            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);
-- 
cgit v1.2.3