mesa: Branch 'master' - 7 commits
Brian Paul
brianp at kemper.freedesktop.org
Wed Apr 18 23:14:15 UTC 2007
src/mesa/shader/prog_parameter.c | 66 ++++++++++++++++-----
src/mesa/shader/prog_parameter.h | 11 ++-
src/mesa/shader/shader_api.c | 61 ++++++++++++++------
src/mesa/shader/slang/slang_codegen.c | 11 +--
src/mesa/shader/slang/slang_compile_variable.c | 68 ----------------------
src/mesa/shader/slang/slang_link.c | 4 -
src/mesa/shader/slang/slang_typeinfo.c | 76 +++++++++++++++++++++++++
src/mesa/shader/slang/slang_typeinfo.h | 2
8 files changed, 190 insertions(+), 109 deletions(-)
New commits:
diff-tree 6b3027e291baf6a7dc5e63780d05f89753a13d74 (from 8d370fb2eee702e1ba2c622716645d450272549a)
Author: Brian <brian at yutani.localnet.net>
Date: Wed Apr 18 16:48:55 2007 -0600
comments, assertions
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index a01a645..9e3d3fe 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_para
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_para
{
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;
diff-tree 8d370fb2eee702e1ba2c622716645d450272549a (from 36a6a59972857676108c4ee72e677734848d3056)
Author: Brian <brian at yutani.localnet.net>
Date: Wed Apr 18 16:46:53 2007 -0600
new comments
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 7f17be7..a01a645 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -251,6 +251,14 @@ _mesa_add_unnamed_constant(struct gl_pro
}
+/**
+ * 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)
@@ -272,6 +280,11 @@ _mesa_add_uniform(struct gl_program_para
}
+/**
+ * Add a sampler to the parameter list.
+ * \param name uniform's name
+ * \param datatype GL_SAMPLER_2D, GL_SAMPLER_2D_RECT_ARB, etc.
+ */
GLint
_mesa_add_sampler(struct gl_program_parameter_list *paramList,
const char *name, GLenum datatype)
diff-tree 36a6a59972857676108c4ee72e677734848d3056 (from addd03da2e254d16088171012c9ca0d157b0d4c2)
Author: Brian <brian at yutani.localnet.net>
Date: Wed Apr 18 16:44:02 2007 -0600
record proper datatypes for uniforms/samplers
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index d8c06f0..2f7002c 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2817,11 +2817,10 @@ _slang_codegen_global_variable(slang_ass
struct gl_program *prog = A->program;
const char *varName = (char *) var->a_name;
GLboolean success = GL_TRUE;
- GLint texIndex;
slang_ir_storage *store = NULL;
int dbg = 0;
-
- texIndex = sampler_to_texture_index(var->type.specifier.type);
+ const GLenum datatype = _slang_gltype_from_specifier(&var->type.specifier);
+ const GLint texIndex = sampler_to_texture_index(var->type.specifier.type);
if (texIndex != -1) {
/* Texture sampler:
@@ -2829,8 +2828,8 @@ _slang_codegen_global_variable(slang_ass
* store->Index = sampler uniform location
* store->Size = texture type index (1D, 2D, 3D, cube, etc)
*/
- GLenum datatype = GL_SAMPLER_2D;
- GLint samplerUniform = _mesa_add_sampler(prog->Parameters, varName, datatype);
+ GLint samplerUniform
+ = _mesa_add_sampler(prog->Parameters, varName, datatype);
store = _slang_new_ir_storage(PROGRAM_SAMPLER, samplerUniform, texIndex);
if (dbg) printf("SAMPLER ");
}
@@ -2840,7 +2839,6 @@ _slang_codegen_global_variable(slang_ass
* MAX2(var->array_len, 1);
if (prog) {
/* user-defined uniform */
- GLenum datatype = GL_FLOAT_VEC4; /* XXX */
GLint uniformLoc = _mesa_add_uniform(prog->Parameters, varName,
size, datatype);
store = _slang_new_ir_storage(PROGRAM_UNIFORM, uniformLoc, size);
diff-tree addd03da2e254d16088171012c9ca0d157b0d4c2 (from c93e883b205a679aa80f6228459890f9118ad909)
Author: Brian <brian at yutani.localnet.net>
Date: Wed Apr 18 16:43:40 2007 -0600
added _slang_gltype_from_specifier()
diff --git a/src/mesa/shader/slang/slang_compile_variable.c b/src/mesa/shader/slang/slang_compile_variable.c
index 664fd9b..6632da9 100644
--- a/src/mesa/shader/slang/slang_compile_variable.c
+++ b/src/mesa/shader/slang/slang_compile_variable.c
@@ -337,71 +337,3 @@ _slang_locate_variable(const slang_varia
return _slang_locate_variable(scope->outer_scope, a_name, 1);
return NULL;
}
-
-#if 0
-static GLenum
-gl_type_from_specifier(const slang_type_specifier * type)
-{
- switch (type->type) {
- case SLANG_SPEC_BOOL:
- return GL_BOOL_ARB;
- case SLANG_SPEC_BVEC2:
- return GL_BOOL_VEC2_ARB;
- case SLANG_SPEC_BVEC3:
- return GL_BOOL_VEC3_ARB;
- case SLANG_SPEC_BVEC4:
- return GL_BOOL_VEC4_ARB;
- case SLANG_SPEC_INT:
- return GL_INT;
- case SLANG_SPEC_IVEC2:
- return GL_INT_VEC2_ARB;
- case SLANG_SPEC_IVEC3:
- return GL_INT_VEC3_ARB;
- case SLANG_SPEC_IVEC4:
- return GL_INT_VEC4_ARB;
- case SLANG_SPEC_FLOAT:
- return GL_FLOAT;
- case SLANG_SPEC_VEC2:
- return GL_FLOAT_VEC2_ARB;
- case SLANG_SPEC_VEC3:
- return GL_FLOAT_VEC3_ARB;
- case SLANG_SPEC_VEC4:
- return GL_FLOAT_VEC4_ARB;
- case SLANG_SPEC_MAT2:
- return GL_FLOAT_MAT2_ARB;
- case SLANG_SPEC_MAT3:
- return GL_FLOAT_MAT3_ARB;
- case SLANG_SPEC_MAT4:
- return GL_FLOAT_MAT4_ARB;
- case SLANG_SPEC_MAT23:
- return GL_FLOAT_MAT2x3_ARB;
- case SLANG_SPEC_MAT32:
- return GL_FLOAT_MAT3x2_ARB;
- case SLANG_SPEC_MAT24:
- return GL_FLOAT_MAT2x4_ARB;
- case SLANG_SPEC_MAT42:
- return GL_FLOAT_MAT4x2_ARB;
- case SLANG_SPEC_MAT34:
- return GL_FLOAT_MAT3x4_ARB;
- case SLANG_SPEC_MAT43:
- return GL_FLOAT_MAT4x3_ARB;
- case SLANG_SPEC_SAMPLER1D:
- return GL_SAMPLER_1D_ARB;
- case SLANG_SPEC_SAMPLER2D:
- return GL_SAMPLER_2D_ARB;
- case SLANG_SPEC_SAMPLER3D:
- return GL_SAMPLER_3D_ARB;
- case SLANG_SPEC_SAMPLERCUBE:
- return GL_SAMPLER_CUBE_ARB;
- case SLANG_SPEC_SAMPLER1DSHADOW:
- return GL_SAMPLER_1D_SHADOW_ARB;
- case SLANG_SPEC_SAMPLER2DSHADOW:
- return GL_SAMPLER_2D_SHADOW_ARB;
- case SLANG_SPEC_ARRAy:
- return gl_type_from_specifier(type->_array);
- default:
- return GL_FLOAT;
- }
-}
-#endif
-
diff --git a/src/mesa/shader/slang/slang_typeinfo.c b/src/mesa/shader/slang/slang_typeinfo.c
index 2af8eb7..957c302 100644
--- a/src/mesa/shader/slang/slang_typeinfo.c
+++ b/src/mesa/shader/slang/slang_typeinfo.c
@@ -944,3 +944,79 @@ _slang_type_dim(slang_type_specifier_typ
return 0;
}
}
+
+
+/**
+ * Return the GL_* type that corresponds to a SLANG_SPEC_* type.
+ */
+GLenum
+_slang_gltype_from_specifier(const slang_type_specifier *type)
+{
+ switch (type->type) {
+ case SLANG_SPEC_BOOL:
+ return GL_BOOL;
+ case SLANG_SPEC_BVEC2:
+ return GL_BOOL_VEC2;
+ case SLANG_SPEC_BVEC3:
+ return GL_BOOL_VEC3;
+ case SLANG_SPEC_BVEC4:
+ return GL_BOOL_VEC4;
+ case SLANG_SPEC_INT:
+ return GL_INT;
+ case SLANG_SPEC_IVEC2:
+ return GL_INT_VEC2;
+ case SLANG_SPEC_IVEC3:
+ return GL_INT_VEC3;
+ case SLANG_SPEC_IVEC4:
+ return GL_INT_VEC4;
+ case SLANG_SPEC_FLOAT:
+ return GL_FLOAT;
+ case SLANG_SPEC_VEC2:
+ return GL_FLOAT_VEC2;
+ case SLANG_SPEC_VEC3:
+ return GL_FLOAT_VEC3;
+ case SLANG_SPEC_VEC4:
+ return GL_FLOAT_VEC4;
+ case SLANG_SPEC_MAT2:
+ return GL_FLOAT_MAT2;
+ case SLANG_SPEC_MAT3:
+ return GL_FLOAT_MAT3;
+ case SLANG_SPEC_MAT4:
+ return GL_FLOAT_MAT4;
+ case SLANG_SPEC_MAT23:
+ return GL_FLOAT_MAT2x3;
+ case SLANG_SPEC_MAT32:
+ return GL_FLOAT_MAT3x2;
+ case SLANG_SPEC_MAT24:
+ return GL_FLOAT_MAT2x4;
+ case SLANG_SPEC_MAT42:
+ return GL_FLOAT_MAT4x2;
+ case SLANG_SPEC_MAT34:
+ return GL_FLOAT_MAT3x4;
+ case SLANG_SPEC_MAT43:
+ return GL_FLOAT_MAT4x3;
+ case SLANG_SPEC_SAMPLER1D:
+ return GL_SAMPLER_1D;
+ case SLANG_SPEC_SAMPLER2D:
+ return GL_SAMPLER_2D;
+ case SLANG_SPEC_SAMPLER3D:
+ return GL_SAMPLER_3D;
+ case SLANG_SPEC_SAMPLERCUBE:
+ return GL_SAMPLER_CUBE;
+ case SLANG_SPEC_SAMPLER1DSHADOW:
+ return GL_SAMPLER_1D_SHADOW;
+ case SLANG_SPEC_SAMPLER2DSHADOW:
+ return GL_SAMPLER_2D_SHADOW;
+ case SLANG_SPEC_SAMPLER2DRECT:
+ return GL_SAMPLER_2D_RECT_ARB;
+ case SLANG_SPEC_SAMPLER2DRECTSHADOW:
+ return GL_SAMPLER_2D_RECT_SHADOW_ARB;
+ case SLANG_SPEC_ARRAY:
+ return _slang_gltype_from_specifier(type->_array);
+ case SLANG_SPEC_STRUCT:
+ /* fall-through */
+ default:
+ return GL_NONE;
+ }
+}
+
diff --git a/src/mesa/shader/slang/slang_typeinfo.h b/src/mesa/shader/slang/slang_typeinfo.h
index ffffd09..587331e 100644
--- a/src/mesa/shader/slang/slang_typeinfo.h
+++ b/src/mesa/shader/slang/slang_typeinfo.h
@@ -196,5 +196,7 @@ _slang_type_base(slang_type_specifier_ty
extern GLuint
_slang_type_dim(slang_type_specifier_type);
+extern GLenum
+_slang_gltype_from_specifier(const slang_type_specifier *type);
#endif
diff-tree c93e883b205a679aa80f6228459890f9118ad909 (from 274ac7a801766a0ae766219ec6a40ed52e479d07)
Author: Brian <brian at yutani.localnet.net>
Date: Wed Apr 18 16:27:35 2007 -0600
Start fixing some issues with uniform variables and their types.
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index e2f1047..7f17be7 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -81,7 +81,7 @@ _mesa_free_parameter_list(struct gl_prog
GLint
_mesa_add_parameter(struct gl_program_parameter_list *paramList,
enum register_file type, const char *name,
- GLuint size, const GLfloat *values,
+ GLuint size, GLenum datatype, const GLfloat *values,
const gl_state_index state[STATE_LENGTH])
{
const GLuint oldNum = paramList->NumParameters;
@@ -126,6 +126,7 @@ _mesa_add_parameter(struct gl_program_pa
p->Name = name ? _mesa_strdup(name) : NULL;
p->Type = type;
p->Size = size;
+ p->DataType = datatype;
if (values) {
COPY_4V(paramList->ParameterValues[oldNum + i], values);
values += 4;
@@ -156,7 +157,7 @@ _mesa_add_named_parameter(struct gl_prog
const char *name, const GLfloat values[4])
{
return _mesa_add_parameter(paramList, PROGRAM_NAMED_PARAM, name,
- 4, values, NULL);
+ 4, GL_NONE, values, NULL);
}
@@ -187,7 +188,7 @@ _mesa_add_named_constant(struct gl_progr
#endif
size = 4; /** XXX fix */
return _mesa_add_parameter(paramList, PROGRAM_CONSTANT, name,
- size, values, NULL);
+ size, GL_NONE, values, NULL);
}
@@ -239,7 +240,7 @@ _mesa_add_unnamed_constant(struct gl_pro
/* add a new parameter to store this constant */
pos = _mesa_add_parameter(paramList, PROGRAM_CONSTANT, NULL,
- size, values, NULL);
+ size, GL_NONE, values, NULL);
if (pos >= 0 && swizzleOut) {
if (size == 1)
*swizzleOut = SWIZZLE_XXXX;
@@ -252,16 +253,19 @@ _mesa_add_unnamed_constant(struct gl_pro
GLint
_mesa_add_uniform(struct gl_program_parameter_list *paramList,
- const char *name, GLuint size)
+ const char *name, GLuint size, GLenum datatype)
{
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, NULL, NULL);
+ size, datatype, NULL, NULL);
return i;
}
@@ -270,7 +274,7 @@ _mesa_add_uniform(struct gl_program_para
GLint
_mesa_add_sampler(struct gl_program_parameter_list *paramList,
- const char *name)
+ const char *name, GLenum datatype)
{
GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_SAMPLER) {
@@ -280,7 +284,7 @@ _mesa_add_sampler(struct gl_program_para
else {
const GLint size = 1;
i = _mesa_add_parameter(paramList, PROGRAM_SAMPLER, name,
- size, NULL, NULL);
+ size, datatype, NULL, NULL);
return i;
}
}
@@ -301,7 +305,7 @@ _mesa_add_varying(struct gl_program_para
else {
assert(size == 4);
i = _mesa_add_parameter(paramList, PROGRAM_VARYING, name,
- size, NULL, NULL);
+ size, GL_NONE, NULL, NULL);
return i;
}
}
@@ -330,7 +334,7 @@ _mesa_add_attribute(struct gl_program_pa
if (size < 0)
size = 4;
i = _mesa_add_parameter(paramList, PROGRAM_INPUT, name,
- size, NULL, state);
+ size, GL_NONE, NULL, state);
}
return i;
}
@@ -396,7 +400,8 @@ _mesa_add_state_reference(struct gl_prog
name = _mesa_program_state_string(stateTokens);
index = _mesa_add_parameter(paramList, PROGRAM_STATE_VAR, name,
- size, NULL, (gl_state_index *) stateTokens);
+ size, GL_NONE,
+ NULL, (gl_state_index *) stateTokens);
paramList->StateFlags |= _mesa_program_state_flags(stateTokens);
/* free name string here since we duplicated it in add_parameter() */
@@ -565,8 +570,8 @@ _mesa_clone_parameter_list(const struct
for (i = 0; i < list->NumParameters; i++) {
struct gl_program_parameter *p = list->Parameters + i;
GLuint size = MIN2(p->Size, 4);
- GLint j = _mesa_add_parameter(clone, p->Type, p->Name,
- size, list->ParameterValues[i], NULL);
+ GLint j = _mesa_add_parameter(clone, p->Type, p->Name, size, p->DataType,
+ list->ParameterValues[i], NULL);
ASSERT(j >= 0);
/* copy state indexes */
if (p->Type == PROGRAM_STATE_VAR) {
diff --git a/src/mesa/shader/prog_parameter.h b/src/mesa/shader/prog_parameter.h
index 2e0feb9..09ff851 100644
--- a/src/mesa/shader/prog_parameter.h
+++ b/src/mesa/shader/prog_parameter.h
@@ -46,6 +46,7 @@ struct gl_program_parameter
{
const char *Name; /**< Null-terminated string */
enum register_file Type; /**< PROGRAM_NAMED_PARAM, CONSTANT or STATE_VAR */
+ GLenum DataType; /**< GL_FLOAT, GL_FLOAT_VEC2, etc */
GLuint Size; /**< Number of components (1..4) */
/**
* A sequence of STATE_* tokens and integers to identify GL state.
@@ -80,7 +81,7 @@ _mesa_clone_parameter_list(const struct
extern GLint
_mesa_add_parameter(struct gl_program_parameter_list *paramList,
enum register_file type, const char *name,
- GLuint size, const GLfloat *values,
+ GLuint size, GLenum datatype, const GLfloat *values,
const gl_state_index state[STATE_LENGTH]);
extern GLint
@@ -99,11 +100,11 @@ _mesa_add_unnamed_constant(struct gl_pro
extern GLint
_mesa_add_uniform(struct gl_program_parameter_list *paramList,
- const char *name, GLuint size);
+ const char *name, GLuint size, GLenum datatype);
extern GLint
_mesa_add_sampler(struct gl_program_parameter_list *paramList,
- const char *name);
+ const char *name, GLenum datatype);
extern GLint
_mesa_add_varying(struct gl_program_parameter_list *paramList,
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 74bdef0..418ef5c 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -638,12 +638,8 @@ _mesa_get_active_uniform(GLcontext *ctx,
GLsizei maxLength, GLsizei *length, GLint *size,
GLenum *type, GLchar *nameOut)
{
- static const GLenum vec_types[] = {
- GL_FLOAT, GL_FLOAT_VEC2, GL_FLOAT_VEC3, GL_FLOAT_VEC4
- };
struct gl_shader_program *shProg
= _mesa_lookup_shader_program(ctx, program);
- GLint sz;
GLuint ind, j;
if (!shProg) {
@@ -664,11 +660,10 @@ _mesa_get_active_uniform(GLcontext *ctx,
/* found it */
copy_string(nameOut, maxLength, length,
shProg->Uniforms->Parameters[j].Name);
- sz = shProg->Uniforms->Parameters[j].Size;
if (size)
- *size = sz;
+ *size = shProg->Uniforms->Parameters[j].Size;
if (type)
- *type = vec_types[sz-1]; /* XXX this is a temporary hack */
+ *type = shProg->Uniforms->Parameters[j].DataType;
return;
}
ind++;
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 06bceea..d8c06f0 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2829,7 +2829,8 @@ _slang_codegen_global_variable(slang_ass
* store->Index = sampler uniform location
* store->Size = texture type index (1D, 2D, 3D, cube, etc)
*/
- GLint samplerUniform = _mesa_add_sampler(prog->Parameters, varName);
+ GLenum datatype = GL_SAMPLER_2D;
+ GLint samplerUniform = _mesa_add_sampler(prog->Parameters, varName, datatype);
store = _slang_new_ir_storage(PROGRAM_SAMPLER, samplerUniform, texIndex);
if (dbg) printf("SAMPLER ");
}
@@ -2839,7 +2840,9 @@ _slang_codegen_global_variable(slang_ass
* MAX2(var->array_len, 1);
if (prog) {
/* user-defined uniform */
- GLint uniformLoc = _mesa_add_uniform(prog->Parameters, varName, size);
+ GLenum datatype = GL_FLOAT_VEC4; /* XXX */
+ GLint uniformLoc = _mesa_add_uniform(prog->Parameters, varName,
+ size, datatype);
store = _slang_new_ir_storage(PROGRAM_UNIFORM, uniformLoc, size);
}
else {
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 360af09..48c0d68 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -202,10 +202,10 @@ link_uniform_vars(struct gl_shader_progr
j = _mesa_add_state_reference(shProg->Uniforms, p->StateIndexes);
break;
case PROGRAM_UNIFORM:
- j = _mesa_add_uniform(shProg->Uniforms, p->Name, p->Size);
+ j = _mesa_add_uniform(shProg->Uniforms, p->Name, p->Size, p->DataType);
break;
case PROGRAM_SAMPLER:
- j = _mesa_add_sampler(shProg->Uniforms, p->Name);
+ j = _mesa_add_sampler(shProg->Uniforms, p->Name, p->DataType);
break;
default:
_mesa_problem(NULL, "bad parameter type in link_uniform_vars()");
diff-tree 274ac7a801766a0ae766219ec6a40ed52e479d07 (from aaa57412c1a682730f27f08bd89a79b8b81f982f)
Author: Brian <brian at yutani.localnet.net>
Date: Wed Apr 18 16:05:53 2007 -0600
Fix some bugs related to querying active uniforms.
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index fe90ca6..e2f1047 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -605,3 +605,20 @@ _mesa_longest_parameter_name(const struc
return maxLen;
}
+
+/**
+ * Count the number of parameters in the last that match the given type.
+ */
+GLuint
+_mesa_num_parameters_of_type(const struct gl_program_parameter_list *list,
+ enum register_file type)
+{
+ GLuint i, count = 0;
+ if (list) {
+ for (i = 0; i < list->NumParameters; i++) {
+ if (list->Parameters[i].Type == type)
+ count++;
+ }
+ }
+ return count;
+}
diff --git a/src/mesa/shader/prog_parameter.h b/src/mesa/shader/prog_parameter.h
index 879623b..2e0feb9 100644
--- a/src/mesa/shader/prog_parameter.h
+++ b/src/mesa/shader/prog_parameter.h
@@ -134,5 +134,9 @@ extern GLuint
_mesa_longest_parameter_name(const struct gl_program_parameter_list *list,
enum register_file type);
+extern GLuint
+_mesa_num_parameters_of_type(const struct gl_program_parameter_list *list,
+ enum register_file type);
+
#endif /* PROG_PARAMETER_H */
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index a8ca7d6..74bdef0 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -38,6 +38,7 @@
#include "glheader.h"
#include "context.h"
#include "hash.h"
+#include "macros.h"
#include "program.h"
#include "prog_parameter.h"
#include "prog_print.h"
@@ -643,6 +644,7 @@ _mesa_get_active_uniform(GLcontext *ctx,
struct gl_shader_program *shProg
= _mesa_lookup_shader_program(ctx, program);
GLint sz;
+ GLuint ind, j;
if (!shProg) {
_mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform");
@@ -654,13 +656,26 @@ _mesa_get_active_uniform(GLcontext *ctx,
return;
}
- copy_string(nameOut, maxLength, length,
- shProg->Uniforms->Parameters[index].Name);
- sz = shProg->Uniforms->Parameters[index].Size;
- if (size)
- *size = sz;
- if (type)
- *type = vec_types[sz]; /* XXX this is a temporary hack */
+ ind = 0;
+ for (j = 0; j < shProg->Uniforms->NumParameters; j++) {
+ if (shProg->Uniforms->Parameters[j].Type == PROGRAM_UNIFORM ||
+ shProg->Uniforms->Parameters[j].Type == PROGRAM_SAMPLER) {
+ if (ind == index) {
+ /* found it */
+ copy_string(nameOut, maxLength, length,
+ shProg->Uniforms->Parameters[j].Name);
+ sz = shProg->Uniforms->Parameters[j].Size;
+ if (size)
+ *size = sz;
+ if (type)
+ *type = vec_types[sz-1]; /* XXX this is a temporary hack */
+ return;
+ }
+ ind++;
+ }
+ }
+
+ _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform(index)");
}
@@ -774,13 +789,20 @@ _mesa_get_programiv(GLcontext *ctx, GLui
*params = shProg->Attributes ? shProg->Attributes->NumParameters : 0;
break;
case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:
- *params = _mesa_longest_parameter_name(shProg->Attributes, PROGRAM_INPUT);
+ *params = _mesa_longest_parameter_name(shProg->Attributes,
+ PROGRAM_INPUT) + 1;
break;
case GL_ACTIVE_UNIFORMS:
- *params = shProg->Uniforms ? shProg->Uniforms->NumParameters : 0;
+ *params
+ = _mesa_num_parameters_of_type(shProg->Uniforms, PROGRAM_UNIFORM)
+ + _mesa_num_parameters_of_type(shProg->Uniforms, PROGRAM_SAMPLER);
break;
case GL_ACTIVE_UNIFORM_MAX_LENGTH:
- *params = _mesa_longest_parameter_name(shProg->Uniforms, PROGRAM_UNIFORM);
+ *params = MAX2(
+ _mesa_longest_parameter_name(shProg->Uniforms, PROGRAM_UNIFORM),
+ _mesa_longest_parameter_name(shProg->Uniforms, PROGRAM_SAMPLER));
+ if (*params > 0)
+ (*params)++; /* add one for terminating zero */
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
diff-tree aaa57412c1a682730f27f08bd89a79b8b81f982f (from 2a2f8d806f74619f0a7cf97fdc7f7b3ad1cad81b)
Author: Brian <brian at yutani.localnet.net>
Date: Wed Apr 18 15:22:43 2007 -0600
fix error strings, add a sanity check
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 0c4f483..a8ca7d6 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -575,6 +575,18 @@ _mesa_detach_shader(GLcontext *ctx, GLui
shProg->Shaders = newList;
shProg->NumShaders = n - 1;
+
+#ifdef DEBUG
+ /* sanity check */
+ {
+ for (j = 0; j < shProg->NumShaders; j++) {
+ assert(shProg->Shaders[j]->Type == GL_VERTEX_SHADER ||
+ shProg->Shaders[j]->Type == GL_FRAGMENT_SHADER);
+ assert(shProg->Shaders[j]->RefCount > 0);
+ }
+ }
+#endif
+
return;
}
}
@@ -598,12 +610,12 @@ _mesa_get_active_attrib(GLcontext *ctx,
GLint sz;
if (!shProg) {
- _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform");
+ _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib");
return;
}
if (!shProg->Attributes || index >= shProg->Attributes->NumParameters) {
- _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform(index)");
+ _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib(index)");
return;
}
More information about the mesa-commit
mailing list