From 37f0654fa56a97c6f4ea6220c97758ee95267e0b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sun, 22 Aug 2010 17:28:20 +1000 Subject: r300g: rename radeong_dri.so to r300_dri.so acked on irc by Corbin + Marek. --- configure.ac | 2 +- src/gallium/targets/dri-r300/Makefile | 27 +++++++++++++++++++++++++++ src/gallium/targets/dri-r300/SConscript | 30 ++++++++++++++++++++++++++++++ src/gallium/targets/dri-r300/target.c | 26 ++++++++++++++++++++++++++ src/gallium/targets/dri-radeong/Makefile | 27 --------------------------- src/gallium/targets/dri-radeong/SConscript | 30 ------------------------------ src/gallium/targets/dri-radeong/target.c | 26 -------------------------- 7 files changed, 84 insertions(+), 84 deletions(-) create mode 100644 src/gallium/targets/dri-r300/Makefile create mode 100644 src/gallium/targets/dri-r300/SConscript create mode 100644 src/gallium/targets/dri-r300/target.c delete mode 100644 src/gallium/targets/dri-radeong/Makefile delete mode 100644 src/gallium/targets/dri-radeong/SConscript delete mode 100644 src/gallium/targets/dri-radeong/target.c diff --git a/configure.ac b/configure.ac index b2c6b52d2e..0b60837bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -1488,7 +1488,7 @@ AC_ARG_ENABLE([gallium-radeon], [enable_gallium_radeon=auto]) if test "x$enable_gallium_radeon" = xyes; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" - gallium_check_st "radeon/drm" "dri-radeong" "xorg-radeon" + gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon" elif test "x$enable_gallium_radeon" = xauto; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" fi diff --git a/src/gallium/targets/dri-r300/Makefile b/src/gallium/targets/dri-r300/Makefile new file mode 100644 index 0000000000..9afbb13276 --- /dev/null +++ b/src/gallium/targets/dri-r300/Makefile @@ -0,0 +1,27 @@ +TOP = ../../../.. +include $(TOP)/configs/current + +LIBNAME = r300_dri.so + +PIPE_DRIVERS = \ + $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \ + $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ + $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ + $(TOP)/src/gallium/drivers/galahad/libgalahad.a \ + $(TOP)/src/gallium/drivers/trace/libtrace.a \ + $(TOP)/src/gallium/drivers/rbug/librbug.a \ + $(TOP)/src/gallium/drivers/r300/libr300.a + +C_SOURCES = \ + target.c \ + $(COMMON_GALLIUM_SOURCES) \ + $(DRIVER_SOURCES) + +DRIVER_DEFINES = \ + -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD + +include ../Makefile.dri + +DRI_LIB_DEPS += -ldrm_radeon + +symlinks: diff --git a/src/gallium/targets/dri-r300/SConscript b/src/gallium/targets/dri-r300/SConscript new file mode 100644 index 0000000000..33a458f2e6 --- /dev/null +++ b/src/gallium/targets/dri-r300/SConscript @@ -0,0 +1,30 @@ +Import('*') + +if not 'r300' in env['drivers']: + print 'warning: r300 pipe driver not built skipping r300_dri.so' + Return() + +env = drienv.Clone() + +env.ParseConfig('pkg-config --cflags --libs libdrm_radeon') + +env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD']) + +env.Prepend(LIBS = [ + st_dri, + radeonwinsys, + r300, + galahad, + trace, + rbug, + mesa, + glsl, + gallium, + COMMON_DRI_DRM_OBJECTS +]) + +env.SharedLibrary( + target ='r300_dri.so', + source = 'target.c', + SHLIBPREFIX = '', +) diff --git a/src/gallium/targets/dri-r300/target.c b/src/gallium/targets/dri-r300/target.c new file mode 100644 index 0000000000..2ecf3457a7 --- /dev/null +++ b/src/gallium/targets/dri-r300/target.c @@ -0,0 +1,26 @@ + +#include "target-helpers/inline_debug_helper.h" +#include "state_tracker/drm_driver.h" +#include "radeon/drm/radeon_drm_public.h" +#include "r300/r300_public.h" + +static struct pipe_screen * +create_screen(int fd) +{ + struct r300_winsys_screen *sws; + struct pipe_screen *screen; + + sws = r300_drm_winsys_screen_create(fd); + if (!sws) + return NULL; + + screen = r300_screen_create(sws); + if (!screen) + return NULL; + + screen = debug_screen_wrap(screen); + + return screen; +} + +DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen) diff --git a/src/gallium/targets/dri-radeong/Makefile b/src/gallium/targets/dri-radeong/Makefile deleted file mode 100644 index 3f9ec36166..0000000000 --- a/src/gallium/targets/dri-radeong/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = radeong_dri.so - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \ - $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ - $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ - $(TOP)/src/gallium/drivers/galahad/libgalahad.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(TOP)/src/gallium/drivers/r300/libr300.a - -C_SOURCES = \ - target.c \ - $(COMMON_GALLIUM_SOURCES) \ - $(DRIVER_SOURCES) - -DRIVER_DEFINES = \ - -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD - -include ../Makefile.dri - -DRI_LIB_DEPS += -ldrm_radeon - -symlinks: diff --git a/src/gallium/targets/dri-radeong/SConscript b/src/gallium/targets/dri-radeong/SConscript deleted file mode 100644 index 1402c3bd12..0000000000 --- a/src/gallium/targets/dri-radeong/SConscript +++ /dev/null @@ -1,30 +0,0 @@ -Import('*') - -if not 'r300' in env['drivers']: - print 'warning: r300 pipe driver not built skipping radeong_dri.so' - Return() - -env = drienv.Clone() - -env.ParseConfig('pkg-config --cflags --libs libdrm_radeon') - -env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD']) - -env.Prepend(LIBS = [ - st_dri, - radeonwinsys, - r300, - galahad, - trace, - rbug, - mesa, - glsl, - gallium, - COMMON_DRI_DRM_OBJECTS -]) - -env.SharedLibrary( - target ='radeon_dri.so', - source = 'target.c', - SHLIBPREFIX = '', -) diff --git a/src/gallium/targets/dri-radeong/target.c b/src/gallium/targets/dri-radeong/target.c deleted file mode 100644 index 5a0a8dc573..0000000000 --- a/src/gallium/targets/dri-radeong/target.c +++ /dev/null @@ -1,26 +0,0 @@ - -#include "target-helpers/inline_debug_helper.h" -#include "state_tracker/drm_driver.h" -#include "radeon/drm/radeon_drm_public.h" -#include "r300/r300_public.h" - -static struct pipe_screen * -create_screen(int fd) -{ - struct r300_winsys_screen *sws; - struct pipe_screen *screen; - - sws = r300_drm_winsys_screen_create(fd); - if (!sws) - return NULL; - - screen = r300_screen_create(sws); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("radeon", "radeon", create_screen) -- cgit v1.2.3