[Mesa-dev] [PATCH 22/23] mesa: refactor GetUniformIndices

Tapani Pälli tapani.palli at intel.com
Fri Mar 13 01:38:08 PDT 2015


Use _mesa_program_resource_index to get indices.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
 src/mesa/main/uniforms.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index 0c16641..f4de1df 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);
    }
 }
 
-- 
2.1.0



More information about the mesa-dev mailing list