KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi: remove shader.ps_conservative_z, set db_shader_control instead 

Also set the field on SI too. It's not just specific to CIK.

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Marek Olšák 2014-09-19 16:19:44 +02:00
parent 884f1654e2
commit a34c9f70b1
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/radeonsi/si_shader.c
View File

@ -2818,17 +2818,18 @@ int si_pipe_shader_create(
si_shader_ctx.radeon_bld.load_input = declare_input_fs;
bld_base->emit_epilogue = si_llvm_emit_fs_epilogue;
shader->shader.ps_conservative_z = V_02880C_EXPORT_ANY_Z;
for (i = 0; i < shader_info.num_properties; i++) {
switch (shader_info.properties[i].name) {
case TGSI_PROPERTY_FS_DEPTH_LAYOUT:
switch (shader_info.properties[i].data[0]) {
case TGSI_FS_DEPTH_LAYOUT_GREATER:
shader->shader.ps_conservative_z = V_02880C_EXPORT_GREATER_THAN_Z;
shader->db_shader_control |=
S_02880C_CONSERVATIVE_Z_EXPORT(V_02880C_EXPORT_GREATER_THAN_Z);
break;
case TGSI_FS_DEPTH_LAYOUT_LESS:
shader->shader.ps_conservative_z = V_02880C_EXPORT_LESS_THAN_Z;
shader->db_shader_control |=
S_02880C_CONSERVATIVE_Z_EXPORT(V_02880C_EXPORT_LESS_THAN_Z);
break;
}
break;

1
src/gallium/drivers/radeonsi/si_shader.h
View File

@ -140,7 +140,6 @@ struct si_shader {
unsigned gs_input_prim;
unsigned gs_output_prim;
unsigned gs_max_out_vertices;
unsigned ps_conservative_z;
unsigned nparam;
bool uses_kill;

4
src/gallium/drivers/radeonsi/si_state_draw.c
View File

@ -269,10 +269,6 @@ static void si_pipe_shader_ps(struct pipe_context *ctx, struct si_pipe_shader *s
if (shader->shader.uses_kill || shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS)
db_shader_control |= S_02880C_KILL_ENABLE(1);
if (sctx->b.chip_class >= CIK)
db_shader_control |=
S_02880C_CONSERVATIVE_Z_EXPORT(shader->shader.ps_conservative_z);
spi_ps_in_control = S_0286D8_NUM_INTERP(shader->shader.nparam) |
S_0286D8_BC_OPTIMIZE_DISABLE(1);