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%)
This commit is contained in:
Jakob Bornecrantz
+1
-1
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
|
||||
+7
-7
@@ -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
|
||||
|
||||
@@ -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':
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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',
|
||||
])
|
||||
|
||||
@@ -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',
|
||||
])
|
||||
@@ -1,3 +0,0 @@
|
||||
Import('*')
|
||||
|
||||
SConscript(['gem/SConscript',])
|
||||
@@ -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
|
||||
@@ -1,3 +0,0 @@
|
||||
Import('*')
|
||||
|
||||
SConscript(['gem/SConscript',])
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -1,3 +0,0 @@
|
||||
Import('*')
|
||||
|
||||
SConscript(['core/SConscript',])
|
||||
@@ -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
|
||||
@@ -1,3 +0,0 @@
|
||||
Import('*')
|
||||
|
||||
SConscript(['core/SConscript',])
|
||||
@@ -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
|
||||
@@ -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
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "trace/tr_drm.h"
|
||||
|
||||
#include "../../sw/sw_drm_api.h"
|
||||
#include "../../sw/drm/sw_drm_api.h"
|
||||
|
||||
/*
|
||||
* Helper functions
|
||||
@@ -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
|
||||
|
||||
|
||||
+2
-2
@@ -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
|
||||
+2
-2
@@ -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:
|
||||
@@ -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
|
||||
@@ -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 \
|
||||
@@ -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 =
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
TOP = ../../../../..
|
||||
include $(TOP)/configs/current
|
||||
|
||||
LIBNAME = wsw
|
||||
|
||||
C_SOURCES = wrapper_sw_winsys.c
|
||||
|
||||
LIBRARY_INCLUDES =
|
||||
|
||||
LIBRARY_DEFINES =
|
||||
|
||||
include ../../../Makefile.template
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user