diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-07-22 19:25:07 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-08-16 09:15:10 +0200 |
| commit | ce12f826927cf2d3ac3fd70d893abfb07adc23db (patch) | |
| tree | 021390666894835790a38127546ed1a4becd137a /src/gallium/targets/gbm | |
| parent | 8c409403217cf8c13e1d2dd306ad5e86b566c5c9 (diff) | |
| download | external_mesa3d-ce12f826927cf2d3ac3fd70d893abfb07adc23db.zip external_mesa3d-ce12f826927cf2d3ac3fd70d893abfb07adc23db.tar.gz external_mesa3d-ce12f826927cf2d3ac3fd70d893abfb07adc23db.tar.bz2 | |
r600g: first step into winsys/radeon
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/gallium/targets/gbm')
| -rw-r--r-- | src/gallium/targets/gbm/Makefile | 10 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/pipe_r600.c | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/gallium/targets/gbm/Makefile b/src/gallium/targets/gbm/Makefile index faacc89..033a1ac 100644 --- a/src/gallium/targets/gbm/Makefile +++ b/src/gallium/targets/gbm/Makefile @@ -83,6 +83,7 @@ r300_LIBS = \ # r600 pipe driver r600_LIBS = \ $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ + $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r600/libr600.a # vmwgfx pipe driver @@ -90,13 +91,18 @@ vmwgfx_LIBS = \ $(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \ $(TOP)/src/gallium/drivers/svga/libsvga.a + + # LLVM ifeq ($(MESA_LLVM),1) -pipe_LIBS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a pipe_SYS += $(LLVM_LIBS) pipe_LDFLAGS += $(LLVM_LDFLAGS) endif +ifneq ($(findstring llvmpipe,$(GALLIUM_DRIVERS_DIRS)),) +pipe_LIBS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a +endif + # determine the targets/sources pipe_TARGETS = pipe_SOURCES = @@ -117,9 +123,11 @@ pipe_SOURCES += pipe_nouveau.c endif ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring r300,$(GALLIUM_DRIVERS_DIRS)),) pipe_TARGETS += $(PIPE_PREFIX)r300.so pipe_SOURCES += pipe_r300.c endif +endif ifneq ($(findstring r600/drm,$(GALLIUM_WINSYS_DIRS)),) pipe_TARGETS += $(PIPE_PREFIX)r600.so diff --git a/src/gallium/targets/gbm/pipe_r600.c b/src/gallium/targets/gbm/pipe_r600.c index 486a659..9f61a51 100644 --- a/src/gallium/targets/gbm/pipe_r600.c +++ b/src/gallium/targets/gbm/pipe_r600.c @@ -1,16 +1,15 @@ - #include "state_tracker/drm_driver.h" #include "target-helpers/inline_debug_helper.h" -#include "r600/drm/r600_drm_public.h" +#include "radeon/drm/radeon_drm_public.h" #include "r600/r600_public.h" static struct pipe_screen * create_screen(int fd) { - struct radeon *rw; + struct radeon_winsys *rw; struct pipe_screen *screen; - rw = r600_drm_winsys_create(fd); + rw = radeon_drm_winsys_create(fd); if (!rw) return NULL; |