st/glsl: set req_local_mem earlier for compute shaders
authorTimothy Arceri <tarceri@itsqueeze.com>
Mon, 5 Feb 2018 04:45:32 +0000 (15:45 +1100)
committerTimothy Arceri <tarceri@itsqueeze.com>
Tue, 13 Feb 2018 03:43:05 +0000 (14:43 +1100)
Without this change it will never be set for backends using nir.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/mesa/state_tracker/st_program.c

index 03f5ce4753b43c13ac97474ca56d1afd67833d2a..5bf76e1b8886f159135afb33a5dbc194a5b99841 100644 (file)
@@ -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;