diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-06-29 14:04:27 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-06-29 17:16:20 +0800 |
| commit | d8e0e114567ec19fd59f974080a418dc959cc9b6 (patch) | |
| tree | e4e435f5ad82ac3c521fc595bc51895ad4dfcc1b /src/gallium/targets/egl-swrast | |
| parent | ea05299ce54ea0463626277907cab8e849884740 (diff) | |
st/egl: Reorganize targets.
Merge all targets into targets/egl/. The target produces
egl_gallium_<HW>.so for each pipe driver and st_<API>.so for each client
APIs. This enables us to further merge egl_gallium_<HW>.so into
egl_gallium.so later.
Diffstat (limited to 'src/gallium/targets/egl-swrast')
| -rw-r--r-- | src/gallium/targets/egl-swrast/Makefile | 12 | ||||
| -rw-r--r-- | src/gallium/targets/egl-swrast/SConscript | 30 | ||||
| -rw-r--r-- | src/gallium/targets/egl-swrast/swrast_glue.c | 12 |
3 files changed, 0 insertions, 54 deletions
diff --git a/src/gallium/targets/egl-swrast/Makefile b/src/gallium/targets/egl-swrast/Makefile deleted file mode 100644 index 7d4f505498..0000000000 --- a/src/gallium/targets/egl-swrast/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -# Do propperly -CFLAGS+="-I$(TOP)/src/gallium/include" - -EGL_DRIVER_NAME = swrast -EGL_DRIVER_SOURCES = swrast_glue.c -EGL_DRIVER_LIBS = -EGL_DRIVER_PIPES = - -include ../Makefile.egl diff --git a/src/gallium/targets/egl-swrast/SConscript b/src/gallium/targets/egl-swrast/SConscript deleted file mode 100644 index 213e5b3e6c..0000000000 --- a/src/gallium/targets/egl-swrast/SConscript +++ /dev/null @@ -1,30 +0,0 @@ -####################################################################### -# SConscript for egl-swrast target - -Import('*') - -if env['platform'] == 'windows': - - env = env.Clone() - - env.Append(LIBS = [ - 'gdi32', - 'user32', - 'kernel32', - 'ws2_32', - ]) - - drivers = [softpipe] - if env['llvm']: - drivers += [llvmpipe] - drivers += [identity, trace, rbug] - - env['no_import_lib'] = 1 - - egl_gdi_swrast = env.SharedLibrary( - target ='egl_gdi_swrast', - source = 'swrast_glue.c', - LIBS = st_egl_gdi + ws_gdi + drivers + gallium + egl + env['LIBS'], - ) - - env.InstallSharedLibrary(egl_gdi_swrast) diff --git a/src/gallium/targets/egl-swrast/swrast_glue.c b/src/gallium/targets/egl-swrast/swrast_glue.c deleted file mode 100644 index 24f77826d4..0000000000 --- a/src/gallium/targets/egl-swrast/swrast_glue.c +++ /dev/null @@ -1,12 +0,0 @@ - -#include "state_tracker/drm_driver.h" - -struct drm_driver_descriptor drm_driver = { - .name = "swrast", - .driver_name = NULL, - .create_screen = NULL, -}; - -/* A poor man's --whole-archive for EGL drivers */ -void *_eglMain(void *); -void *_eglWholeArchive = (void *) _eglMain; |