diff options
| author | Nicolai Hähnle <[email protected]> | 2017-09-23 13:20:25 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-09-29 11:44:50 +0200 |
| commit | 4c56e070296be6f53bfc1a3a4c864f12c035d3a4 (patch) | |
| tree | cc064e1191baf150b6ad974734d5b7e53b4c10c0 /src/gallium/drivers/radeon | |
| parent | 7dfa891f32316b17ae6f21dceb1b00845d34524a (diff) | |
radeonsi: clamp depth comparison value only for fixed point formats
The hardware usually does this automatically. However, we upgrade
depth to Z32_FLOAT to enable TC-compatible HTILE, which means the
hardware no longer clamps the comparison value for us.
The only way to tell in the shader whether a clamp is required
seems to be to communicate an additional bit in the descriptor
table. While VI has some unused bits in the resource descriptor,
those bits have unfortunately all been used in gfx9. So we use
an unused bit in the sampler state instead.
Fixes dEQP-GLES3.functional.texture.shadow.2d.linear.equal_depth_component32f
and many other tests in dEQP-GLES3.functional.texture.shadow.*
Fixes: d4d9ec55c589 ("radeonsi: implement TC-compatible HTILE")
Reviewed-by: Marek Olšák <[email protected]>
Tested-by: Dieter Nützel <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 1259257eead..debedd402b4 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -250,6 +250,7 @@ struct r600_texture { float depth_clear_value; bool stencil_cleared; /* if it was cleared at least once */ uint8_t stencil_clear_value; + bool upgraded_depth; /* upgraded from unorm to Z32_FLOAT */ bool non_disp_tiling; /* R600-Cayman only */ diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index a9a1b2627e5..eb7560e2c08 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -1153,8 +1153,11 @@ r600_texture_create_object(struct pipe_screen *screen, if (rscreen->chip_class >= GFX9 && base->format == PIPE_FORMAT_Z16_UNORM) rtex->db_render_format = base->format; - else + else { rtex->db_render_format = PIPE_FORMAT_Z32_FLOAT; + rtex->upgraded_depth = base->format != PIPE_FORMAT_Z32_FLOAT && + base->format != PIPE_FORMAT_Z32_FLOAT_S8X24_UINT; + } } else { rtex->db_render_format = base->format; } |