diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-03-31 16:57:05 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-03-31 16:57:05 +0200 |
| commit | d97f6963aee71d8fafa2a94a5fe1f3ca4b4ef16d (patch) | |
| tree | 4b6fa4c2104dae852616908923d00b723cca082c /src/gallium/drivers/i965/brw_screen.c | |
| parent | 96bf4aff5bd674bba5d83ab32c46024a686c1a1d (diff) | |
| parent | 56b34e54f29cdd0a479219695c6559c44a41a76c (diff) | |
Merge branch 'gallium-new-formats'
Conflicts:
src/gallium/auxiliary/util/u_format.csv
src/gallium/auxiliary/util/u_format_access.py
src/gallium/auxiliary/util/u_format_pack.py
Diffstat (limited to 'src/gallium/drivers/i965/brw_screen.c')
| -rw-r--r-- | src/gallium/drivers/i965/brw_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/i965/brw_screen.c b/src/gallium/drivers/i965/brw_screen.c index cef83ffea8..ba30e63f20 100644 --- a/src/gallium/drivers/i965/brw_screen.c +++ b/src/gallium/drivers/i965/brw_screen.c @@ -252,7 +252,7 @@ brw_is_format_supported(struct pipe_screen *screen, /* depth */ PIPE_FORMAT_Z32_FLOAT, PIPE_FORMAT_Z24X8_UNORM, - PIPE_FORMAT_Z24S8_UNORM, + PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_Z16_UNORM, /* signed */ PIPE_FORMAT_R8G8_SNORM, @@ -268,7 +268,7 @@ brw_is_format_supported(struct pipe_screen *screen, static const enum pipe_format depth_supported[] = { PIPE_FORMAT_Z32_FLOAT, PIPE_FORMAT_Z24X8_UNORM, - PIPE_FORMAT_Z24S8_UNORM, + PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_Z16_UNORM, PIPE_FORMAT_NONE /* list terminator */ }; |