Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com>
On 20/06/18 22:27, Alejandro Piñeiro wrote:
From: Neil Roberts <nrobe...@igalia.com> Sets var->driver.location if the uniform was found from a previous stage. --- Hi Timothy, thanks for the review of the original patch. Recently we found that we missed a little thing (one line). As we didn't push it to master yet, could you take a look to this change, so we could include it now? BR src/compiler/glsl/gl_nir_link_uniforms.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c index a8ebde73270..d3a39577177 100644 --- a/src/compiler/glsl/gl_nir_link_uniforms.c +++ b/src/compiler/glsl/gl_nir_link_uniforms.c @@ -419,6 +419,7 @@ gl_nir_link_uniforms(struct gl_context *ctx, uniform = find_previous_uniform_storage(prog, var->data.location); if (uniform) { uniform->active_shader_mask |= 1 << shader_type; + var->data.location = uniform - prog->data->UniformStorage;continue;}
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
