Mesa (master): r300g: fix scons build yet again

[Joakim Sindholt]

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

Author: Joakim Sindholt <opensource at zhasha.com>
Date:   Sat Oct 24 02:38:28 2009 +0200

r300g: fix scons build yet again

---

 src/gallium/drivers/r300/SConscript    |    3 ---
 src/gallium/drivers/r300/r300_render.c |    3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript
index b4c8ba2..9798904 100644
--- a/src/gallium/drivers/r300/SConscript
+++ b/src/gallium/drivers/r300/SConscript
@@ -9,8 +9,6 @@ env.Append(CPPPATH = ['#/src/mesa/drivers/dri/r300/compiler', '#/include', '#/sr
 r300 = env.ConvenienceLibrary(
     target = 'r300',
     source = [
-        'r3xx_fs.c',
-        'r5xx_fs.c',
         'r300_chipset.c',
         'r300_clear.c',
         'r300_context.c',
@@ -25,7 +23,6 @@ r300 = env.ConvenienceLibrary(
         'r300_state_derived.c',
         'r300_state_invariant.c',
         'r300_vs.c',
-        'r300_surface.c',
         'r300_texture.c',
         'r300_tgsi_to_rc.c',
     ] + r300compiler) + r300compiler
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 6e2bcc6..6f39240 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -76,7 +76,6 @@ boolean r300_draw_range_elements(struct pipe_context* pipe,
                                  unsigned count)
 {
     struct r300_context* r300 = r300_context(pipe);
-    CS_LOCALS(r300);
     uint32_t prim = r300_translate_primitive(mode);
     struct pipe_vertex_buffer* aos = r300->vertex_buffers;
     unsigned aos_count = r300->vertex_buffer_count;
@@ -84,6 +83,8 @@ boolean r300_draw_range_elements(struct pipe_context* pipe,
     unsigned packet_size;
     unsigned i;
     bool invalid = FALSE;
+    
+    CS_LOCALS(r300);
 
 validate:
     for (i = 0; i < aos_count; i++) {