Mesa (master): mesa: Update for UTIL_FORMAT_LAYOUT_xxx changes.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Feb 24 16:16:27 UTC 2010
Module: Mesa
Branch: master
Commit: 85434f9e3cae74c1992bb619641f97c0e4028a63
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85434f9e3cae74c1992bb619641f97c0e4028a63
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed Feb 24 16:10:36 2010 +0000
mesa: Update for UTIL_FORMAT_LAYOUT_xxx changes.
---
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 851c16f..3100a4e 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);
More information about the mesa-commit
mailing list