intel: Clean up check_pbo_format to ignore internalFormat.

[mesa.git] / src / gallium / SConscript

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 1b41c39a460e843541ad9345249ced4b8903bfe8..3c063a2025cdbf16d72245e9e2c631d67f621823 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -13,7 +13,6 @@ SConscript('auxiliary/SConscript')
 SConscript([
     'drivers/failover/SConscript', 
     'drivers/galahad/SConscript',
-    'drivers/i915/SConscript', 
     'drivers/identity/SConscript', 
     'drivers/llvmpipe/SConscript', 
     'drivers/rbug/SConscript',
@@ -25,21 +24,27 @@ SConscript([
 if not env['msvc']:
     # These drivers do not build on MSVC compilers
     SConscript([
+        'drivers/i915/SConscript', 
         'drivers/i965/SConscript',
         'drivers/r300/SConscript',
     ])
 
-if env['dri']:
+if env['drm']:
     # These drivers depend on drm headers
-    SConscript([
-        # XXX: nouveau drivers have a tight dependency on libdrm, so to enable
-        # we need some version logic before we enable them. Also, ATM there is
-        # no nouveau target in scons
-        #'drivers/nouveau/SConscript', 
-        #'drivers/nv50/SConscript', 
-        #'drivers/nvfx/SConscript',
-        'drivers/r600/SConscript', 
-    ])
+    if env['drm_radeon']:
+        SConscript([
+            'drivers/r600/SConscript',
+        ])
+    # XXX: nouveau drivers have a tight dependency on libdrm, so to enable
+    # we need some version logic before we enable them. Also, ATM there is
+    # no nouveau target in scons
+    # if env['drm_nouveau']:
+    #     SConscript([
+    #         'drivers/nouveau/SConscript', 
+    #         'drivers/nv50/SConscript', 
+    #         'drivers/nvc0/SConscript', 
+    #         'drivers/nvfx/SConscript',
+    #     ])
 
 #
 # State trackers
@@ -48,16 +53,22 @@ if env['dri']:
 # Needed by some state trackers
 SConscript('winsys/sw/null/SConscript')
 
-SConscript('state_trackers/python/SConscript')
-if env['platform'] != 'embedded':
-       SConscript('state_trackers/glx/xlib/SConscript')
-       SConscript('state_trackers/dri/SConscript')
-       SConscript('state_trackers/xorg/SConscript')
-       SConscript('state_trackers/egl/SConscript')
-       SConscript('state_trackers/vega/SConscript')
+if not env['embedded']:
+    SConscript('state_trackers/vega/SConscript')
+    if env['platform'] not in ['darwin']:
+        SConscript('state_trackers/egl/SConscript')
+
+    if env['x11']:
+        SConscript('state_trackers/glx/xlib/SConscript')
+
+    if env['dri']:
+        SConscript('state_trackers/dri/SConscript')
+
+    if env['dri'] and env['xorg']:
+        SConscript('state_trackers/xorg/SConscript')
 
-if env['platform'] == 'windows':
-       SConscript('state_trackers/wgl/SConscript')
+    if env['platform'] == 'windows':
+        SConscript('state_trackers/wgl/SConscript')
 
 #
 # Winsys
@@ -73,45 +84,56 @@ SConscript([
     'targets/graw-null/SConscript',
 ])
 
-if env['x11']:
-    SConscript([
-        'targets/graw-xlib/SConscript',
-        'targets/libgl-xlib/SConscript',
-    ])
-
-if env['platform'] == 'windows':
-    SConscript([
-        'targets/libgl-gdi/SConscript',
-        #'egl-gdi/SConscript',
-    ])
-
-if env['dri']:
-    SConscript([
-        'targets/SConscript.dri',
-           'targets/dri-i915/SConscript',
-           'targets/dri-i965/SConscript',
-           #'targets/dri-nouveau/SConscript',
-           'targets/dri-r300/SConscript',
-        'targets/dri-r600/SConscript',
-           'targets/dri-swrast/SConscript',
-           'targets/dri-vmwgfx/SConscript',
-    ])
-
-if env['xorg']:
-    SConscript([
-        #'targets/xorg-i915/SConscript',
-        #'targets/xorg-i965/SConscript',
-        #'targets/xorg-nouveau/SConscript',
-        #'targets/xorg-radeon/SConscript',
-        'targets/xorg-vmwgfx/SConscript',
-    ])
+if not env['embedded']:
+    if env['platform'] not in ['darwin']:
+        SConscript([
+            'targets/egl-static/SConscript'
+        ])
+
+    if env['x11']:
+        SConscript([
+            'targets/graw-xlib/SConscript',
+            'targets/libgl-xlib/SConscript',
+        ])
+
+    if env['platform'] == 'windows':
+        SConscript([
+            'targets/graw-gdi/SConscript',
+            'targets/libgl-gdi/SConscript',
+        ])
+
+    if env['dri']:
+        SConscript([
+            'targets/SConscript.dri',
+            'targets/dri-swrast/SConscript',
+            'targets/dri-vmwgfx/SConscript',
+            #'targets/dri-nouveau/SConscript',
+        ])
+        if env['drm_intel']:
+            SConscript([
+                'targets/dri-i915/SConscript',
+                'targets/dri-i965/SConscript',
+            ])
+        if env['drm_radeon']:
+            SConscript([
+                'targets/dri-r300/SConscript',
+                'targets/dri-r600/SConscript',
+            ])
+
+    if env['xorg'] and env['drm']:
+        SConscript([
+            #'targets/xorg-i915/SConscript',
+            #'targets/xorg-i965/SConscript',
+            #'targets/xorg-nouveau/SConscript',
+            #'targets/xorg-radeon/SConscript',
+            'targets/xorg-vmwgfx/SConscript',
+        ])
 
 
 #
 # Unit tests & tools
 #
 
-if env['platform'] != 'embedded':
-       SConscript('tests/unit/SConscript')
-       SConscript('tests/graw/SConscript')
-
+if not env['embedded']:
+    SConscript('tests/unit/SConscript')
+    SConscript('tests/graw/SConscript')