diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-02-20 23:08:22 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-02-21 19:17:50 -0800 |
| commit | 82f9ad8c6011f5c1e8fd7065eeb6094f6e16dea9 (patch) | |
| tree | a2d011b6f60632fec144105e83143718ef4efe4f /src/mesa/drivers/dri/i965/brw_surface_formats.c | |
| parent | 5a0b08e9ea5ee6075aee551b223e045e7506cb7d (diff) | |
| download | external_mesa3d-82f9ad8c6011f5c1e8fd7065eeb6094f6e16dea9.zip external_mesa3d-82f9ad8c6011f5c1e8fd7065eeb6094f6e16dea9.tar.gz external_mesa3d-82f9ad8c6011f5c1e8fd7065eeb6094f6e16dea9.tar.bz2 | |
i965: Fix S8 and X8 reversal in brw_depthbuffer_format refactor.
In commit 09d9a8913e8c28fc4c1c60d7da85a2f093786894, I accidentally
botched the X8 and S8 cases. (I wrote this patch before realizing that
X8 and S8 had been swapped in the big MESA_FORMAT rename, and apparently
didn't rebase it properly after fixing that...)
Fixes regressions in 13 Piglit tests on Ironlake.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75291
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_surface_formats.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_surface_formats.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c index b2c36d9..9acece5 100644 --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c @@ -741,7 +741,7 @@ brw_depth_format(struct brw_context *brw, mesa_format format) return BRW_DEPTHFORMAT_D16_UNORM; case MESA_FORMAT_Z_FLOAT32: return BRW_DEPTHFORMAT_D32_FLOAT; - case MESA_FORMAT_Z24_UNORM_S8_UINT: + case MESA_FORMAT_Z24_UNORM_X8_UINT: if (brw->gen >= 6) { return BRW_DEPTHFORMAT_D24_UNORM_X8_UINT; } else { @@ -761,8 +761,8 @@ brw_depth_format(struct brw_context *brw, mesa_format format) */ return BRW_DEPTHFORMAT_D24_UNORM_S8_UINT; } - case MESA_FORMAT_Z24_UNORM_X8_UINT: - return BRW_DEPTHFORMAT_D24_UNORM_X8_UINT; + case MESA_FORMAT_Z24_UNORM_S8_UINT: + return BRW_DEPTHFORMAT_D24_UNORM_S8_UINT; case MESA_FORMAT_Z32_FLOAT_S8X24_UINT: return BRW_DEPTHFORMAT_D32_FLOAT_S8X24_UINT; default: |