fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: remove stage ref generation for transform feedback

Browse source 
Stage ref cannot be queried for transform feedback.

Also simplify the build_stageref function by passing the
correct mode for uniforms.

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Timothy Arceri 2015-08-05 21:05:52 +10:00
parent 6dea2456ca
commit 42d283a0cc
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/glsl/linker.cpp
View file

@ -3136,7 +3136,7 @@ build_stageref(struct gl_shader_program *shProg, const char *name,
/* Type needs to match if specified, otherwise we might
* pick a variable with same name but different interface.
*/
if (mode != 0 && var->data.mode != mode)
if (var->data.mode != mode)
continue;
if (strncmp(var->name, name, baselen) == 0) {
@ -3248,12 +3248,9 @@ build_program_resource_list(struct gl_context *ctx,
/* Add transform feedback varyings. */
if (shProg->LinkedTransformFeedback.NumVarying > 0) {
for (int i = 0; i < shProg->LinkedTransformFeedback.NumVarying; i++) {
uint8_t stageref =
build_stageref(shProg,
shProg->LinkedTransformFeedback.Varyings[i].Name, 0);
if (!add_program_resource(shProg, GL_TRANSFORM_FEEDBACK_VARYING,
&shProg->LinkedTransformFeedback.Varyings[i],
stageref))
0))
return;
}
}
@ -3265,7 +3262,8 @@ build_program_resource_list(struct gl_context *ctx,
continue;
uint8_t stageref =
build_stageref(shProg, shProg->UniformStorage[i].name, 0);
build_stageref(shProg, shProg->UniformStorage[i].name,
ir_var_uniform);
/* Add stagereferences for uniforms in a uniform block. */
int block_index = shProg->UniformStorage[i].block_index;