From: Zack Rusin <zackr@vmware.com>
Date: Tue, 6 Oct 2009 16:38:47 +0000 (-0400)
Subject: configs: fix some remains of the i915simple driver
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=59ae3d51556229631f558f56268df89c885de664;p=mesa.git

configs: fix some remains of the i915simple driver
---

diff --git a/doxygen/gallium.doc b/doxygen/gallium.doc
index 4c1434460e9..f0ff36075a5 100644
--- a/doxygen/gallium.doc
+++ b/doxygen/gallium.doc
@@ -33,8 +33,7 @@
   
   - Pipe drivers:
     - \ref softpipe
-    - \ref i915simple
-    - Simple 965 driver (brw_context.h, brw_winsys.h)
+    - \ref i915g
     - Cell driver (cell_context.h, cell_winsys.h)
     - \ref failover
 
@@ -120,7 +119,7 @@
   \sa sp_winsys.h
 */
 
-/** \page i915simple Simple i915 Driver
+/** \page i915g i915 Driver
 
   The i915 Gallium3D Driver is an initial hardware driver implementation within
   the Gallium3D driver architecture. We expect that once complete this driver
@@ -163,7 +162,7 @@
   The Draw module is effectively the part of \ref softpipe which is concerned with
   vertex processing, split off into a separate module so that it can be reused
   by drivers for rasterization-only hardware. As such it is also instantiated
-  by the \ref i915simple driver.
+  by the \ref i915g driver.
 
   Additionally, there are cases in the Mesa OpenGL state_tracker where it is
   required to obtain transformed vertices and yet it is anticipated that using
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 14d4ca7c33b..dfe550f733b 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -5,7 +5,7 @@ Import('*')
 
 if env['platform'] == 'linux' \
         and 'mesa' in env['statetrackers'] \
-        and set(('softpipe', 'llvmpipe', 'i915simple', 'trace')).intersection(env['drivers']) \
+        and set(('softpipe', 'llvmpipe', 'i915', 'trace')).intersection(env['drivers']) \
         and not env['dri']:
 
     env = env.Clone()