From 04b443104d4fb65cd9aca692a81382f56ef6514c Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Tue, 20 Feb 2018 17:56:47 +0100 Subject: [PATCH] st/glsl_to_nir: run lower_output_reads on !PIPE_CAP_TGSI_CAN_READ_OUTPUTS this is required for Drivers which don't allow reading from outputs. Reviewed-by: Timothy Arceri Signed-off-by: Karol Herbst --- src/mesa/state_tracker/st_glsl_to_nir.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index d24944c6af5..fc4bba3fb96 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -45,6 +45,7 @@ #include "compiler/glsl/glsl_to_nir.h" #include "compiler/glsl/gl_nir.h" #include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_optimization.h" #include "compiler/glsl/string_to_uint_map.h" @@ -563,6 +564,7 @@ st_nir_get_mesa_program(struct gl_context *ctx, struct gl_linked_shader *shader) { struct st_context *st = st_context(ctx); + struct pipe_screen *pscreen = ctx->st->pipe->screen; struct gl_program *prog; validate_ir_tree(shader->ir); @@ -575,6 +577,10 @@ st_nir_get_mesa_program(struct gl_context *ctx, _mesa_generate_parameters_list_for_uniforms(ctx, shader_program, shader, prog->Parameters); + /* Remove reads from output registers. */ + if (!pscreen->get_param(pscreen, PIPE_CAP_TGSI_CAN_READ_OUTPUTS)) + lower_output_reads(shader->Stage, shader->ir); + if (ctx->_Shader->Flags & GLSL_DUMP) { _mesa_log("\n"); _mesa_log("GLSL IR for linked %s program %d:\n", -- 2.30.2