fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "radeonsi: remove 8 bytes from si_shader_key with uint32_t ff_tcs_inputs_to_copy"

Browse source 
This reverts commit 6b6fed3a3c.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-06-20 01:12:38 +02:00
parent 984f7feeb4
commit dbe45e1180
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -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:

3
src/gallium/drivers/radeonsi/si_shader.h
View file

@ -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;

8
src/gallium/drivers/radeonsi/si_state_shaders.c
View file

@ -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)