diff options
| author | Brian Paul <[email protected]> | 2014-03-08 18:19:21 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2014-03-10 16:11:54 -0600 |
| commit | a19b19fb946aac6197c92f7a45c4121fc1b7c604 (patch) | |
| tree | a258da2bcad2bce94f40f26277770997fb84ca4d /src/mesa/drivers | |
| parent | 9b5fff2dd70fcc971f342a7dd31e390f0447978b (diff) | |
mesa: rename MESA_FORMAT_X8Z24_UNORM -> MESA_FORMAT_X8_UINT_Z24_UNORM
To follow the example of MESA_FORMAT_Z24_UNORM_X8_UINT.
Reviewed-by: Michel Dänzer <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_surface_formats.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_util.h | 2 |
2 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 0c95e865956..3f64881a176 100644 --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c @@ -361,7 +361,7 @@ brw_format_for_mesa_format(mesa_format mesa_format) [MESA_FORMAT_Z24_UNORM_S8_UINT] = 0, [MESA_FORMAT_Z_UNORM16] = 0, [MESA_FORMAT_Z24_UNORM_X8_UINT] = 0, - [MESA_FORMAT_X8Z24_UNORM] = 0, + [MESA_FORMAT_X8_UINT_Z24_UNORM] = 0, [MESA_FORMAT_Z_UNORM32] = 0, [MESA_FORMAT_S_UINT8] = BRW_SURFACEFORMAT_R8_UINT, diff --git a/src/mesa/drivers/dri/nouveau/nouveau_util.h b/src/mesa/drivers/dri/nouveau/nouveau_util.h index 0efaafadd52..56b819bcff8 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_util.h +++ b/src/mesa/drivers/dri/nouveau/nouveau_util.h @@ -59,7 +59,7 @@ pack_zs_i(mesa_format f, uint32_t z, uint8_t s) switch (f) { case MESA_FORMAT_S8_UINT_Z24_UNORM: return (z & 0xffffff00) | (s & 0xff); - case MESA_FORMAT_X8Z24_UNORM: + case MESA_FORMAT_X8_UINT_Z24_UNORM: return (z & 0xffffff00); case MESA_FORMAT_Z_UNORM16: return (z & 0xffff0000) >> 16; |