diff options
| author | Ian Romanick <[email protected]> | 2013-06-10 10:33:59 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-06-12 16:30:06 -0700 |
| commit | 5097f358419c067a71e96e39764b3bb0a716bdbb (patch) | |
| tree | 5b84db82f7a16836baf6018ca397ae180f1e75f4 /src/mesa/main/uniform_query.cpp | |
| parent | 4cce4efaa38e95c121343565de5e517345d6a9dd (diff) | |
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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-and-tested-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/main/uniform_query.cpp')
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index ec3104936e4..296f80f17bf 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -235,7 +235,7 @@ validate_uniform_parameters(struct gl_context *ctx, return false; } - _mesa_uniform_split_location_offset(location, loc, array_index); + _mesa_uniform_split_location_offset(shProg, location, loc, array_index); if (*loc >= shProg->NumUserUniformStorage) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", |