diff options
| author | Paul Berry <stereotype441@gmail.com> | 2013-01-28 14:21:59 -0800 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2013-02-04 10:36:35 -0800 |
| commit | b92900d26a54ef997f2920d6a7371bb7c9caabf8 (patch) | |
| tree | 8d94422c2bfa0284294b2de18233d0033c7581df /src/mesa/main/uniforms.h | |
| parent | 11bd1b0f589bfeab8fcad5c70adf4c8a665eebc9 (diff) | |
| download | external_mesa3d-b92900d26a54ef997f2920d6a7371bb7c9caabf8.zip external_mesa3d-b92900d26a54ef997f2920d6a7371bb7c9caabf8.tar.gz external_mesa3d-b92900d26a54ef997f2920d6a7371bb7c9caabf8.tar.bz2 | |
mesa/glsl: Separate parsing logic from _mesa_get_uniform_location.
The parsing logic is moved to a new function in the GLSL module,
parse_program_resource_name(). This name was chosen because it should
eventually be useful for handling everything that OpenGL 4.3 calls
"program resources" (e.g. uniforms, vertex inputs, fragment outputs,
and transform feedback varyings).
Future patches will make use of this function for linking transform
feedback varyings.
NOTE: This is a candidate for the 9.1 branch.
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/main/uniforms.h')
| -rw-r--r-- | src/mesa/main/uniforms.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index f175031..a12ad9b 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -167,6 +167,10 @@ _mesa_GetActiveUniformsiv(GLuint program, void GLAPIENTRY _mesa_GetUniformiv(GLhandleARB, GLint, GLint *); +long +_mesa_parse_program_resource_name(const GLchar *name, + const GLchar **out_base_name_end); + unsigned _mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg, const GLchar *name, unsigned *offset); |