Mesa (master): r300g: Fix build error on old compilers.

Corbin Simpson csimpson at kemper.freedesktop.org
Sun Nov 8 22:54:16 UTC 2009


Module: Mesa
Branch: master
Commit: ee28a69188d5054f996d0f5fc12820b024ef96a6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee28a69188d5054f996d0f5fc12820b024ef96a6

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Sun Nov  8 09:35:07 2009 -0800

r300g: Fix build error on old compilers.

This dead code was still getting compiled, causing a bad ref in the lib.

---

 src/gallium/drivers/r300/r300_vbo.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_vbo.c b/src/gallium/drivers/r300/r300_vbo.c
index 1d45fd5..5ad6b9c 100644
--- a/src/gallium/drivers/r300/r300_vbo.c
+++ b/src/gallium/drivers/r300/r300_vbo.c
@@ -85,7 +85,7 @@ static INLINE int get_buffer_offset(struct r300_context *r300,
 {
     return r300->vertex_buffer[buf_nr].buffer_offset + elem_offset;
 }
-
+#if 0
 /* XXX not called at all */
 static void setup_vertex_buffers(struct r300_context *r300)
 {
@@ -95,9 +95,9 @@ static void setup_vertex_buffers(struct r300_context *r300)
     for (i = 0; i < r300->aos_count; i++)
     {
         vert_elem = &r300->vertex_element[i];
+            /* XXX use translate module to convert the data */
         if (!format_is_supported(vert_elem->src_format,
                                  vert_elem->nr_components)) {
-            /* XXX use translate module to convert the data */
             assert(0);
             /*
             struct pipe_buffer *buf;
@@ -114,7 +114,7 @@ static void setup_vertex_buffers(struct r300_context *r300)
         }
     }
 }
-
+#endif
 /* XXX these shouldn't be asserts since we can work around bad indexbufs */
 void setup_index_buffer(struct r300_context *r300,
                         struct pipe_buffer* indexBuffer,




More information about the mesa-commit mailing list