Mesa (master): gallium: Reorg winsys directories
Jakob Bornecrantz
wallbraker at kemper.freedesktop.org
Thu Mar 25 13:50:21 UTC 2010
Module: Mesa
Branch: master
Commit: c9f98673c5b6830cd1f41c0c53a9e5e299d47464
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9f98673c5b6830cd1f41c0c53a9e5e299d47464
Author: Jakob Bornecrantz <jakob at vmware.com>
Date: Tue Mar 16 13:54:18 2010 +0000
gallium: Reorg winsys directories
Attached output from commit.
delete mode 100644 src/gallium/winsys/drm/SConscript
delete mode 100644 src/gallium/winsys/drm/i965/SConscript
delete mode 100644 src/gallium/winsys/drm/intel/Makefile
delete mode 100644 src/gallium/winsys/drm/intel/SConscript
delete mode 100644 src/gallium/winsys/drm/nouveau/Makefile
delete mode 100644 src/gallium/winsys/drm/radeon/Makefile
delete mode 100644 src/gallium/winsys/drm/radeon/SConscript
delete mode 100644 src/gallium/winsys/drm/vmware/Makefile
delete mode 100644 src/gallium/winsys/drm/vmware/SConscript
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/Makefile (82%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_api.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_batchbuffer.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_buffer.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_fence.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_winsys.h (100%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/Makefile (78%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_api.c (98%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_buffer.c (100%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_winsys.h (100%)
rename src/gallium/winsys/{drm => }/i965/xlib/Makefile (97%)
rename src/gallium/winsys/{drm => }/i965/xlib/xlib_i965.c (100%)
rename src/gallium/winsys/{drm => }/nouveau/drm/Makefile (79%)
rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_dri.h (100%)
rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.c (100%)
rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/Makefile (79%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_buffer.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.c (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm_buffer.c (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.c (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_winsys.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/Makefile (63%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_dri.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_ioctl.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_pools.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_svga.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmwgfx_drm.h (100%)
rename src/gallium/winsys/{drm/i965 => sw}/Makefile (61%)
copy src/gallium/winsys/{drm/sw => sw/drm}/Makefile (73%)
rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.c (98%)
rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.h (100%)
rename src/gallium/winsys/{ => sw}/gdi/SConscript (100%)
rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.c (100%)
rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.h (100%)
rename src/gallium/winsys/{ => sw}/null/Makefile (78%)
rename src/gallium/winsys/{ => sw}/null/SConscript (100%)
rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.c (100%)
rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.h (100%)
rename src/gallium/winsys/{drm/sw => sw/wrapper}/Makefile (65%)
rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.c (100%)
rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.h (100%)
rename src/gallium/winsys/{ => sw}/xlib/Makefile (79%)
rename src/gallium/winsys/{ => sw}/xlib/SConscript (100%)
rename src/gallium/winsys/{ => sw}/xlib/xlib_sw_winsys.c (100%)
---
configs/default | 2 +-
configs/linux-dri | 2 +-
configure.ac | 14 ++--
src/gallium/SConscript | 2 +-
src/gallium/targets/Makefile.egl | 2 +-
src/gallium/targets/dri-i915/Makefile | 2 +-
src/gallium/targets/dri-i965/Makefile | 5 +-
src/gallium/targets/dri-nouveau/Makefile | 2 +-
src/gallium/targets/dri-radeong/Makefile | 2 +-
src/gallium/targets/dri-vmwgfx/Makefile | 2 +-
src/gallium/targets/egl-i915/Makefile | 2 +-
src/gallium/targets/egl-i965/Makefile | 2 +-
src/gallium/targets/egl-nouveau/Makefile | 2 +-
src/gallium/targets/egl-radeon/Makefile | 2 +-
src/gallium/targets/egl-vmwgfx/Makefile | 2 +-
src/gallium/targets/xorg-i915/Makefile | 2 +-
src/gallium/targets/xorg-i965/Makefile | 2 +-
src/gallium/targets/xorg-nouveau/Makefile | 2 +-
src/gallium/targets/xorg-radeon/Makefile | 2 +-
src/gallium/targets/xorg-vmwgfx/Makefile | 2 +-
src/gallium/targets/xorg-vmwgfx/vmw_ioctl.c | 2 +-
src/gallium/targets/xorg-vmwgfx/vmw_video.c | 2 +-
src/gallium/winsys/SConscript | 9 +--
src/gallium/winsys/drm/SConscript | 69 --------------------
src/gallium/winsys/drm/i965/SConscript | 3 -
src/gallium/winsys/drm/intel/Makefile | 12 ----
src/gallium/winsys/drm/intel/SConscript | 3 -
src/gallium/winsys/drm/nouveau/Makefile | 12 ----
src/gallium/winsys/drm/radeon/Makefile | 12 ----
src/gallium/winsys/drm/radeon/SConscript | 3 -
src/gallium/winsys/drm/vmware/Makefile | 12 ----
src/gallium/winsys/drm/vmware/SConscript | 3 -
.../winsys/{drm/intel/gem => i915/drm}/Makefile | 4 +-
.../winsys/{drm/intel/gem => i915/drm}/SConscript | 0
.../{drm/intel/gem => i915/drm}/intel_drm_api.c | 0
.../intel/gem => i915/drm}/intel_drm_batchbuffer.c | 0
.../{drm/intel/gem => i915/drm}/intel_drm_buffer.c | 0
.../{drm/intel/gem => i915/drm}/intel_drm_fence.c | 0
.../{drm/intel/gem => i915/drm}/intel_drm_winsys.h | 0
.../winsys/{drm/i965/gem => i965/drm}/Makefile | 4 +-
.../winsys/{drm/i965/gem => i965/drm}/SConscript | 0
.../{drm/i965/gem => i965/drm}/i965_drm_api.c | 2 +-
.../{drm/i965/gem => i965/drm}/i965_drm_buffer.c | 0
.../{drm/i965/gem => i965/drm}/i965_drm_winsys.h | 0
src/gallium/winsys/{drm => }/i965/xlib/Makefile | 4 +-
src/gallium/winsys/{drm => }/i965/xlib/xlib_i965.c | 0
src/gallium/winsys/{drm => }/nouveau/drm/Makefile | 4 +-
.../winsys/{drm => }/nouveau/drm/nouveau_dri.h | 0
.../winsys/{drm => }/nouveau/drm/nouveau_drm_api.c | 0
.../winsys/{drm => }/nouveau/drm/nouveau_drm_api.h | 0
.../{drm/radeon/core => radeon/drm}/Makefile | 4 +-
.../{drm/radeon/core => radeon/drm}/SConscript | 0
.../radeon/core => radeon/drm}/radeon_buffer.h | 0
.../{drm/radeon/core => radeon/drm}/radeon_drm.c | 0
.../{drm/radeon/core => radeon/drm}/radeon_drm.h | 0
.../radeon/core => radeon/drm}/radeon_drm_buffer.c | 0
.../{drm/radeon/core => radeon/drm}/radeon_r300.c | 0
.../{drm/radeon/core => radeon/drm}/radeon_r300.h | 0
.../radeon/core => radeon/drm}/radeon_winsys.h | 0
.../winsys/{drm/vmware/core => svga/drm}/Makefile | 12 +---
.../{drm/vmware/core => svga/drm}/SConscript | 0
.../{drm/vmware/core => svga/drm}/vmw_buffer.c | 0
.../{drm/vmware/core => svga/drm}/vmw_buffer.h | 0
.../{drm/vmware/core => svga/drm}/vmw_context.c | 0
.../{drm/vmware/core => svga/drm}/vmw_context.h | 0
.../{drm/vmware/core => svga/drm}/vmw_fence.c | 0
.../{drm/vmware/core => svga/drm}/vmw_fence.h | 0
.../{drm/vmware/core => svga/drm}/vmw_screen.c | 0
.../{drm/vmware/core => svga/drm}/vmw_screen.h | 0
.../{drm/vmware/core => svga/drm}/vmw_screen_dri.c | 0
.../vmware/core => svga/drm}/vmw_screen_ioctl.c | 0
.../vmware/core => svga/drm}/vmw_screen_pools.c | 0
.../vmware/core => svga/drm}/vmw_screen_svga.c | 0
.../{drm/vmware/core => svga/drm}/vmw_surface.c | 0
.../{drm/vmware/core => svga/drm}/vmw_surface.h | 0
.../{drm/vmware/core => svga/drm}/vmwgfx_drm.h | 0
src/gallium/winsys/{drm/i965 => sw}/Makefile | 6 +-
src/gallium/winsys/{drm/sw => sw/drm}/Makefile | 4 +-
src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.c | 2 +-
src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.h | 0
src/gallium/winsys/{ => sw}/gdi/SConscript | 0
src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.c | 0
src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.h | 0
src/gallium/winsys/{ => sw}/null/Makefile | 4 +-
src/gallium/winsys/{ => sw}/null/SConscript | 0
src/gallium/winsys/{ => sw}/null/null_sw_winsys.c | 0
src/gallium/winsys/{ => sw}/null/null_sw_winsys.h | 0
src/gallium/winsys/{drm/sw => sw/wrapper}/Makefile | 6 +-
.../{drm/sw => sw/wrapper}/wrapper_sw_winsys.c | 0
.../{drm/sw => sw/wrapper}/wrapper_sw_winsys.h | 0
src/gallium/winsys/{ => sw}/xlib/Makefile | 4 +-
src/gallium/winsys/{ => sw}/xlib/SConscript | 0
src/gallium/winsys/{ => sw}/xlib/xlib_sw_winsys.c | 0
93 files changed, 56 insertions(+), 201 deletions(-)
diff --git a/configs/default b/configs/default
index 65e9847..77a9898 100644
--- a/configs/default
+++ b/configs/default
@@ -100,7 +100,7 @@ GALLIUM_DIRS = auxiliary drivers state_trackers
GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 r300 trace identity
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-GALLIUM_WINSYS_DIRS = null xlib
+GALLIUM_WINSYS_DIRS = sw sw/xlib
GALLIUM_TARGET_DIRS = libgl-xlib
GALLIUM_STATE_TRACKERS_DIRS = glx vega
diff --git a/configs/linux-dri b/configs/linux-dri
index b11daed..e21a3e9 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -58,7 +58,7 @@ PROGRAM_DIRS := egl $(PROGRAM_DIRS)
EGL_DRIVERS_DIRS = glx
DRIVER_DIRS = dri
-GALLIUM_WINSYS_DIRS = null xlib drm/vmware drm/intel drm/i965
+GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965
GALLIUM_TARGET_DIRS = egl-swrast
GALLIUM_STATE_TRACKERS_DIRS = egl
diff --git a/configure.ac b/configure.ac
index c8f78dc..edf2363 100644
--- a/configure.ac
+++ b/configure.ac
@@ -461,20 +461,20 @@ SRC_DIRS="glew"
GLU_DIRS="sgi"
GALLIUM_DIRS="auxiliary drivers state_trackers"
GALLIUM_TARGET_DIRS=""
-GALLIUM_WINSYS_DIRS="null"
+GALLIUM_WINSYS_DIRS="sw"
GALLIUM_DRIVERS_DIRS="softpipe failover trace identity"
GALLIUM_STATE_TRACKERS_DIRS=""
case "$mesa_driver" in
xlib)
DRIVER_DIRS="x11"
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib"
;;
dri)
SRC_DIRS="$SRC_DIRS glx"
DRIVER_DIRS="dri"
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib drm/sw"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/drm"
;;
osmesa)
DRIVER_DIRS="osmesa"
@@ -1317,7 +1317,7 @@ AC_ARG_ENABLE([gallium-svga],
[enable_gallium_svga=auto])
if test "x$enable_gallium_svga" = xyes; then
if test "x$mesa_driver" = xdri; then
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm/vmware"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS svga/drm"
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-vmwgfx"
fi
if test "x$enable_egl" = xyes; then
@@ -1341,7 +1341,7 @@ AC_ARG_ENABLE([gallium-intel],
[enable_gallium_intel=auto])
if test "x$enable_gallium_intel" = xyes; then
if test "x$mesa_driver" = xdri; then
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm/intel drm/i965"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/drm i965/drm"
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-i915 dri-i965"
fi
if test "x$enable_egl" = xyes; then
@@ -1365,7 +1365,7 @@ AC_ARG_ENABLE([gallium-radeon],
[enable_gallium_radeon=auto])
if test "x$enable_gallium_radeon" = xyes; then
if test "x$mesa_driver" = xdri; then
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm/radeon"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS radeon/drm"
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-radeong"
fi
if test "x$enable_egl" = xyes; then
@@ -1389,7 +1389,7 @@ AC_ARG_ENABLE([gallium-nouveau],
[enable_gallium_nouveau=no])
if test "x$enable_gallium_nouveau" = xyes; then
if test "x$mesa_driver" = xdri; then
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm/nouveau"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS nouveau/drm"
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-nouveau"
fi
if test "x$enable_egl" = xyes; then
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index c833d83..b8c04f7 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -8,7 +8,7 @@ for driver in env['drivers']:
SConscript(os.path.join('drivers', driver, 'SConscript'))
# Needed by some state trackers
-SConscript('winsys/null/SConscript')
+SConscript('winsys/sw/null/SConscript')
SConscript('state_trackers/python/SConscript')
if platform != 'embedded':
diff --git a/src/gallium/targets/Makefile.egl b/src/gallium/targets/Makefile.egl
index bc5dd3a..30fced7 100644
--- a/src/gallium/targets/Makefile.egl
+++ b/src/gallium/targets/Makefile.egl
@@ -14,7 +14,7 @@ EGL_DRIVER_OBJECTS = $(EGL_DRIVER_SOURCES:.c=.o)
common_LIBS = -ldrm -lm -ldl
x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a \
- $(TOP)/src/gallium/winsys/xlib/libws_xlib.a
+ $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a
x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes
kms_ST = $(TOP)/src/gallium/state_trackers/egl/libeglkms.a
diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
index 33eaae6..facbcb1 100644
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -5,7 +5,7 @@ LIBNAME = i915_dri.so
PIPE_DRIVERS = \
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
- $(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
+ $(TOP)/src/gallium/winsys/i915/drm/libinteldrm.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/identity/libidentity.a \
diff --git a/src/gallium/targets/dri-i965/Makefile b/src/gallium/targets/dri-i965/Makefile
index e17775a..c622bbc 100644
--- a/src/gallium/targets/dri-i965/Makefile
+++ b/src/gallium/targets/dri-i965/Makefile
@@ -5,9 +5,10 @@ LIBNAME = i965_dri.so
PIPE_DRIVERS = \
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
- $(TOP)/src/gallium/winsys/drm/i965/gem/libi965drm.a \
+ $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
- $(TOP)/src/gallium/winsys/drm/sw/libswdrm.a \
+ $(TOP)/src/gallium/winsys/sw/drm/libswdrm.a \
+ $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/identity/libidentity.a \
$(TOP)/src/gallium/drivers/i965/libi965.a
diff --git a/src/gallium/targets/dri-nouveau/Makefile b/src/gallium/targets/dri-nouveau/Makefile
index 680bad7..9ba5e18 100644
--- a/src/gallium/targets/dri-nouveau/Makefile
+++ b/src/gallium/targets/dri-nouveau/Makefile
@@ -5,7 +5,7 @@ LIBNAME = nouveau_dri.so
PIPE_DRIVERS = \
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
- $(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \
+ $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
$(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a
diff --git a/src/gallium/targets/dri-radeong/Makefile b/src/gallium/targets/dri-radeong/Makefile
index c6d8c52..ce25559 100644
--- a/src/gallium/targets/dri-radeong/Makefile
+++ b/src/gallium/targets/dri-radeong/Makefile
@@ -5,7 +5,7 @@ LIBNAME = radeong_dri.so
PIPE_DRIVERS = \
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
- $(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a \
+ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/r300/libr300.a
diff --git a/src/gallium/targets/dri-vmwgfx/Makefile b/src/gallium/targets/dri-vmwgfx/Makefile
index 1d2ddfe..32edc46 100644
--- a/src/gallium/targets/dri-vmwgfx/Makefile
+++ b/src/gallium/targets/dri-vmwgfx/Makefile
@@ -5,7 +5,7 @@ LIBNAME = vmwgfx_dri.so
PIPE_DRIVERS = \
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
- $(TOP)/src/gallium/winsys/drm/vmware/core/libsvgadrm.a \
+ $(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/svga/libsvga.a
diff --git a/src/gallium/targets/egl-i915/Makefile b/src/gallium/targets/egl-i915/Makefile
index 596dd09..6c2fc14 100644
--- a/src/gallium/targets/egl-i915/Makefile
+++ b/src/gallium/targets/egl-i915/Makefile
@@ -6,7 +6,7 @@ EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_LIBS = -ldrm_intel
EGL_DRIVER_PIPES = \
- $(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
+ $(TOP)/src/gallium/winsys/i915/drm/libinteldrm.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/i915/libi915.a
diff --git a/src/gallium/targets/egl-i965/Makefile b/src/gallium/targets/egl-i965/Makefile
index e4c1a88..dfb3cc4 100644
--- a/src/gallium/targets/egl-i965/Makefile
+++ b/src/gallium/targets/egl-i965/Makefile
@@ -6,7 +6,7 @@ EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_LIBS = -ldrm_intel
EGL_DRIVER_PIPES = \
- $(TOP)/src/gallium/winsys/drm/i965/gem/libi965drm.a \
+ $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/i965/libi965.a
diff --git a/src/gallium/targets/egl-nouveau/Makefile b/src/gallium/targets/egl-nouveau/Makefile
index 46fcdf5..3da9379 100644
--- a/src/gallium/targets/egl-nouveau/Makefile
+++ b/src/gallium/targets/egl-nouveau/Makefile
@@ -6,7 +6,7 @@ EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_LIBS = -ldrm_nouveau
EGL_DRIVER_PIPES = \
- $(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \
+ $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
$(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
diff --git a/src/gallium/targets/egl-radeon/Makefile b/src/gallium/targets/egl-radeon/Makefile
index 5681836..f55d84d 100644
--- a/src/gallium/targets/egl-radeon/Makefile
+++ b/src/gallium/targets/egl-radeon/Makefile
@@ -6,7 +6,7 @@ EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_LIBS = -ldrm_radeon
EGL_DRIVER_PIPES = \
- $(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a \
+ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/r300/libr300.a
diff --git a/src/gallium/targets/egl-vmwgfx/Makefile b/src/gallium/targets/egl-vmwgfx/Makefile
index 007158a..6db12e0 100644
--- a/src/gallium/targets/egl-vmwgfx/Makefile
+++ b/src/gallium/targets/egl-vmwgfx/Makefile
@@ -6,7 +6,7 @@ EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_LIBS =
EGL_DRIVER_PIPES = \
- $(TOP)/src/gallium/winsys/drm/vmware/core/libsvgadrm.a \
+ $(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/svga/libsvga.a
diff --git a/src/gallium/targets/xorg-i915/Makefile b/src/gallium/targets/xorg-i915/Makefile
index 4442147..e2cffcd 100644
--- a/src/gallium/targets/xorg-i915/Makefile
+++ b/src/gallium/targets/xorg-i915/Makefile
@@ -17,7 +17,7 @@ INCLUDES = \
LIBS = \
$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
- $(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
+ $(TOP)/src/gallium/winsys/i915/drm/libinteldrm.a \
$(TOP)/src/gallium/drivers/i915/libi915.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
diff --git a/src/gallium/targets/xorg-i965/Makefile b/src/gallium/targets/xorg-i965/Makefile
index 8d6a741..104a143 100644
--- a/src/gallium/targets/xorg-i965/Makefile
+++ b/src/gallium/targets/xorg-i965/Makefile
@@ -17,7 +17,7 @@ CFLAGS = -DHAVE_CONFIG_H \
LIBS = \
$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
- $(TOP)/src/gallium/winsys/drm/i965/gem/libi965drm.a \
+ $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \
$(TOP)/src/gallium/drivers/i965/libi965.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
diff --git a/src/gallium/targets/xorg-nouveau/Makefile b/src/gallium/targets/xorg-nouveau/Makefile
index d41de0b..b514b57 100644
--- a/src/gallium/targets/xorg-nouveau/Makefile
+++ b/src/gallium/targets/xorg-nouveau/Makefile
@@ -16,7 +16,7 @@ INCLUDES = \
LIBS = \
$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
- $(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \
+ $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
$(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
diff --git a/src/gallium/targets/xorg-radeon/Makefile b/src/gallium/targets/xorg-radeon/Makefile
index 9618d30..cd32914 100644
--- a/src/gallium/targets/xorg-radeon/Makefile
+++ b/src/gallium/targets/xorg-radeon/Makefile
@@ -17,7 +17,7 @@ CFLAGS = -DHAVE_CONFIG_H \
LIBS = \
$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
- $(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a \
+ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/r300/libr300.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
diff --git a/src/gallium/targets/xorg-vmwgfx/Makefile b/src/gallium/targets/xorg-vmwgfx/Makefile
index 3691b88..12bc307 100644
--- a/src/gallium/targets/xorg-vmwgfx/Makefile
+++ b/src/gallium/targets/xorg-vmwgfx/Makefile
@@ -20,7 +20,7 @@ INCLUDES = \
LIBS = \
$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
- $(TOP)/src/gallium/winsys/drm/vmware/core/libsvgadrm.a \
+ $(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/svga/libsvga.a \
$(GALLIUM_AUXILIARIES)
diff --git a/src/gallium/targets/xorg-vmwgfx/vmw_ioctl.c b/src/gallium/targets/xorg-vmwgfx/vmw_ioctl.c
index fe9c039..96ee4ff 100644
--- a/src/gallium/targets/xorg-vmwgfx/vmw_ioctl.c
+++ b/src/gallium/targets/xorg-vmwgfx/vmw_ioctl.c
@@ -42,7 +42,7 @@
#include <sys/mman.h>
#include "xf86drm.h"
-#include "../../winsys/drm/vmware/core/vmwgfx_drm.h"
+#include "../../winsys/svga/drm/vmwgfx_drm.h"
#include "vmw_driver.h"
#include "util/u_debug.h"
diff --git a/src/gallium/targets/xorg-vmwgfx/vmw_video.c b/src/gallium/targets/xorg-vmwgfx/vmw_video.c
index 7909999..eced60d 100644
--- a/src/gallium/targets/xorg-vmwgfx/vmw_video.c
+++ b/src/gallium/targets/xorg-vmwgfx/vmw_video.c
@@ -62,7 +62,7 @@ typedef uint8_t uint8;
#include <X11/extensions/Xv.h>
#include "xf86drm.h"
-#include "../../winsys/drm/vmware/core/vmwgfx_drm.h"
+#include "../../winsys/svga/drm/vmwgfx_drm.h"
#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 30c3378..97ea82e 100644
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -1,16 +1,11 @@
Import('*')
-if env['dri']:
- SConscript([
- 'drm/SConscript',
- ])
-
if 'xlib' in env['winsys']:
SConscript([
- 'xlib/SConscript',
+ 'sw/xlib/SConscript',
])
if 'gdi' in env['winsys']:
SConscript([
- 'gdi/SConscript',
+ 'sw/gdi/SConscript',
])
diff --git a/src/gallium/winsys/drm/SConscript b/src/gallium/winsys/drm/SConscript
deleted file mode 100644
index 66b73a8..0000000
--- a/src/gallium/winsys/drm/SConscript
+++ /dev/null
@@ -1,69 +0,0 @@
-Import('*')
-
-if env['dri']:
-
- drienv = env.Clone()
-
- drienv.Replace(CPPPATH = [
- '#src/mesa/drivers/dri/common',
- '#include',
- '#include/GL/internal',
- '#src/gallium/include',
- '#src/gallium/auxiliary',
- '#src/gallium/drivers',
- '#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')
-
- COMMON_GALLIUM_SOURCES = [
- '#src/mesa/drivers/dri/common/utils.c',
- '#src/mesa/drivers/dri/common/vblank.c',
- '#src/mesa/drivers/dri/common/dri_util.c',
- '#src/mesa/drivers/dri/common/xmlconfig.c',
- ]
-
- COMMON_BM_SOURCES = [
- '#src/mesa/drivers/dri/common/dri_bufmgr.c',
- '#src/mesa/drivers/dri/common/dri_drmpool.c',
- ]
-
- Export([
- 'drienv',
- 'COMMON_GALLIUM_SOURCES',
- 'COMMON_BM_SOURCES',
- ])
-
- # TODO: Installation
- #install: $(LIBNAME)
- # $(INSTALL) -d $(DRI_DRIVER_INSTALL_DIR)
- # $(INSTALL) -m 755 $(LIBNAME) $(DRI_DRIVER_INSTALL_DIR)
-
- if 'vmware' in env['winsys']:
- SConscript([
- 'vmware/SConscript',
- ])
-
- if 'intel' in env['winsys']:
- SConscript([
- 'intel/SConscript',
- ])
-
- if 'i965' in env['winsys']:
- SConscript([
- 'i965/SConscript',
- ])
-
- if 'radeon' in env['winsys']:
- SConscript([
- 'radeon/SConscript',
- ])
diff --git a/src/gallium/winsys/drm/i965/SConscript b/src/gallium/winsys/drm/i965/SConscript
deleted file mode 100644
index fdf57ee..0000000
--- a/src/gallium/winsys/drm/i965/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-Import('*')
-
-SConscript(['gem/SConscript',])
diff --git a/src/gallium/winsys/drm/intel/Makefile b/src/gallium/winsys/drm/intel/Makefile
deleted file mode 100644
index d8feef6..0000000
--- a/src/gallium/winsys/drm/intel/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/drm/intel/Makefile
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-SUBDIRS = gem $(GALLIUM_STATE_TRACKERS_DIRS)
-
-default install clean:
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) $@) || exit 1; \
- fi \
- done
diff --git a/src/gallium/winsys/drm/intel/SConscript b/src/gallium/winsys/drm/intel/SConscript
deleted file mode 100644
index fdf57ee..0000000
--- a/src/gallium/winsys/drm/intel/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-Import('*')
-
-SConscript(['gem/SConscript',])
diff --git a/src/gallium/winsys/drm/nouveau/Makefile b/src/gallium/winsys/drm/nouveau/Makefile
deleted file mode 100644
index 6c9cbef..0000000
--- a/src/gallium/winsys/drm/nouveau/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/drm/nouveau/Makefile
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-SUBDIRS = drm $(GALLIUM_STATE_TRACKERS_DIRS)
-
-default install clean:
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) $@) || exit 1; \
- fi \
- done
diff --git a/src/gallium/winsys/drm/radeon/Makefile b/src/gallium/winsys/drm/radeon/Makefile
deleted file mode 100644
index bacdf3d..0000000
--- a/src/gallium/winsys/drm/radeon/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/drm/radeon/Makefile
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-SUBDIRS = core $(GALLIUM_STATE_TRACKERS_DIRS)
-
-default install clean:
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) $@) || exit 1; \
- fi \
- done
diff --git a/src/gallium/winsys/drm/radeon/SConscript b/src/gallium/winsys/drm/radeon/SConscript
deleted file mode 100644
index eff87e7..0000000
--- a/src/gallium/winsys/drm/radeon/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-Import('*')
-
-SConscript(['core/SConscript',])
diff --git a/src/gallium/winsys/drm/vmware/Makefile b/src/gallium/winsys/drm/vmware/Makefile
deleted file mode 100644
index 2ae6dea..0000000
--- a/src/gallium/winsys/drm/vmware/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/drm/vmware/Makefile
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-SUBDIRS = core $(GALLIUM_STATE_TRACKERS_DIRS)
-
-default install clean:
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) $@) || exit 1; \
- fi \
- done
diff --git a/src/gallium/winsys/drm/vmware/SConscript b/src/gallium/winsys/drm/vmware/SConscript
deleted file mode 100644
index eff87e7..0000000
--- a/src/gallium/winsys/drm/vmware/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-Import('*')
-
-SConscript(['core/SConscript',])
diff --git a/src/gallium/winsys/drm/intel/gem/Makefile b/src/gallium/winsys/i915/drm/Makefile
similarity index 82%
rename from src/gallium/winsys/drm/intel/gem/Makefile
rename to src/gallium/winsys/i915/drm/Makefile
index 0d6d4e3..4aac330 100644
--- a/src/gallium/winsys/drm/intel/gem/Makefile
+++ b/src/gallium/winsys/i915/drm/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../../../..
+TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = inteldrm
@@ -13,4 +13,4 @@ LIBRARY_INCLUDES = $(shell pkg-config libdrm --cflags-only-I)
LIBRARY_DEFINES = $(shell pkg-config libdrm --cflags-only-other)
-include ../../../../Makefile.template
+include ../../../Makefile.template
diff --git a/src/gallium/winsys/drm/intel/gem/SConscript b/src/gallium/winsys/i915/drm/SConscript
similarity index 100%
rename from src/gallium/winsys/drm/intel/gem/SConscript
rename to src/gallium/winsys/i915/drm/SConscript
diff --git a/src/gallium/winsys/drm/intel/gem/intel_drm_api.c b/src/gallium/winsys/i915/drm/intel_drm_api.c
similarity index 100%
rename from src/gallium/winsys/drm/intel/gem/intel_drm_api.c
rename to src/gallium/winsys/i915/drm/intel_drm_api.c
diff --git a/src/gallium/winsys/drm/intel/gem/intel_drm_batchbuffer.c b/src/gallium/winsys/i915/drm/intel_drm_batchbuffer.c
similarity index 100%
rename from src/gallium/winsys/drm/intel/gem/intel_drm_batchbuffer.c
rename to src/gallium/winsys/i915/drm/intel_drm_batchbuffer.c
diff --git a/src/gallium/winsys/drm/intel/gem/intel_drm_buffer.c b/src/gallium/winsys/i915/drm/intel_drm_buffer.c
similarity index 100%
rename from src/gallium/winsys/drm/intel/gem/intel_drm_buffer.c
rename to src/gallium/winsys/i915/drm/intel_drm_buffer.c
diff --git a/src/gallium/winsys/drm/intel/gem/intel_drm_fence.c b/src/gallium/winsys/i915/drm/intel_drm_fence.c
similarity index 100%
rename from src/gallium/winsys/drm/intel/gem/intel_drm_fence.c
rename to src/gallium/winsys/i915/drm/intel_drm_fence.c
diff --git a/src/gallium/winsys/drm/intel/gem/intel_drm_winsys.h b/src/gallium/winsys/i915/drm/intel_drm_winsys.h
similarity index 100%
rename from src/gallium/winsys/drm/intel/gem/intel_drm_winsys.h
rename to src/gallium/winsys/i915/drm/intel_drm_winsys.h
diff --git a/src/gallium/winsys/drm/i965/gem/Makefile b/src/gallium/winsys/i965/drm/Makefile
similarity index 78%
rename from src/gallium/winsys/drm/i965/gem/Makefile
rename to src/gallium/winsys/i965/drm/Makefile
index 6a7497b..bbb71e2 100644
--- a/src/gallium/winsys/drm/i965/gem/Makefile
+++ b/src/gallium/winsys/i965/drm/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../../../..
+TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = i965drm
@@ -11,4 +11,4 @@ LIBRARY_INCLUDES = $(shell pkg-config libdrm --cflags-only-I)
LIBRARY_DEFINES = $(shell pkg-config libdrm --cflags-only-other)
-include ../../../../Makefile.template
+include ../../../Makefile.template
diff --git a/src/gallium/winsys/drm/i965/gem/SConscript b/src/gallium/winsys/i965/drm/SConscript
similarity index 100%
rename from src/gallium/winsys/drm/i965/gem/SConscript
rename to src/gallium/winsys/i965/drm/SConscript
diff --git a/src/gallium/winsys/drm/i965/gem/i965_drm_api.c b/src/gallium/winsys/i965/drm/i965_drm_api.c
similarity index 98%
rename from src/gallium/winsys/drm/i965/gem/i965_drm_api.c
rename to src/gallium/winsys/i965/drm/i965_drm_api.c
index c644eed..9072a18 100644
--- a/src/gallium/winsys/drm/i965/gem/i965_drm_api.c
+++ b/src/gallium/winsys/i965/drm/i965_drm_api.c
@@ -10,7 +10,7 @@
#include "trace/tr_drm.h"
-#include "../../sw/sw_drm_api.h"
+#include "../../sw/drm/sw_drm_api.h"
/*
* Helper functions
diff --git a/src/gallium/winsys/drm/i965/gem/i965_drm_buffer.c b/src/gallium/winsys/i965/drm/i965_drm_buffer.c
similarity index 100%
rename from src/gallium/winsys/drm/i965/gem/i965_drm_buffer.c
rename to src/gallium/winsys/i965/drm/i965_drm_buffer.c
diff --git a/src/gallium/winsys/drm/i965/gem/i965_drm_winsys.h b/src/gallium/winsys/i965/drm/i965_drm_winsys.h
similarity index 100%
rename from src/gallium/winsys/drm/i965/gem/i965_drm_winsys.h
rename to src/gallium/winsys/i965/drm/i965_drm_winsys.h
diff --git a/src/gallium/winsys/drm/i965/xlib/Makefile b/src/gallium/winsys/i965/xlib/Makefile
similarity index 97%
rename from src/gallium/winsys/drm/i965/xlib/Makefile
rename to src/gallium/winsys/i965/xlib/Makefile
index 0efa0ca..3730db6 100644
--- a/src/gallium/winsys/drm/i965/xlib/Makefile
+++ b/src/gallium/winsys/i965/xlib/Makefile
@@ -1,10 +1,10 @@
-# src/gallium/winsys/xlib/Makefile
+# src/gallium/winsys/i965/xlib/Makefile
# This makefile produces a "stand-alone" libGL.so which is based on
# Xlib (no DRI HW acceleration)
-TOP = ../../../../../..
+TOP = ../../../../..
include $(TOP)/configs/current
diff --git a/src/gallium/winsys/drm/i965/xlib/xlib_i965.c b/src/gallium/winsys/i965/xlib/xlib_i965.c
similarity index 100%
rename from src/gallium/winsys/drm/i965/xlib/xlib_i965.c
rename to src/gallium/winsys/i965/xlib/xlib_i965.c
diff --git a/src/gallium/winsys/drm/nouveau/drm/Makefile b/src/gallium/winsys/nouveau/drm/Makefile
similarity index 79%
rename from src/gallium/winsys/drm/nouveau/drm/Makefile
rename to src/gallium/winsys/nouveau/drm/Makefile
index 54c3b26..7102985 100644
--- a/src/gallium/winsys/drm/nouveau/drm/Makefile
+++ b/src/gallium/winsys/nouveau/drm/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../../../..
+TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = nouveaudrm
@@ -8,4 +8,4 @@ C_SOURCES = nouveau_drm_api.c
LIBRARY_INCLUDES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-I)
LIBRARY_DEFINES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-other)
-include ../../../../Makefile.template
+include ../../../Makefile.template
diff --git a/src/gallium/winsys/drm/nouveau/drm/nouveau_dri.h b/src/gallium/winsys/nouveau/drm/nouveau_dri.h
similarity index 100%
rename from src/gallium/winsys/drm/nouveau/drm/nouveau_dri.h
rename to src/gallium/winsys/nouveau/drm/nouveau_dri.h
diff --git a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c b/src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
similarity index 100%
rename from src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
rename to src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
diff --git a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.h b/src/gallium/winsys/nouveau/drm/nouveau_drm_api.h
similarity index 100%
rename from src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.h
rename to src/gallium/winsys/nouveau/drm/nouveau_drm_api.h
diff --git a/src/gallium/winsys/drm/radeon/core/Makefile b/src/gallium/winsys/radeon/drm/Makefile
similarity index 79%
rename from src/gallium/winsys/drm/radeon/core/Makefile
rename to src/gallium/winsys/radeon/drm/Makefile
index 13bbbf7..7f69e39 100644
--- a/src/gallium/winsys/drm/radeon/core/Makefile
+++ b/src/gallium/winsys/radeon/drm/Makefile
@@ -1,5 +1,5 @@
-TOP = ../../../../../..
+TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = radeonwinsys
@@ -12,6 +12,6 @@ C_SOURCES = \
LIBRARY_INCLUDES = -I$(TOP)/src/gallium/drivers/r300 \
$(shell pkg-config libdrm --cflags-only-I)
-include ../../../../Makefile.template
+include ../../../Makefile.template
symlinks:
diff --git a/src/gallium/winsys/drm/radeon/core/SConscript b/src/gallium/winsys/radeon/drm/SConscript
similarity index 100%
rename from src/gallium/winsys/drm/radeon/core/SConscript
rename to src/gallium/winsys/radeon/drm/SConscript
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_buffer.h b/src/gallium/winsys/radeon/drm/radeon_buffer.h
similarity index 100%
rename from src/gallium/winsys/drm/radeon/core/radeon_buffer.h
rename to src/gallium/winsys/radeon/drm/radeon_buffer.h
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.c b/src/gallium/winsys/radeon/drm/radeon_drm.c
similarity index 100%
rename from src/gallium/winsys/drm/radeon/core/radeon_drm.c
rename to src/gallium/winsys/radeon/drm/radeon_drm.c
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.h b/src/gallium/winsys/radeon/drm/radeon_drm.h
similarity index 100%
rename from src/gallium/winsys/drm/radeon/core/radeon_drm.h
rename to src/gallium/winsys/radeon/drm/radeon_drm.h
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm_buffer.c b/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c
similarity index 100%
rename from src/gallium/winsys/drm/radeon/core/radeon_drm_buffer.c
rename to src/gallium/winsys/radeon/drm/radeon_drm_buffer.c
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_r300.c b/src/gallium/winsys/radeon/drm/radeon_r300.c
similarity index 100%
rename from src/gallium/winsys/drm/radeon/core/radeon_r300.c
rename to src/gallium/winsys/radeon/drm/radeon_r300.c
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_r300.h b/src/gallium/winsys/radeon/drm/radeon_r300.h
similarity index 100%
rename from src/gallium/winsys/drm/radeon/core/radeon_r300.h
rename to src/gallium/winsys/radeon/drm/radeon_r300.h
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h
similarity index 100%
rename from src/gallium/winsys/drm/radeon/core/radeon_winsys.h
rename to src/gallium/winsys/radeon/drm/radeon_winsys.h
diff --git a/src/gallium/winsys/drm/vmware/core/Makefile b/src/gallium/winsys/svga/drm/Makefile
similarity index 63%
rename from src/gallium/winsys/drm/vmware/core/Makefile
rename to src/gallium/winsys/svga/drm/Makefile
index a52957c..c2f59e0 100644
--- a/src/gallium/winsys/drm/vmware/core/Makefile
+++ b/src/gallium/winsys/svga/drm/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../../../..
+TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = svgadrm
@@ -17,14 +17,6 @@ C_SOURCES = \
LIBRARY_INCLUDES = \
-I$(TOP)/src/gallium/drivers/svga \
-I$(TOP)/src/gallium/drivers/svga/include \
- -I$(GALLIUM)/src/mesa/drivers/dri/common \
- -I$(GALLIUM)/include \
- -I$(GALLIUM)/include/GL/internal \
- -I$(GALLIUM)/src/mesa \
- -I$(GALLIUM)/src/mesa/main \
- -I$(GALLIUM)/src/mesa/glapi \
- -I$(GALLIUM)/src/egl/main \
- -I$(GALLIUM)/src/egl/drivers/dri \
$(shell pkg-config libdrm --cflags-only-I)
LIBRARY_DEFINES = \
@@ -32,4 +24,4 @@ LIBRARY_DEFINES = \
-DHAVE_STDINT_H -D_FILE_OFFSET_BITS=64 \
$(shell pkg-config libdrm --cflags-only-other)
-include ../../../../Makefile.template
+include ../../../Makefile.template
diff --git a/src/gallium/winsys/drm/vmware/core/SConscript b/src/gallium/winsys/svga/drm/SConscript
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/SConscript
rename to src/gallium/winsys/svga/drm/SConscript
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_buffer.c b/src/gallium/winsys/svga/drm/vmw_buffer.c
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_buffer.c
rename to src/gallium/winsys/svga/drm/vmw_buffer.c
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_buffer.h b/src/gallium/winsys/svga/drm/vmw_buffer.h
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_buffer.h
rename to src/gallium/winsys/svga/drm/vmw_buffer.h
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_context.c b/src/gallium/winsys/svga/drm/vmw_context.c
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_context.c
rename to src/gallium/winsys/svga/drm/vmw_context.c
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_context.h b/src/gallium/winsys/svga/drm/vmw_context.h
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_context.h
rename to src/gallium/winsys/svga/drm/vmw_context.h
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_fence.c b/src/gallium/winsys/svga/drm/vmw_fence.c
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_fence.c
rename to src/gallium/winsys/svga/drm/vmw_fence.c
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_fence.h b/src/gallium/winsys/svga/drm/vmw_fence.h
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_fence.h
rename to src/gallium/winsys/svga/drm/vmw_fence.h
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_screen.c b/src/gallium/winsys/svga/drm/vmw_screen.c
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_screen.c
rename to src/gallium/winsys/svga/drm/vmw_screen.c
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_screen.h
rename to src/gallium/winsys/svga/drm/vmw_screen.h
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c b/src/gallium/winsys/svga/drm/vmw_screen_dri.c
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
rename to src/gallium/winsys/svga/drm/vmw_screen_dri.c
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c
rename to src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_screen_pools.c b/src/gallium/winsys/svga/drm/vmw_screen_pools.c
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_screen_pools.c
rename to src/gallium/winsys/svga/drm/vmw_screen_pools.c
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_screen_svga.c b/src/gallium/winsys/svga/drm/vmw_screen_svga.c
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_screen_svga.c
rename to src/gallium/winsys/svga/drm/vmw_screen_svga.c
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_surface.c b/src/gallium/winsys/svga/drm/vmw_surface.c
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_surface.c
rename to src/gallium/winsys/svga/drm/vmw_surface.c
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_surface.h b/src/gallium/winsys/svga/drm/vmw_surface.h
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmw_surface.h
rename to src/gallium/winsys/svga/drm/vmw_surface.h
diff --git a/src/gallium/winsys/drm/vmware/core/vmwgfx_drm.h b/src/gallium/winsys/svga/drm/vmwgfx_drm.h
similarity index 100%
rename from src/gallium/winsys/drm/vmware/core/vmwgfx_drm.h
rename to src/gallium/winsys/svga/drm/vmwgfx_drm.h
diff --git a/src/gallium/winsys/drm/i965/Makefile b/src/gallium/winsys/sw/Makefile
similarity index 61%
rename from src/gallium/winsys/drm/i965/Makefile
rename to src/gallium/winsys/sw/Makefile
index d8feef6..e9182ea 100644
--- a/src/gallium/winsys/drm/i965/Makefile
+++ b/src/gallium/winsys/sw/Makefile
@@ -1,8 +1,8 @@
-# src/gallium/winsys/drm/intel/Makefile
-TOP = ../../../../..
+# src/gallium/winsys/sw/Makefile
+TOP = ../../../..
include $(TOP)/configs/current
-SUBDIRS = gem $(GALLIUM_STATE_TRACKERS_DIRS)
+SUBDIRS = null wrapper
default install clean:
@for dir in $(SUBDIRS) ; do \
diff --git a/src/gallium/winsys/drm/sw/Makefile b/src/gallium/winsys/sw/drm/Makefile
similarity index 73%
copy from src/gallium/winsys/drm/sw/Makefile
copy to src/gallium/winsys/sw/drm/Makefile
index 5f3c3ec..7966453 100644
--- a/src/gallium/winsys/drm/sw/Makefile
+++ b/src/gallium/winsys/sw/drm/Makefile
@@ -3,9 +3,7 @@ include $(TOP)/configs/current
LIBNAME = swdrm
-C_SOURCES = \
- wrapper_sw_winsys.c \
- sw_drm_api.c
+C_SOURCES = sw_drm_api.c
LIBRARY_INCLUDES =
diff --git a/src/gallium/winsys/drm/sw/sw_drm_api.c b/src/gallium/winsys/sw/drm/sw_drm_api.c
similarity index 98%
rename from src/gallium/winsys/drm/sw/sw_drm_api.c
rename to src/gallium/winsys/sw/drm/sw_drm_api.c
index 0fd2163..eb81d26 100644
--- a/src/gallium/winsys/drm/sw/sw_drm_api.c
+++ b/src/gallium/winsys/sw/drm/sw_drm_api.c
@@ -27,7 +27,7 @@
#include "util/u_memory.h"
#include "softpipe/sp_public.h"
#include "state_tracker/drm_api.h"
-#include "wrapper_sw_winsys.h"
+#include "../../sw/wrapper/wrapper_sw_winsys.h"
#include "sw_drm_api.h"
diff --git a/src/gallium/winsys/drm/sw/sw_drm_api.h b/src/gallium/winsys/sw/drm/sw_drm_api.h
similarity index 100%
rename from src/gallium/winsys/drm/sw/sw_drm_api.h
rename to src/gallium/winsys/sw/drm/sw_drm_api.h
diff --git a/src/gallium/winsys/gdi/SConscript b/src/gallium/winsys/sw/gdi/SConscript
similarity index 100%
rename from src/gallium/winsys/gdi/SConscript
rename to src/gallium/winsys/sw/gdi/SConscript
diff --git a/src/gallium/winsys/gdi/gdi_sw_winsys.c b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
similarity index 100%
rename from src/gallium/winsys/gdi/gdi_sw_winsys.c
rename to src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
diff --git a/src/gallium/winsys/gdi/gdi_sw_winsys.h b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
similarity index 100%
rename from src/gallium/winsys/gdi/gdi_sw_winsys.h
rename to src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
diff --git a/src/gallium/winsys/null/Makefile b/src/gallium/winsys/sw/null/Makefile
similarity index 78%
rename from src/gallium/winsys/null/Makefile
rename to src/gallium/winsys/sw/null/Makefile
index 3a3fb75..b1882b5 100644
--- a/src/gallium/winsys/null/Makefile
+++ b/src/gallium/winsys/sw/null/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../..
+TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = ws_null
@@ -11,6 +11,6 @@ LIBRARY_INCLUDES = \
C_SOURCES = \
null_sw_winsys.c
-include ../../Makefile.template
+include ../../../Makefile.template
diff --git a/src/gallium/winsys/null/SConscript b/src/gallium/winsys/sw/null/SConscript
similarity index 100%
rename from src/gallium/winsys/null/SConscript
rename to src/gallium/winsys/sw/null/SConscript
diff --git a/src/gallium/winsys/null/null_sw_winsys.c b/src/gallium/winsys/sw/null/null_sw_winsys.c
similarity index 100%
rename from src/gallium/winsys/null/null_sw_winsys.c
rename to src/gallium/winsys/sw/null/null_sw_winsys.c
diff --git a/src/gallium/winsys/null/null_sw_winsys.h b/src/gallium/winsys/sw/null/null_sw_winsys.h
similarity index 100%
rename from src/gallium/winsys/null/null_sw_winsys.h
rename to src/gallium/winsys/sw/null/null_sw_winsys.h
diff --git a/src/gallium/winsys/drm/sw/Makefile b/src/gallium/winsys/sw/wrapper/Makefile
similarity index 65%
rename from src/gallium/winsys/drm/sw/Makefile
rename to src/gallium/winsys/sw/wrapper/Makefile
index 5f3c3ec..4771fbc 100644
--- a/src/gallium/winsys/drm/sw/Makefile
+++ b/src/gallium/winsys/sw/wrapper/Makefile
@@ -1,11 +1,9 @@
TOP = ../../../../..
include $(TOP)/configs/current
-LIBNAME = swdrm
+LIBNAME = wsw
-C_SOURCES = \
- wrapper_sw_winsys.c \
- sw_drm_api.c
+C_SOURCES = wrapper_sw_winsys.c
LIBRARY_INCLUDES =
diff --git a/src/gallium/winsys/drm/sw/wrapper_sw_winsys.c b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
similarity index 100%
rename from src/gallium/winsys/drm/sw/wrapper_sw_winsys.c
rename to src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
diff --git a/src/gallium/winsys/drm/sw/wrapper_sw_winsys.h b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.h
similarity index 100%
rename from src/gallium/winsys/drm/sw/wrapper_sw_winsys.h
rename to src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.h
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/sw/xlib/Makefile
similarity index 79%
rename from src/gallium/winsys/xlib/Makefile
rename to src/gallium/winsys/sw/xlib/Makefile
index 83d53c5..c669389 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/sw/xlib/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../..
+TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = ws_xlib
@@ -12,6 +12,6 @@ LIBRARY_INCLUDES = \
C_SOURCES = \
xlib_sw_winsys.c
-include ../../Makefile.template
+include ../../../Makefile.template
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
similarity index 100%
rename from src/gallium/winsys/xlib/SConscript
rename to src/gallium/winsys/sw/xlib/SConscript
diff --git a/src/gallium/winsys/xlib/xlib_sw_winsys.c b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
similarity index 100%
rename from src/gallium/winsys/xlib/xlib_sw_winsys.c
rename to src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
More information about the mesa-commit
mailing list