diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-02-24 16:10:36 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-02-24 16:16:21 +0000 |
| commit | 85434f9e3cae74c1992bb619641f97c0e4028a63 (patch) | |
| tree | 6c556cadd847dd710d5e619be5a47fe032fc5668 /src/mesa | |
| parent | 83686b3f92f29208e35b971c118e179c14e120db (diff) | |
mesa: Update for UTIL_FORMAT_LAYOUT_xxx changes.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_format.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 851c16f83c..3100a4edaa 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -82,8 +82,7 @@ st_get_format_info(enum pipe_format format, struct pipe_format_info *pinfo) desc = util_format_description(format); assert(desc); - if (desc->layout == UTIL_FORMAT_LAYOUT_ARITH || - desc->layout == UTIL_FORMAT_LAYOUT_ARRAY) { + if (desc->layout == UTIL_FORMAT_LAYOUT_PLAIN) { #if 0 printf("%s\n", util_format_name( format ) ); #endif @@ -147,11 +146,16 @@ st_get_format_info(enum pipe_format format, struct pipe_format_info *pinfo) pinfo->mesa_format = st_pipe_format_to_mesa_format(format); } - else if (desc->layout == UTIL_FORMAT_LAYOUT_YUV) { + else if (format == PIPE_FORMAT_YCBCR) { pinfo->mesa_format = MESA_FORMAT_YCBCR; pinfo->datatype = GL_UNSIGNED_SHORT; pinfo->size = 2; /* two bytes per "texel" */ } + else if (format == PIPE_FORMAT_YCBCR_REV) { + pinfo->mesa_format = MESA_FORMAT_YCBCR_REV; + pinfo->datatype = GL_UNSIGNED_SHORT; + pinfo->size = 2; /* two bytes per "texel" */ + } else { /* compressed format? */ assert(0); |