From: Brian <brian@yutani.localnet.net>
Date: Wed, 18 Apr 2007 22:48:55 +0000 (-0600)
Subject: comments, assertions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b3027e291baf6a7dc5e63780d05f89753a13d74;p=mesa.git

comments, assertions
---

diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index a01a6456fb6..9e3d3fecf22 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -274,7 +274,6 @@ _mesa_add_uniform(struct gl_program_parameter_list *paramList,
    else {
       i = _mesa_add_parameter(paramList, PROGRAM_UNIFORM, name,
                               size, datatype, NULL, NULL);
-                              
       return i;
    }
 }
@@ -291,11 +290,13 @@ _mesa_add_sampler(struct gl_program_parameter_list *paramList,
 {
    GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
    if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_SAMPLER) {
+      ASSERT(paramList->Parameters[i].Size == 1);
+      ASSERT(paramList->Parameters[i].DataType == datatype);
       /* already in list */
       return i;
    }
    else {
-      const GLint size = 1;
+      const GLint size = 1; /* a sampler is basically a texture unit number */
       i = _mesa_add_parameter(paramList, PROGRAM_SAMPLER, name,
                               size, datatype, NULL, NULL);
       return i;