Module: Mesa Branch: master Commit: dbe45e118027d11bc3fabddf7c64a262694b41af URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dbe45e118027d11bc3fabddf7c64a262694b41af
Author: Marek Olšák <[email protected]> Date: Tue Jun 20 01:12:38 2017 +0200 Revert "radeonsi: remove 8 bytes from si_shader_key with uint32_t ff_tcs_inputs_to_copy" This reverts commit 6b6fed3a3c81c2b0d319ef121df20a0dc914705f. Reviewed-by: Nicolai Hähnle <[email protected]> --- src/gallium/drivers/radeonsi/si_shader.c | 8 ++------ src/gallium/drivers/radeonsi/si_shader.h | 3 +-- src/gallium/drivers/radeonsi/si_state_shaders.c | 8 ++------ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 9848ea13f1..47e8389e19 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2493,8 +2493,7 @@ static void si_copy_tcs_inputs(struct lp_build_tgsi_context *bld_base) lds_base = get_tcs_in_current_patch_offset(ctx); lds_base = LLVMBuildAdd(gallivm->builder, lds_base, lds_vertex_offset, ""); - inputs = ctx->shader->key.mono.u.ff_tcs_inputs_to_copy[0] | - ((uint64_t)ctx->shader->key.mono.u.ff_tcs_inputs_to_copy[1] << 32); + inputs = ctx->shader->key.mono.u.ff_tcs_inputs_to_copy; while (inputs) { unsigned i = u_bit_scan64(&inputs); @@ -5320,10 +5319,7 @@ static void si_dump_shader_key(unsigned processor, const struct si_shader *shade "part.tcs.ls_prolog", f); } fprintf(f, " part.tcs.epilog.prim_mode = %u\n", key->part.tcs.epilog.prim_mode); - fprintf(f, " mono.u.ff_tcs_inputs_to_copy[0] = 0x%x\n", - key->mono.u.ff_tcs_inputs_to_copy[0]); - fprintf(f, " mono.u.ff_tcs_inputs_to_copy[1] = 0x%x\n", - key->mono.u.ff_tcs_inputs_to_copy[1]); + fprintf(f, " mono.u.ff_tcs_inputs_to_copy = 0x%"PRIx64"\n", key->mono.u.ff_tcs_inputs_to_copy); break; case PIPE_SHADER_TESS_EVAL: diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 60fe86609b..018bae7006 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -492,8 +492,7 @@ struct si_shader_key { uint8_t vs_fix_fetch[SI_MAX_ATTRIBS]; union { - /* Don't use "uint64_t" in order to get 32-bit alignment. */ - uint32_t ff_tcs_inputs_to_copy[2]; /* for fixed-func TCS */ + uint64_t ff_tcs_inputs_to_copy; /* for fixed-func TCS */ /* When PS needs PrimID and GS is disabled. */ unsigned vs_export_prim_id:1; } u; diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 12eae4cda9..39961e5719 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1280,12 +1280,8 @@ static inline void si_shader_selector_key(struct pipe_context *ctx, key->part.tcs.epilog.tes_reads_tess_factors = sctx->tes_shader.cso->info.reads_tess_factors; - if (sel == sctx->fixed_func_tcs_shader.cso) { - uint64_t outputs_written = sctx->vs_shader.cso->outputs_written; - - key->mono.u.ff_tcs_inputs_to_copy[0] = outputs_written; - key->mono.u.ff_tcs_inputs_to_copy[1] = outputs_written >> 32; - } + if (sel == sctx->fixed_func_tcs_shader.cso) + key->mono.u.ff_tcs_inputs_to_copy = sctx->vs_shader.cso->outputs_written; break; case PIPE_SHADER_TESS_EVAL: if (sctx->gs_shader.cso) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
