summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTapani Pälli <[email protected]>2015-03-12 14:37:20 +0200
committerTapani Pälli <[email protected]>2015-04-16 07:55:57 +0300
commit1b256eb0ec1f919f23641f8d47d4b2ce126dd1a4 (patch)
tree2b0ab37ea7b28449c1e9c40d95ea518e80e80a6d /src/mesa
parent51313f567d59afd5491e03d1593030066df974eb (diff)
mesa: refactor GetUniformIndices
Use _mesa_program_resource_index to get indices. Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Martin Peres <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/uniforms.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index 0c16641533c..f4de1df4426 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -986,9 +986,9 @@ _mesa_GetUniformIndices(GLuint program,
}
for (i = 0; i < uniformCount; i++) {
- unsigned offset;
- uniformIndices[i] = _mesa_get_uniform_location(shProg,
- uniformNames[i], &offset);
+ struct gl_program_resource *res =
+ _mesa_program_resource_find_name(shProg, GL_UNIFORM, uniformNames[i]);
+ uniformIndices[i] = _mesa_program_resource_index(shProg, res);
}
}