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 bd9e94b82993c7c499658790e8a64eea3ab20a8b..dc37a6730333beb72bc2047b5d39f1b4401f62d0 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -64,6 +64,7 @@ main_sources = [
     'main/drawtex.c',
     'main/enable.c',
     'main/enums.c',
+    'main/errors.c',
     'main/eval.c',
     'main/execmem.c',
     'main/extensions.c',
@@ -161,7 +162,6 @@ swrast_sources = [
     'swrast/s_copypix.c',
     'swrast/s_context.c',
     'swrast/s_depth.c',
-    'swrast/s_depthstencil.c',
     'swrast/s_drawpix.c',
     'swrast/s_feedback.c',
     'swrast/s_fog.c',
@@ -385,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',
@@ -424,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',