i915g: Drop the simple sufix

	None of the other driver have a silly sufix,
	so just drop it. Nothing new added in this commit
	or any other commit but this is better marketing.

diff --git a/SConstruct b/SConstruct
index 9ef7c01..d53f440 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -32,10 +32,10 @@ import common
 default_statetrackers = 'mesa'
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-       default_drivers = 'softpipe,failover,i915simple,trace,identity,llvmpipe'
+       default_drivers = 'softpipe,failover,i915,trace,identity,llvmpipe'
        default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-       default_drivers = 'softpipe,i915simple,trace,identity'
+       default_drivers = 'softpipe,i915,trace,identity'
        default_winsys = 'all'
 else:
        default_drivers = 'all'
@@ -46,7 +46,7 @@ common.AddOptions(opts)
 opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                      ['mesa', 'python', 'xorg']))
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'i915simple', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
+                     ['softpipe', 'failover', 'i915', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
                      ['xlib', 'intel', 'gdi', 'radeon']))
 

diff --git a/configs/default b/configs/default
index 2ce7250..c3bb47e 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -96,7 +96,7 @@ EGL_DRIVERS_DIRS = demo
 GALLIUM_DIRS = auxiliary drivers state_trackers
 GALLIUM_AUXILIARY_DIRS = rbug draw translate cso_cache pipebuffer tgsi sct rtasm util indices vl
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
-GALLIUM_DRIVERS_DIRS = softpipe i915simple failover trace identity
+GALLIUM_DRIVERS_DIRS = softpipe i915 failover trace identity
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib egl_xlib
 GALLIUM_WINSYS_DRM_DIRS =

diff --git a/configure.ac b/configure.ac
index 143fd31..95497af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1190,7 +1190,7 @@ AC_ARG_ENABLE([gallium-intel],
     [enable_gallium_intel=yes])
 if test "x$enable_gallium_intel" = xyes; then
     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel"
-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915simple"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
 fi
 
 dnl

diff --git a/src/gallium/drivers/i915simple/Makefile b/src/gallium/drivers/i915/Makefile
similarity index 95%
rename from src/gallium/drivers/i915simple/Makefile
rename to src/gallium/drivers/i915/Makefile
index fb533c1..e33c74d 100644 (file)
--- a/src/gallium/drivers/i915simple/Makefile
+++ b/src/gallium/drivers/i915/Makefile
@@ -1,7 +1,7 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-LIBNAME = i915simple
+LIBNAME = i915
 
 C_SOURCES = \
        i915_blit.c \

diff --git a/src/gallium/drivers/i915simple/SConscript b/src/gallium/drivers/i915/SConscript
similarity index 85%
rename from src/gallium/drivers/i915simple/SConscript
rename to src/gallium/drivers/i915/SConscript
index 778c4ed..5a1c47c 100644 (file)
--- a/src/gallium/drivers/i915simple/SConscript
+++ b/src/gallium/drivers/i915/SConscript
@@ -2,8 +2,8 @@ Import('*')
 
 env = env.Clone()
 
-i915simple = env.ConvenienceLibrary(
-       target = 'i915simple',
+i915 = env.ConvenienceLibrary(
+       target = 'i915',
        source = [
                'i915_blit.c',
                'i915_buffer.c',
@@ -27,4 +27,4 @@ i915simple = env.ConvenienceLibrary(
                'i915_texture.c',
        ])
 
-Export('i915simple')
+Export('i915')

diff --git a/src/gallium/drivers/i915simple/i915_batch.h b/src/gallium/drivers/i915/i915_batch.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_batch.h
rename to src/gallium/drivers/i915/i915_batch.h

diff --git a/src/gallium/drivers/i915simple/i915_blit.c b/src/gallium/drivers/i915/i915_blit.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_blit.c
rename to src/gallium/drivers/i915/i915_blit.c

diff --git a/src/gallium/drivers/i915simple/i915_blit.h b/src/gallium/drivers/i915/i915_blit.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_blit.h
rename to src/gallium/drivers/i915/i915_blit.h

diff --git a/src/gallium/drivers/i915simple/i915_buffer.c b/src/gallium/drivers/i915/i915_buffer.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_buffer.c
rename to src/gallium/drivers/i915/i915_buffer.c

diff --git a/src/gallium/drivers/i915simple/i915_buffer.h b/src/gallium/drivers/i915/i915_buffer.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_buffer.h
rename to src/gallium/drivers/i915/i915_buffer.h

diff --git a/src/gallium/drivers/i915simple/i915_clear.c b/src/gallium/drivers/i915/i915_clear.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_clear.c
rename to src/gallium/drivers/i915/i915_clear.c

diff --git a/src/gallium/drivers/i915simple/i915_context.c b/src/gallium/drivers/i915/i915_context.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_context.c
rename to src/gallium/drivers/i915/i915_context.c

diff --git a/src/gallium/drivers/i915simple/i915_context.h b/src/gallium/drivers/i915/i915_context.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_context.h
rename to src/gallium/drivers/i915/i915_context.h

diff --git a/src/gallium/drivers/i915simple/i915_debug.c b/src/gallium/drivers/i915/i915_debug.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_debug.c
rename to src/gallium/drivers/i915/i915_debug.c

diff --git a/src/gallium/drivers/i915simple/i915_debug.h b/src/gallium/drivers/i915/i915_debug.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_debug.h
rename to src/gallium/drivers/i915/i915_debug.h

diff --git a/src/gallium/drivers/i915simple/i915_debug_fp.c b/src/gallium/drivers/i915/i915_debug_fp.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_debug_fp.c
rename to src/gallium/drivers/i915/i915_debug_fp.c

diff --git a/src/gallium/drivers/i915simple/i915_flush.c b/src/gallium/drivers/i915/i915_flush.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_flush.c
rename to src/gallium/drivers/i915/i915_flush.c

diff --git a/src/gallium/drivers/i915simple/i915_fpc.h b/src/gallium/drivers/i915/i915_fpc.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_fpc.h
rename to src/gallium/drivers/i915/i915_fpc.h

diff --git a/src/gallium/drivers/i915simple/i915_fpc_emit.c b/src/gallium/drivers/i915/i915_fpc_emit.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_fpc_emit.c
rename to src/gallium/drivers/i915/i915_fpc_emit.c

diff --git a/src/gallium/drivers/i915simple/i915_fpc_translate.c b/src/gallium/drivers/i915/i915_fpc_translate.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_fpc_translate.c
rename to src/gallium/drivers/i915/i915_fpc_translate.c

diff --git a/src/gallium/drivers/i915simple/i915_prim_emit.c b/src/gallium/drivers/i915/i915_prim_emit.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_prim_emit.c
rename to src/gallium/drivers/i915/i915_prim_emit.c

diff --git a/src/gallium/drivers/i915simple/i915_prim_vbuf.c b/src/gallium/drivers/i915/i915_prim_vbuf.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_prim_vbuf.c
rename to src/gallium/drivers/i915/i915_prim_vbuf.c

diff --git a/src/gallium/drivers/i915simple/i915_reg.h b/src/gallium/drivers/i915/i915_reg.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_reg.h
rename to src/gallium/drivers/i915/i915_reg.h

diff --git a/src/gallium/drivers/i915simple/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_screen.c
rename to src/gallium/drivers/i915/i915_screen.c

diff --git a/src/gallium/drivers/i915simple/i915_screen.h b/src/gallium/drivers/i915/i915_screen.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_screen.h
rename to src/gallium/drivers/i915/i915_screen.h

diff --git a/src/gallium/drivers/i915simple/i915_state.c b/src/gallium/drivers/i915/i915_state.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_state.c
rename to src/gallium/drivers/i915/i915_state.c

diff --git a/src/gallium/drivers/i915simple/i915_state.h b/src/gallium/drivers/i915/i915_state.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_state.h
rename to src/gallium/drivers/i915/i915_state.h

diff --git a/src/gallium/drivers/i915simple/i915_state_derived.c b/src/gallium/drivers/i915/i915_state_derived.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_state_derived.c
rename to src/gallium/drivers/i915/i915_state_derived.c

diff --git a/src/gallium/drivers/i915simple/i915_state_dynamic.c b/src/gallium/drivers/i915/i915_state_dynamic.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_state_dynamic.c
rename to src/gallium/drivers/i915/i915_state_dynamic.c

diff --git a/src/gallium/drivers/i915simple/i915_state_emit.c b/src/gallium/drivers/i915/i915_state_emit.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_state_emit.c
rename to src/gallium/drivers/i915/i915_state_emit.c

diff --git a/src/gallium/drivers/i915simple/i915_state_immediate.c b/src/gallium/drivers/i915/i915_state_immediate.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_state_immediate.c
rename to src/gallium/drivers/i915/i915_state_immediate.c

diff --git a/src/gallium/drivers/i915simple/i915_state_inlines.h b/src/gallium/drivers/i915/i915_state_inlines.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_state_inlines.h
rename to src/gallium/drivers/i915/i915_state_inlines.h

diff --git a/src/gallium/drivers/i915simple/i915_state_sampler.c b/src/gallium/drivers/i915/i915_state_sampler.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_state_sampler.c
rename to src/gallium/drivers/i915/i915_state_sampler.c

diff --git a/src/gallium/drivers/i915simple/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_surface.c
rename to src/gallium/drivers/i915/i915_surface.c

diff --git a/src/gallium/drivers/i915simple/i915_texture.c b/src/gallium/drivers/i915/i915_texture.c
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_texture.c
rename to src/gallium/drivers/i915/i915_texture.c

diff --git a/src/gallium/drivers/i915simple/i915_texture.h b/src/gallium/drivers/i915/i915_texture.h
similarity index 100%
rename from src/gallium/drivers/i915simple/i915_texture.h
rename to src/gallium/drivers/i915/i915_texture.h

diff --git a/src/gallium/drivers/i915simple/intel_batchbuffer.h b/src/gallium/drivers/i915/intel_batchbuffer.h
similarity index 100%
rename from src/gallium/drivers/i915simple/intel_batchbuffer.h
rename to src/gallium/drivers/i915/intel_batchbuffer.h

diff --git a/src/gallium/drivers/i915simple/intel_winsys.h b/src/gallium/drivers/i915/intel_winsys.h
similarity index 100%
rename from src/gallium/drivers/i915simple/intel_winsys.h
rename to src/gallium/drivers/i915/intel_winsys.h

diff --git a/src/gallium/winsys/drm/intel/dri/Makefile b/src/gallium/winsys/drm/intel/dri/Makefile
index 5e212b6..c0ecd96 100644 (file)
--- a/src/gallium/winsys/drm/intel/dri/Makefile
+++ b/src/gallium/winsys/drm/intel/dri/Makefile
@@ -9,7 +9,7 @@ PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/identity/libidentity.a \
-       $(TOP)/src/gallium/drivers/i915simple/libi915simple.a
+       $(TOP)/src/gallium/drivers/i915/libi915.a
 
 
 DRIVER_SOURCES =

diff --git a/src/gallium/winsys/drm/intel/dri/SConscript b/src/gallium/winsys/drm/intel/dri/SConscript
index f973811..b1b654d 100644 (file)
--- a/src/gallium/winsys/drm/intel/dri/SConscript
+++ b/src/gallium/winsys/drm/intel/dri/SConscript
@@ -8,7 +8,7 @@ drivers = [
     st_dri,
     inteldrm,
     softpipe,
-    i915simple,
+    i915,
     trace,
 ]
 

diff --git a/src/gallium/winsys/drm/intel/egl/Makefile b/src/gallium/winsys/drm/intel/egl/Makefile
index 490bade..1397e9f 100644 (file)
--- a/src/gallium/winsys/drm/intel/egl/Makefile
+++ b/src/gallium/winsys/drm/intel/egl/Makefile
@@ -9,7 +9,7 @@ PIPE_DRIVERS = \
        $(GALLIUMDIR)/winsys/drm/intel/gem/libinteldrm.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
-       $(TOP)/src/gallium/drivers/i915simple/libi915simple.a
+       $(TOP)/src/gallium/drivers/i915/libi915.a
 
 DRIVER_SOURCES =
 

diff --git a/src/gallium/winsys/drm/intel/gem/intel_drm_api.c b/src/gallium/winsys/drm/intel/gem/intel_drm_api.c
index 8b647a7..9ed570f 100644 (file)
--- a/src/gallium/winsys/drm/intel/gem/intel_drm_api.c
+++ b/src/gallium/winsys/drm/intel/gem/intel_drm_api.c
@@ -4,8 +4,8 @@
 #include "intel_drm_winsys.h"
 #include "util/u_memory.h"
 
-#include "i915simple/i915_context.h"
-#include "i915simple/i915_screen.h"
+#include "i915/i915_context.h"
+#include "i915/i915_screen.h"
 
 #include "trace/tr_drm.h"
 

diff --git a/src/gallium/winsys/drm/intel/gem/intel_drm_winsys.h b/src/gallium/winsys/drm/intel/gem/intel_drm_winsys.h
index 415c45f..b4a6056 100644 (file)
--- a/src/gallium/winsys/drm/intel/gem/intel_drm_winsys.h
+++ b/src/gallium/winsys/drm/intel/gem/intel_drm_winsys.h
@@ -2,7 +2,7 @@
 #ifndef INTEL_DRM_WINSYS_H
 #define INTEL_DRM_WINSYS_H
 
-#include "i915simple/intel_batchbuffer.h"
+#include "i915/intel_batchbuffer.h"
 
 #include "drm.h"
 #include "intel_bufmgr.h"

diff --git a/src/gallium/winsys/drm/intel/xorg/Makefile b/src/gallium/winsys/drm/intel/xorg/Makefile
index 9e56853..14c2462 100644 (file)
--- a/src/gallium/winsys/drm/intel/xorg/Makefile
+++ b/src/gallium/winsys/drm/intel/xorg/Makefile
@@ -18,7 +18,7 @@ INCLUDES = \
 LIBS = \
        $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
        $(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
-       $(TOP)/src/gallium/drivers/i915simple/libi915simple.a \
+       $(TOP)/src/gallium/drivers/i915/libi915.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(GALLIUM_AUXILIARIES)