diff options
author | Dave Airlie <airlied@redhat.com> | 2010-08-22 17:28:20 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-25 06:10:01 +1000 |
commit | 37f0654fa56a97c6f4ea6220c97758ee95267e0b (patch) | |
tree | 1d360964b4a41a172304625d6944cfab8b0330eb /src/gallium/targets/dri-radeong | |
parent | ad58f0d9e021065d8e6d82e1aa7387dcd206f86e (diff) |
r300g: rename radeong_dri.so to r300_dri.so
acked on irc by Corbin + Marek.
Diffstat (limited to 'src/gallium/targets/dri-radeong')
-rw-r--r-- | src/gallium/targets/dri-radeong/Makefile | 27 | ||||
-rw-r--r-- | src/gallium/targets/dri-radeong/SConscript | 30 | ||||
-rw-r--r-- | src/gallium/targets/dri-radeong/target.c | 26 |
3 files changed, 0 insertions, 83 deletions
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) |