diff options
| author | Brian Paul <brianp@vmware.com> | 2014-03-08 18:19:21 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-03-10 16:11:54 -0600 |
| commit | a19b19fb946aac6197c92f7a45c4121fc1b7c604 (patch) | |
| tree | a258da2bcad2bce94f40f26277770997fb84ca4d /src/mesa/main/formats.c | |
| parent | 9b5fff2dd70fcc971f342a7dd31e390f0447978b (diff) | |
| download | external_mesa3d-a19b19fb946aac6197c92f7a45c4121fc1b7c604.zip external_mesa3d-a19b19fb946aac6197c92f7a45c4121fc1b7c604.tar.gz external_mesa3d-a19b19fb946aac6197c92f7a45c4121fc1b7c604.tar.bz2 | |
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 <michel@daenzer.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/main/formats.c')
| -rw-r--r-- | src/mesa/main/formats.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index a61064b..c3e8049 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -368,8 +368,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] = 1, 1, 4 /* BlockWidth/Height,Bytes */ }, { - MESA_FORMAT_X8Z24_UNORM, /* Name */ - "MESA_FORMAT_X8Z24_UNORM", /* StrName */ + MESA_FORMAT_X8_UINT_Z24_UNORM, /* Name */ + "MESA_FORMAT_X8_UINT_Z24_UNORM", /* StrName */ GL_DEPTH_COMPONENT, /* BaseFormat */ GL_UNSIGNED_NORMALIZED, /* DataType */ 0, 0, 0, 0, /* Red/Green/Blue/AlphaBits */ @@ -2518,7 +2518,7 @@ _mesa_format_to_type_and_comps(mesa_format format, *comps = 1; return; - case MESA_FORMAT_X8Z24_UNORM: + case MESA_FORMAT_X8_UINT_Z24_UNORM: *datatype = GL_UNSIGNED_INT; *comps = 1; return; @@ -3160,7 +3160,7 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_S8_UINT_Z24_UNORM: return format == GL_DEPTH_STENCIL && type == GL_UNSIGNED_INT_24_8 && !swapBytes; - case MESA_FORMAT_X8Z24_UNORM: + case MESA_FORMAT_X8_UINT_Z24_UNORM: case MESA_FORMAT_Z24_UNORM_S8_UINT: return GL_FALSE; |