diff options
| author | Jakob Bornecrantz <[email protected]> | 2010-06-28 20:59:09 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2010-06-28 21:14:45 +0200 |
| commit | a01e0afd9fc0d647081c6903baa1a7ba505c4b05 (patch) | |
| tree | 7e04eb2b4e87137455920f6131b064dc87056e14 /src/gallium/targets/xorg-radeon | |
| parent | 250b92f3bb4fc4a53f3150b0e8ff1e121a5adbc7 (diff) | |
| parent | 9ca563a9a8573bf79821abc75ccf0fdade19c8a9 (diff) | |
Merge branch 'gallium-drm-driver-drescriptor'
Conflicts:
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/radeon/drm/radeon_drm.c
Diffstat (limited to 'src/gallium/targets/xorg-radeon')
| -rw-r--r-- | src/gallium/targets/xorg-radeon/Makefile | 3 | ||||
| -rw-r--r-- | src/gallium/targets/xorg-radeon/radeon_target.c | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/gallium/targets/xorg-radeon/Makefile b/src/gallium/targets/xorg-radeon/Makefile index 6cbc61e7aec..caf2ac98b94 100644 --- a/src/gallium/targets/xorg-radeon/Makefile +++ b/src/gallium/targets/xorg-radeon/Makefile @@ -4,10 +4,11 @@ include $(TOP)/configs/current LIBNAME = radeon_drv.so C_SOURCES = \ + radeon_target.c \ radeon_xorg.c DRIVER_DEFINES = \ - -DHAVE_CONFIG_H + -DHAVE_CONFIG_H -DGALLIUM_RBUG -DGALLIUM_TRACE DRIVER_LINKS = \ $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \ diff --git a/src/gallium/targets/xorg-radeon/radeon_target.c b/src/gallium/targets/xorg-radeon/radeon_target.c new file mode 100644 index 00000000000..5a0a8dc5738 --- /dev/null +++ b/src/gallium/targets/xorg-radeon/radeon_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("radeon", "radeon", create_screen) |