scons: Detabify

Drivers scons files for a later time

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index b5bc9ecfd9e02f6f1a36c87cc16dfad64547beb0..63435a306584bb771a24b4c9ce1dd57534d489a2 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -50,14 +50,14 @@ 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')
+    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 env['platform'] == 'windows':
-       SConscript('state_trackers/wgl/SConscript')
+    SConscript('state_trackers/wgl/SConscript')
 
 #
 # Winsys
@@ -89,13 +89,13 @@ if env['platform'] == 'windows':
 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-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',
+        'targets/dri-swrast/SConscript',
+        'targets/dri-vmwgfx/SConscript',
     ])
 
 if env['xorg']:
@@ -113,6 +113,5 @@ if env['xorg']:
 #
 
 if env['platform'] != 'embedded':
-       SConscript('tests/unit/SConscript')
-       SConscript('tests/graw/SConscript')
-
+    SConscript('tests/unit/SConscript')
+    SConscript('tests/graw/SConscript')

diff --git a/src/gallium/state_trackers/dri/SConscript b/src/gallium/state_trackers/dri/SConscript
index aba60fb8c5bb324044ce652f2dd2691d1b4d7f19..7702d8e6323d5d9903f5db3deeb91af13454ef6d 100644 (file)
--- a/src/gallium/state_trackers/dri/SConscript
+++ b/src/gallium/state_trackers/dri/SConscript
@@ -1,6 +1,6 @@
 Import('*')
 
 SConscript([
-       'sw/SConscript',
-       'drm/SConscript',
+    'sw/SConscript',
+    'drm/SConscript',
 ])

diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index 2a0af65f9bd0742d4960988dd3c01412a4707de1..7e3a264d1c16ad244d3665867a72e395e91e54b3 100644 (file)
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -12,16 +12,16 @@ if env['dri']:
     env.Append(CPPPATH = [
         '#/src/mapi',
         '#/src/mesa',
-       '#/src/gallium/state_trackers/dri/common',
-       '#/src/mesa/drivers/dri/common',
+        '#/src/gallium/state_trackers/dri/common',
+        '#/src/mesa/drivers/dri/common',
     ])
 
     st_dri = env.ConvenienceLibrary(
-       target = 'st_dri',
-       source = [ 'dri_context.c',
-               'dri_drawable.c',
-               'dri_screen.c',
-               'dri2.c',
-               ]
+    target = 'st_dri',
+    source = [ 'dri_context.c',
+               'dri_drawable.c',
+               'dri_screen.c',
+               'dri2.c',
+        ]
     )
     Export('st_dri')

diff --git a/src/gallium/state_trackers/dri/sw/SConscript b/src/gallium/state_trackers/dri/sw/SConscript
index d2eb66668e015a2b65d232d6be479fdd6c41291d..03c2ef6ab1dd4bb4dcf911dddcc5ccc7157f135f 100644 (file)
--- a/src/gallium/state_trackers/dri/sw/SConscript
+++ b/src/gallium/state_trackers/dri/sw/SConscript
@@ -10,18 +10,18 @@ if env['dri']:
     env.Append(CPPPATH = [
         '#/src/mapi',
         '#/src/mesa',
-       '#/src/gallium/state_trackers/dri/common',
-       '#/src/mesa/drivers/dri/common',
+        '#/src/gallium/state_trackers/dri/common',
+        '#/src/mesa/drivers/dri/common',
     ])
 
     env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')])
 
     st_drisw = env.ConvenienceLibrary(
-       target = 'st_drisw',
-       source = [ 'dri_context.c',
-               'dri_drawable.c',
-               'dri_screen.c',
-               'drisw.c',
-               ]
+    target = 'st_drisw',
+    source = [ 'dri_context.c',
+               'dri_drawable.c',
+               'dri_screen.c',
+               'drisw.c',
+        ]
     )
     Export('st_drisw')

diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript
index 4c6e18f42b2c069c8ec7f89bc36682c1c4a2ad06..a25b8474e4da1a4cdd6a138edbac25d9af596b6b 100644 (file)
--- a/src/gallium/state_trackers/vega/SConscript
+++ b/src/gallium/state_trackers/vega/SConscript
@@ -10,33 +10,33 @@ env.Append(CPPPATH = [
 ])
 
 vega_sources = [
-   'api.c',
-   'api_context.c',
-   'api_filters.c',
-   'api_images.c',
-   'api_masks.c',
-   'api_misc.c',
-   'api_paint.c',
-   'api_params.c',
-   'api_path.c',
-   'api_text.c',
-   'api_transform.c',
-   'vgu.c',
-   'vg_context.c',
-   'vg_manager.c',
-   'vg_state.c',
-   'vg_translate.c',
-   'polygon.c',
-   'bezier.c',
-   'path.c',
-   'paint.c',
-   'arc.c',
-   'image.c',
-   'renderer.c',
-   'stroker.c',
-   'mask.c',
-   'shader.c',
-   'shaders_cache.c',
+    'api.c',
+    'api_context.c',
+    'api_filters.c',
+    'api_images.c',
+    'api_masks.c',
+    'api_misc.c',
+    'api_paint.c',
+    'api_params.c',
+    'api_path.c',
+    'api_text.c',
+    'api_transform.c',
+    'vgu.c',
+    'vg_context.c',
+    'vg_manager.c',
+    'vg_state.c',
+    'vg_translate.c',
+    'polygon.c',
+    'bezier.c',
+    'path.c',
+    'paint.c',
+    'arc.c',
+    'image.c',
+    'renderer.c',
+    'stroker.c',
+    'mask.c',
+    'shader.c',
+    'shaders_cache.c',
 ]
 
 # vgapi_header must be generated first

diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index 0f580b859c672aed37f22f1d54fc85f8e7a1971e..994b0c86143ea5f25e2c6bb79a9e83fde6a347e6 100644 (file)
--- a/src/gallium/state_trackers/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
@@ -7,9 +7,9 @@ if env['platform'] in ['windows']:
     env = env.Clone()
      
     env.Append(CPPPATH = [
-       '#src/mapi',
-       '#src/mesa',
-       '.',
+        '#src/mapi',
+        '#src/mesa',
+        '.',
     ])
      
     env.AppendUnique(CPPDEFINES = [

diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index 092223b3690c9b63b1aff51a6fed8a6e5f623580..bc3671a256bb4612fb92bb61edc5a2b138223270 100644 (file)
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -9,65 +9,65 @@ if not env['dri']:
 drienv = env.Clone()
 
 drienv.Replace(CPPPATH = [
-       '#src/mesa/drivers/dri/common',
-       '#include',
-       '#include/GL/internal',
-       '#src/mapi',
-       '#src/gallium/include',
-       '#src/gallium/auxiliary',
-       '#src/gallium/drivers',
-       '#src/gallium/winsys',
-       '#src/mesa',
-       '#src/mesa/main',
-       '#src/mesa/glapi',
-       '#src/mesa/math',
-       '#src/mesa/transform',
-       '#src/mesa/shader',
-       '#src/mesa/swrast',
-       '#src/mesa/swrast_setup',
-       '#src/egl/main',
-       '#src/egl/drivers/dri',
+    '#src/mesa/drivers/dri/common',
+    '#include',
+    '#include/GL/internal',
+    '#src/mapi',
+    '#src/gallium/include',
+    '#src/gallium/auxiliary',
+    '#src/gallium/drivers',
+    '#src/gallium/winsys',
+    '#src/mesa',
+    '#src/mesa/main',
+    '#src/mesa/glapi',
+    '#src/mesa/math',
+    '#src/mesa/transform',
+    '#src/mesa/shader',
+    '#src/mesa/swrast',
+    '#src/mesa/swrast_setup',
+    '#src/egl/main',
+    '#src/egl/drivers/dri',
 ])
 
 drienv.ParseConfig('pkg-config --cflags --libs libdrm')
 
 dri_common_utils = drienv.SharedObject(
-       target = 'utils.o',
-       source = '#src/mesa/drivers/dri/common/utils.c'
+    target = 'utils.o',
+    source = '#src/mesa/drivers/dri/common/utils.c'
 )
 
 dri_common_xmlconfig = drienv.SharedObject(
-       target = 'xmlconfig.o',
-       source = '#src/mesa/drivers/dri/common/xmlconfig.c'
+    target = 'xmlconfig.o',
+    source = '#src/mesa/drivers/dri/common/xmlconfig.c'
 )
 
 dri_common_vblank = drienv.SharedObject(
-       target = 'vblank.o',
-       source = '#src/mesa/drivers/dri/common/vblank.c'
+    target = 'vblank.o',
+    source = '#src/mesa/drivers/dri/common/vblank.c'
 )
 
 dri_common_dri_util = drienv.SharedObject(
-       target = 'dri_util.o',
-       source = '#src/mesa/drivers/dri/common/dri_util.c'
+    target = 'dri_util.o',
+    source = '#src/mesa/drivers/dri/common/dri_util.c'
 )
 
 dri_common_drisw_util = drienv.SharedObject(
-       target = 'drisw_util.o',
-       source = '#src/mesa/drivers/dri/common/drisw_util.c'
+    target = 'drisw_util.o',
+    source = '#src/mesa/drivers/dri/common/drisw_util.c'
 )
 
 
 COMMON_DRI_SW_OBJECTS = [
-       dri_common_utils,
-       dri_common_xmlconfig,
-       dri_common_drisw_util,
+    dri_common_utils,
+    dri_common_xmlconfig,
+    dri_common_drisw_util,
 ]
 
 COMMON_DRI_DRM_OBJECTS = [
-       dri_common_utils,
-       dri_common_xmlconfig,
-       dri_common_vblank,
-       dri_common_dri_util,
+    dri_common_utils,
+    dri_common_xmlconfig,
+    dri_common_vblank,
+    dri_common_dri_util,
 ]
 
 drienv.AppendUnique(LIBS = [
@@ -76,7 +76,7 @@ drienv.AppendUnique(LIBS = [
 ])
 
 Export([
-       'drienv',
-       'COMMON_DRI_SW_OBJECTS',
-       'COMMON_DRI_DRM_OBJECTS',
+    'drienv',
+    'COMMON_DRI_SW_OBJECTS',
+    'COMMON_DRI_DRM_OBJECTS',
 ])

diff --git a/src/gallium/targets/xorg-vmwgfx/SConscript b/src/gallium/targets/xorg-vmwgfx/SConscript
index f9172aae6844d9f5d8ca817bf7498f506532b020..099d49cf1b7672726986ba3313073cf16f749b67 100644 (file)
--- a/src/gallium/targets/xorg-vmwgfx/SConscript
+++ b/src/gallium/targets/xorg-vmwgfx/SConscript
@@ -40,7 +40,7 @@ env.Prepend(LIBS = [
     st_xorg,
     svgadrm,
     svga,
-            gallium,
+    gallium,
 ])
 
 sources = [

diff --git a/src/gallium/winsys/svga/drm/SConscript b/src/gallium/winsys/svga/drm/SConscript
index 3ad4c725727bce4c0ec0edc02d578b19bc488edf..b049ea60aa8d98cdf32c3d6965bd60f02a1d15d3 100644 (file)
--- a/src/gallium/winsys/svga/drm/SConscript
+++ b/src/gallium/winsys/svga/drm/SConscript
@@ -5,37 +5,37 @@ env = env.Clone()
 env.ParseConfig('pkg-config --cflags libdrm')
 
 if env['gcc']:
-       env.Append(CCFLAGS = ['-fvisibility=hidden'])
-       env.Append(CPPDEFINES = [
-               'HAVE_STDINT_H', 
-               'HAVE_SYS_TYPES_H',
-                '-D_FILE_OFFSET_BITS=64',
-       ])
-       
+    env.Append(CCFLAGS = ['-fvisibility=hidden'])
+    env.Append(CPPDEFINES = [
+        'HAVE_STDINT_H', 
+        'HAVE_SYS_TYPES_H',
+        '-D_FILE_OFFSET_BITS=64',
+    ])
+    
 env.Prepend(CPPPATH = [
-       'include',
-        '#/src/gallium/drivers/svga',
-        '#/src/gallium/drivers/svga/include',
+    'include',
+    '#/src/gallium/drivers/svga',
+    '#/src/gallium/drivers/svga/include',
 ])
 
 env.Append(CPPDEFINES = [
 ])
 
 sources = [
-        'vmw_buffer.c',
-        'vmw_context.c',
-        'vmw_fence.c',
-        'vmw_screen.c',
-        'vmw_screen_dri.c',
-        'vmw_screen_ioctl.c',
-        'vmw_screen_pools.c',
-        'vmw_screen_svga.c',
-        'vmw_surface.c',
+    'vmw_buffer.c',
+    'vmw_context.c',
+    'vmw_fence.c',
+    'vmw_screen.c',
+    'vmw_screen_dri.c',
+    'vmw_screen_ioctl.c',
+    'vmw_screen_pools.c',
+    'vmw_screen_svga.c',
+    'vmw_surface.c',
 ]
 
 svgadrm = env.ConvenienceLibrary(
-       target = 'svgadrm',
-       source = sources,
+    target = 'svgadrm',
+    source = sources,
 )
 
 Export('svgadrm')