diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-06-10 10:33:59 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-06-12 16:30:06 -0700 |
| commit | 5097f358419c067a71e96e39764b3bb0a716bdbb (patch) | |
| tree | 5b84db82f7a16836baf6018ca397ae180f1e75f4 /src/mesa/main/uniforms.h | |
| parent | 4cce4efaa38e95c121343565de5e517345d6a9dd (diff) | |
| download | external_mesa3d-5097f358419c067a71e96e39764b3bb0a716bdbb.zip external_mesa3d-5097f358419c067a71e96e39764b3bb0a716bdbb.tar.gz external_mesa3d-5097f358419c067a71e96e39764b3bb0a716bdbb.tar.bz2 | |
glsl: Add a gl_shader_program parameter to _mesa_uniform_{merge,split}_location_offset
This will be used in the next commit.
NOTE: This is a candidate for stable release branches.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'src/mesa/main/uniforms.h')
| -rw-r--r-- | src/mesa/main/uniforms.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 5ebd5e4..d718b0f 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -269,7 +269,8 @@ struct gl_builtin_uniform_desc { * Combine the uniform's base location and the offset */ static inline GLint -_mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset) +_mesa_uniform_merge_location_offset(const struct gl_shader_program *prog, + unsigned base_location, unsigned offset) { return (base_location << 16) | offset; } @@ -278,7 +279,8 @@ _mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset) * Separate the uniform base location and parameter offset */ static inline void -_mesa_uniform_split_location_offset(GLint location, unsigned *base_location, +_mesa_uniform_split_location_offset(const struct gl_shader_program *prog, + GLint location, unsigned *base_location, unsigned *offset) { *offset = location & 0xffff; |