r600g: advertise 32 fragment shaders inputs, not 34

[mesa.git] / src / gallium / state_trackers / egl / SConscript

diff --git a/src/gallium/state_trackers/egl/SConscript b/src/gallium/state_trackers/egl/SConscript
index 9ade76ecbb20fa6e3f2288d32997a02163652fb9..68c77250f902d920c96696a95b6192c04d173dbf 100644 (file)
--- a/src/gallium/state_trackers/egl/SConscript
+++ b/src/gallium/state_trackers/egl/SConscript
@@ -24,6 +24,8 @@ if env['platform'] == 'windows':
     env.Append(CPPDEFINES = ['HAVE_GDI_BACKEND'])
     sources.append('gdi/native_gdi.c')
 else:
+    if env['drm']:
+        env.PkgUseModules('DRM')
     if env['x11']:
         env.Append(CPPDEFINES = ['HAVE_X11_BACKEND'])
         env.Prepend(CPPPATH = [
@@ -36,11 +38,16 @@ else:
             'x11/native_ximage.c',
             'x11/x11_screen.c',
             'x11/glxinit.c'])
-        if env['dri']:
+        if env['drm']:
             env.Append(CPPDEFINES = ['GLX_DIRECT_RENDERING'])
             sources.append(['#/src/glx/dri2.c'])
-    if env['drm']:
+    if env['drm'] and False:
+        # XXX: Disabled as it depends on gbm, which is not yet built with scons
         env.Append(CPPDEFINES = ['HAVE_DRM_BACKEND'])
+        env.Append(CPPPATH = [
+            '#/src/gbm/main',
+            '#/src/gallium/state_trackers/gbm',
+        ])
         sources.append(['drm/native_drm.c', 'drm/modeset.c'])
 
 st_egl = env.ConvenienceLibrary(