diff options
| author | Mark Mueller <MarkKMueller@gmail.com> | 2013-12-02 21:13:43 -0800 |
|---|---|---|
| committer | Mark Mueller <MarkKMueller@gmail.com> | 2014-01-13 09:44:31 -0800 |
| commit | e8ac5f705f38b61e75fd1262d2ed904e4ad1cc6d (patch) | |
| tree | 723856257ea03687d7c8bd736a12d0b92392a07c | |
| parent | 38112c74d961fd991e4c6f27954a4223116f9539 (diff) | |
Resolved MESA_FORMAT_X8_Z24 regression caused by upstream using the same
format for sample and render targets. Fix peren error
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_surface_formats.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c index 25bd6993bf..8c911f4a48 100644 --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c @@ -488,7 +488,7 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_ BRW_SURFACEFORMAT_I16_UNORM, desktop_gl_sel}, [MESA_FORMAT_X8_Z24] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM, - BRW_SURFACEFORMAT_I24X8_UNORM, + BRW_SURFACEFORMAT_B8G8R8A8_UNORM, 0}, [MESA_FORMAT_Z24_X8] = {BRW_SURFACEFORMAT_NONE, BRW_SURFACEFORMAT_NONE, @@ -953,7 +953,7 @@ brw_init_surface_formats(struct brw_context *brw) memset(&ctx->TextureFormatSupported, 0, sizeof(ctx->TextureFormatSupported)); const unsigned render_not_supported_test = - render_not_supported_mask | _mesa_is_desktop_gl(ctx) ? 0 : desktop_gl_sel; + render_not_supported_mask | (_mesa_is_desktop_gl(ctx) ? 0 : desktop_gl_sel); for (gl_format format = MESA_FORMAT_NONE + 1; format < MESA_FORMAT_COUNT; format++) { BRW_SURFACE sample_surface, render_surface; blorp_process_format process_flags; |