i965: Actually upload sampler state pointers for the VS unit on Gen6.

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 633cb9cb8c33a5ceb31917ea4b184df3557ce8e4..dc37a6730333beb72bc2047b5d39f1b4401f62d0 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -58,13 +58,13 @@ main_sources = [
     'main/cpuinfo.c',
     'main/debug.c',
     'main/depth.c',
-    'main/depthstencil.c',
     'main/dlist.c',
     'main/dlopen.c',
     'main/drawpix.c',
     'main/drawtex.c',
     'main/enable.c',
     'main/enums.c',
+    'main/errors.c',
     'main/eval.c',
     'main/execmem.c',
     'main/extensions.c',
@@ -170,6 +170,7 @@ swrast_sources = [
     'swrast/s_logic.c',
     'swrast/s_masking.c',
     'swrast/s_points.c',
+    'swrast/s_renderbuffer.c',
     'swrast/s_span.c',
     'swrast/s_stencil.c',
     'swrast/s_texcombine.c',
@@ -384,7 +385,7 @@ if env['gles']:
 #
 # Assembly sources
 #
-if env['gcc'] and env['platform'] != 'windows':
+if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
     if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
             'USE_X86_ASM',
@@ -423,14 +424,6 @@ if env['gcc'] and env['platform'] != 'windows':
             'x86-64/x86-64.c',
             'x86-64/xform4.S',
         ]
-    elif env['machine'] == 'ppc':
-        env.Append(CPPDEFINES = [
-            'USE_PPC_ASM',
-            'USE_VMX_ASM',
-        ])
-        mesa_sources += [
-            'ppc/common_ppc.c',
-        ]
     elif env['machine'] == 'sparc':
         mesa_sources += [
             'sparc/sparc.c',