mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-09 04:38:03 +02:00
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>
This commit is contained in:
parent
e0e4d77f01
commit
9367ade331
3 changed files with 46 additions and 1 deletions
|
|
@ -364,9 +364,32 @@ _mesa_GetProgramResourceLocation(GLuint program, GLenum programInterface,
|
||||||
return _mesa_program_resource_location(shProg, programInterface, name);
|
return _mesa_program_resource_location(shProg, programInterface, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns output index for dual source blending.
|
||||||
|
*/
|
||||||
GLint GLAPIENTRY
|
GLint GLAPIENTRY
|
||||||
_mesa_GetProgramResourceLocationIndex(GLuint program, GLenum programInterface,
|
_mesa_GetProgramResourceLocationIndex(GLuint program, GLenum programInterface,
|
||||||
const GLchar *name)
|
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);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -821,3 +821,21 @@ _mesa_program_resource_location(struct gl_shader_program *shProg,
|
||||||
|
|
||||||
return program_resource_location(shProg, res, name);
|
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;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -248,6 +248,10 @@ extern GLint
|
||||||
_mesa_program_resource_location(struct gl_shader_program *shProg,
|
_mesa_program_resource_location(struct gl_shader_program *shProg,
|
||||||
GLenum interface, const char *name);
|
GLenum interface, const char *name);
|
||||||
|
|
||||||
|
extern GLint
|
||||||
|
_mesa_program_resource_location_index(struct gl_shader_program *shProg,
|
||||||
|
GLenum interface, const char *name);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue