Mesa (pipe-format-simplify): s/desc->type/desc->channel[0].type/

[Michał Król]

Module: Mesa
Branch: pipe-format-simplify
Commit: 3af2ddbe943f0fe0d6b0ba9e627cbb82d0cc79f2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3af2ddbe943f0fe0d6b0ba9e627cbb82d0cc79f2

Author: Michal Krol <michal at vmware.com>
Date:   Thu Dec 17 21:25:47 2009 +0100

s/desc->type/desc->channel[0].type/

---

 src/gallium/drivers/nv50/nv50_vbo.c           |    4 ++--
 src/gallium/drivers/r300/r300_state_inlines.h |    4 ++--
 src/mesa/state_tracker/st_format.c            |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index d1c9f3f..f7fa065 100644
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -71,7 +71,7 @@ nv50_vbo_type_to_hw(enum pipe_format format)
 	desc = util_format_description(format);
 	assert(desc);
 
-	switch (desc->type) {
+	switch (desc->channel[0].type) {
 	case UTIL_FORMAT_TYPE_FLOAT:
 		return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_FLOAT;
 	case UTIL_FORMAT_TYPE_UNSIGNED:
@@ -339,7 +339,7 @@ nv50_vbo_static_attrib(struct nv50_context *nv50, unsigned attrib,
 	desc = util_format_description(pf);
 	assert(desc);
 
-	if ((desc->type != UTIL_FORMAT_TYPE_FLOAT) ||
+	if ((desc->channel[0].type != UTIL_FORMAT_TYPE_FLOAT) ||
 	    util_format_get_component_bits(pf, UTIL_FORMAT_COLORSPACE_RGB, 0) != 32)
 		return FALSE;
 
diff --git a/src/gallium/drivers/r300/r300_state_inlines.h b/src/gallium/drivers/r300/r300_state_inlines.h
index 7cd1f87..dbe42ed 100644
--- a/src/gallium/drivers/r300/r300_state_inlines.h
+++ b/src/gallium/drivers/r300/r300_state_inlines.h
@@ -483,7 +483,7 @@ r300_translate_vertex_data_type(enum pipe_format format) {
         assert(0);
     }
 
-    switch (desc->type) {
+    switch (desc->channel[0].type) {
         /* Half-floats, floats, doubles */
         case UTIL_FORMAT_TYPE_FLOAT:
             switch (util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 0)) {
@@ -525,7 +525,7 @@ r300_translate_vertex_data_type(enum pipe_format format) {
             assert(0);
     }
 
-    if (desc->type == UTIL_FORMAT_TYPE_SIGNED) {
+    if (desc->channel[0].type == UTIL_FORMAT_TYPE_SIGNED) {
         result |= R300_SIGNED;
     }
     if (desc->channel[0].normalized) {
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 329ae03..94da0f6 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -99,20 +99,20 @@ st_get_format_info(enum pipe_format format, struct pipe_format_info *pinfo)
       else {
          const GLuint size = format_max_bits(format);
          if (size == 8) {
-            if (desc->type == UTIL_FORMAT_TYPE_UNSIGNED)
+            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)
                pinfo->datatype = GL_UNSIGNED_BYTE;
             else
                pinfo->datatype = GL_BYTE;
          }
          else if (size == 16) {
-            if (desc->type == UTIL_FORMAT_TYPE_UNSIGNED)
+            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)
                pinfo->datatype = GL_UNSIGNED_SHORT;
             else
                pinfo->datatype = GL_SHORT;
          }
          else {
             assert( size <= 32 );
-            if (desc->type == UTIL_FORMAT_TYPE_UNSIGNED)
+            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)
                pinfo->datatype = GL_UNSIGNED_INT;
             else
                pinfo->datatype = GL_INT;