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/egl-static | |
| 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/egl-static')
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile | 3 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/egl_pipe.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile index 42d34b8..1583ab1 100644 --- a/src/gallium/targets/egl-static/Makefile +++ b/src/gallium/targets/egl-static/Makefile @@ -117,17 +117,20 @@ endif # r300 ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring r300,$(GALLIUM_DRIVERS_DIRS)),) egl_CPPFLAGS += -D_EGL_PIPE_R300=1 egl_LIBS += \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r300/libr300.a endif +endif # r600 ifneq ($(findstring r600/drm,$(GALLIUM_WINSYS_DIRS)),) egl_CPPFLAGS += -D_EGL_PIPE_R600=1 egl_LIBS += \ $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ + $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r600/libr600.a endif diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c index 658c532..f2b50bd 100644 --- a/src/gallium/targets/egl-static/egl_pipe.c +++ b/src/gallium/targets/egl-static/egl_pipe.c @@ -42,7 +42,6 @@ #include "radeon/drm/radeon_drm_public.h" #include "r300/r300_public.h" /* for r600 */ -#include "r600/drm/r600_drm_public.h" #include "r600/r600_public.h" /* for vmwgfx */ #include "svga/drm/svga_drm_public.h" @@ -141,10 +140,10 @@ static struct pipe_screen * pipe_r600_create_screen(int fd) { #if _EGL_PIPE_R600 - 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; |