diff options
| author | Ian Romanick <[email protected]> | 2011-11-21 20:47:57 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-11-29 11:14:28 -0800 |
| commit | e6c314f7d2ed99714376fec6b7509a55535fa3ff (patch) | |
| tree | 2c10d5f12ad2c416de6725f05b279346341d6146 /src | |
| parent | 03bbcd447cbaa28b52465ae1045013f1aff420c2 (diff) | |
mesa: Allow generic attributes for glGetActiveAttrib and GL_ACTIVE_ATTRIBUTES
Page 77 (page 91 of the PDF) says about glGetActiveAttrib:
"The returned attribute name can be the name of a generic
attribute or a conventional attribute (which begin with the prefix
"gl_", see the OpenGL Shading Language specification for a
complete list)."
Page 261 (page 275 of the PDF) says about glGetProgramiv:
"If pname is ACTIVE_ATTRIBUTES, the number of active attributes in
program is returned."
It doesn't say anything about built-in vs. user-defined attributes.
From the language around glGetActiveAttrib and the lack of an
exclusion of built-in attributes, which exists other places (e.g.,
around glBindAttribLocation), we can infer that GL_ACTIVE_ATTRIBUTES
should include the active attribute count. It should also be included
in the values returned by glGetActiveAttrib.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43138
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Tested-by: Yi Sun <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/shader_query.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 38bacdb747b..8ab18126c9e 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -107,8 +107,7 @@ _mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index, if (var == NULL || var->mode != ir_var_in - || var->location == -1 - || var->location < VERT_ATTRIB_GENERIC0) + || var->location == -1) continue; if (current_index == desired_index) { @@ -199,8 +198,7 @@ _mesa_count_active_attribs(struct gl_shader_program *shProg) if (var == NULL || var->mode != ir_var_in - || var->location == -1 - || var->location < VERT_ATTRIB_GENERIC0) + || var->location == -1) continue; i++; @@ -226,8 +224,7 @@ _mesa_longest_attribute_name_length(struct gl_shader_program *shProg) if (var == NULL || var->mode != ir_var_in - || var->location == -1 - || var->location < VERT_ATTRIB_GENERIC0) + || var->location == -1) continue; const size_t len = strlen(var->name); |