st/mesa: switch cs over to shared shader_info

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Timothy Arceri
2016-10-19 12:06:56 +11:00
parent 54095ed8b9
commit 4ca71a1175
2 changed files with 5 additions and 8 deletions
+4 -7
View File
@@ -5861,17 +5861,14 @@ emit_face_var(struct gl_context *ctx, struct st_translate *t)
}
static void
emit_compute_block_size(const struct gl_program *program,
emit_compute_block_size(const struct gl_program *prog,
struct ureg_program *ureg) {
const struct gl_compute_program *cp =
(const struct gl_compute_program *)program;
ureg_property(ureg, TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH,
cp->LocalSize[0]);
prog->info.cs.local_size[0]);
ureg_property(ureg, TGSI_PROPERTY_CS_FIXED_BLOCK_HEIGHT,
cp->LocalSize[1]);
prog->info.cs.local_size[1]);
ureg_property(ureg, TGSI_PROPERTY_CS_FIXED_BLOCK_DEPTH,
cp->LocalSize[2]);
prog->info.cs.local_size[2]);
}
struct sort_inout_decls {
+1 -1
View File
@@ -1686,7 +1686,7 @@ st_translate_compute_program(struct st_context *st,
stcp->tgsi.ir_type = PIPE_SHADER_IR_TGSI;
stcp->tgsi.prog = prog.tokens;
stcp->tgsi.req_local_mem = stcp->Base.SharedSize;
stcp->tgsi.req_local_mem = stcp->Base.Base.info.cs.shared_size;
stcp->tgsi.req_private_mem = 0;
stcp->tgsi.req_input_mem = 0;