diff options
| author | Emil Velikov <[email protected]> | 2014-06-16 23:44:22 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-07-10 01:06:47 +0100 |
| commit | 4cd1bb6a91eb7cd46d4f2e104e9a05924ed055a5 (patch) | |
| tree | 5e12826884aa68baeeef072f063ad9ccd252eb1f | |
| parent | 5b7e43aea89847100b929989c21d23da124d4936 (diff) | |
targets/dri: Add __driDriverGetExtensions_(r300|r600|radeonsi) symbols
The symbol is introduced by the mesa megadrivers, and
adding gallium support for it will allow us to merge
st/dri/drm and st/dri/sw. Resulting in a single dri library
across all of gallium.
Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Rob Clark <[email protected]>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/target-helpers/inline_drm_helper.h | 36 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 5 |
2 files changed, 41 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index 62c4f8e29a1..131798c57da 100644 --- a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h @@ -106,6 +106,18 @@ pipe_nouveau_create_screen(int fd) #endif #if defined(GALLIUM_R300) +#if defined(DRI_TARGET) +#include "dri_screen.h" + +const __DRIextension **__driDriverGetExtensions_r300(void); + +PUBLIC const __DRIextension **__driDriverGetExtensions_r300(void) +{ + globalDriverAPI = &galliumdrm_driver_api; + return galliumdrm_driver_extensions; +} +#endif + static struct pipe_screen * pipe_r300_create_screen(int fd) { @@ -117,6 +129,18 @@ pipe_r300_create_screen(int fd) #endif #if defined(GALLIUM_R600) +#if defined(DRI_TARGET) +#include "dri_screen.h" + +const __DRIextension **__driDriverGetExtensions_r600(void); + +PUBLIC const __DRIextension **__driDriverGetExtensions_r600(void) +{ + globalDriverAPI = &galliumdrm_driver_api; + return galliumdrm_driver_extensions; +} +#endif + static struct pipe_screen * pipe_r600_create_screen(int fd) { @@ -128,6 +152,18 @@ pipe_r600_create_screen(int fd) #endif #if defined(GALLIUM_RADEONSI) +#if defined(DRI_TARGET) +#include "dri_screen.h" + +const __DRIextension **__driDriverGetExtensions_radeonsi(void); + +PUBLIC const __DRIextension **__driDriverGetExtensions_radeonsi(void) +{ + globalDriverAPI = &galliumdrm_driver_api; + return galliumdrm_driver_extensions; +} +#endif + static struct pipe_screen * pipe_radeonsi_create_screen(int fd) { diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index f9d34828452..4f4c0da95ff 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -18,6 +18,11 @@ AM_CPPFLAGS += \ -DDRI_TARGET endif +if NEED_RADEON_DRM_WINSYS +AM_CPPFLAGS += \ + -DDRI_TARGET +endif + dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = gallium_dri.la |