summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2015-03-12 14:08:38 +0200
committerTapani Pälli <tapani.palli@intel.com>2015-04-16 07:55:56 +0300
commit9367ade331e5d0a7724c595e7afb0322caaaddf7 (patch)
tree61aa6e1cd1aa43f858c3d0a854036e5d88179eec /src/mesa
parente0e4d77f0120865b3ca0a4055358fc87d38d1cfe (diff)
downloadexternal_mesa3d-9367ade331e5d0a7724c595e7afb0322caaaddf7.zip
external_mesa3d-9367ade331e5d0a7724c595e7afb0322caaaddf7.tar.gz
external_mesa3d-9367ade331e5d0a7724c595e7afb0322caaaddf7.tar.bz2
mesa: glGetProgramResourceLocationIndex
Patch adds required helper functions to shaderapi.h and the actual implementation. The added functionality can be tested by tests for following functions that are refactored by later patches: GetFragDataIndex v2: return -1 if output not referenced by fragment stage (Ilia Mirkin) Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/program_resource.c25
-rw-r--r--src/mesa/main/shader_query.cpp18
-rw-r--r--src/mesa/main/shaderapi.h4
3 files changed, 46 insertions, 1 deletions
diff --git a/src/mesa/main/program_resource.c b/src/mesa/main/program_resource.c
index ee39f31..9eb4e2f 100644
--- a/src/mesa/main/program_resource.c
+++ b/src/mesa/main/program_resource.c
@@ -364,9 +364,32 @@ _mesa_GetProgramResourceLocation(GLuint program, GLenum programInterface,
return _mesa_program_resource_location(shProg, programInterface, name);
}
+/**
+ * Returns output index for dual source blending.
+ */
GLint GLAPIENTRY
_mesa_GetProgramResourceLocationIndex(GLuint program, GLenum programInterface,
const GLchar *name)
{
- return -1;
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_shader_program *shProg =
+ lookup_linked_program(program, "glGetProgramResourceLocationIndex");
+
+ if (!shProg || !name || invalid_array_element_syntax(name))
+ return -1;
+
+ /* From the GL_ARB_program_interface_query spec:
+ *
+ * "For GetProgramResourceLocationIndex, <programInterface> must be
+ * PROGRAM_OUTPUT."
+ */
+ if (programInterface != GL_PROGRAM_OUTPUT) {
+ _mesa_error(ctx, GL_INVALID_ENUM,
+ "glGetProgramResourceLocationIndex(%s)",
+ _mesa_lookup_enum_by_nr(programInterface));
+ return -1;
+ }
+
+ return _mesa_program_resource_location_index(shProg, GL_PROGRAM_OUTPUT,
+ name);
}
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp
index f50ceb6..8b2281d 100644
--- a/src/mesa/main/shader_query.cpp
+++ b/src/mesa/main/shader_query.cpp
@@ -821,3 +821,21 @@ _mesa_program_resource_location(struct gl_shader_program *shProg,
return program_resource_location(shProg, res, name);
}
+
+/**
+ * Function implements following index queries:
+ * glGetFragDataIndex
+ */
+GLint
+_mesa_program_resource_location_index(struct gl_shader_program *shProg,
+ GLenum interface, const char *name)
+{
+ struct gl_program_resource *res =
+ _mesa_program_resource_find_name(shProg, interface, name);
+
+ /* Non-existent variable or resource is not referenced by fragment stage. */
+ if (!res || !(res->StageReferences & (1 << MESA_SHADER_FRAGMENT)))
+ return -1;
+
+ return RESOURCE_VAR(res)->data.index;
+}
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index 73ebf60..5046018 100644
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -248,6 +248,10 @@ extern GLint
_mesa_program_resource_location(struct gl_shader_program *shProg,
GLenum interface, const char *name);
+extern GLint
+_mesa_program_resource_location_index(struct gl_shader_program *shProg,
+ GLenum interface, const char *name);
+
#ifdef __cplusplus
}
#endif