Mesa (master): st/glsl: set req_local_mem earlier for compute shaders

Timothy Arceri tarceri at kemper.freedesktop.org
Tue Feb 13 03:45:46 UTC 2018


Module: Mesa
Branch: master
Commit: 94fa090fada8394c8569191b5ebfc46c037f20ba
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94fa090fada8394c8569191b5ebfc46c037f20ba

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Mon Feb  5 15:45:32 2018 +1100

st/glsl: set req_local_mem earlier for compute shaders

Without this change it will never be set for backends using nir.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_program.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 03f5ce4753..5bf76e1b88 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -1654,6 +1654,8 @@ st_translate_compute_program(struct st_context *st,
    struct ureg_program *ureg;
    struct pipe_shader_state prog;
 
+   stcp->tgsi.req_local_mem = stcp->Base.info.cs.shared_size;
+
    if (stcp->shader_program) {
       /* no compute variants: */
       st_finalize_nir(st, &stcp->Base, stcp->shader_program,
@@ -1670,7 +1672,6 @@ st_translate_compute_program(struct st_context *st,
                                PIPE_SHADER_COMPUTE, &prog);
 
    stcp->tgsi.ir_type = PIPE_SHADER_IR_TGSI;
-   stcp->tgsi.req_local_mem = stcp->Base.info.cs.shared_size;
    stcp->tgsi.req_private_mem = 0;
    stcp->tgsi.req_input_mem = 0;
 




More information about the mesa-commit mailing list