st/egl: Fix missing symbols.

ximage backend calls gallium_wrap_screen, which requires libidentity.a
and libtrace.a.  There are also some missing symbols in i965 due to the
use of sw wrapper.

diff --git a/src/gallium/targets/Makefile.egl b/src/gallium/targets/Makefile.egl
index 30fced7e3c8aeb78f070044b5da2d55675ccd26b..9265e2eb7bc8da6d8d08fdea7daba6868c6f2a9f 100644 (file)
--- a/src/gallium/targets/Makefile.egl
+++ b/src/gallium/targets/Makefile.egl
@@ -13,8 +13,14 @@ EGL_DRIVER_OBJECTS = $(EGL_DRIVER_SOURCES:.c=.o)
 
 common_LIBS = -ldrm -lm -ldl
 
+# ximage backend calls gallium_wrap_screen, which requires libidentity.a and
+# libtrace.a
 x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a \
-        $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a
+        $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a \
+        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+        $(TOP)/src/gallium/drivers/identity/libidentity.a \
+        $(TOP)/src/gallium/drivers/trace/libtrace.a
+
 x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes
 
 kms_ST = $(TOP)/src/gallium/state_trackers/egl/libeglkms.a

diff --git a/src/gallium/targets/egl-i915/Makefile b/src/gallium/targets/egl-i915/Makefile
index efaf7b0bef98a8f93c0b903a4366a6207e8e4361..02258fb69a44265d2410607f002ce4c411e57e82 100644 (file)
--- a/src/gallium/targets/egl-i915/Makefile
+++ b/src/gallium/targets/egl-i915/Makefile
@@ -7,7 +7,6 @@ EGL_DRIVER_LIBS = -ldrm_intel
 
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \
-       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/i915/libi915.a
 

diff --git a/src/gallium/targets/egl-i965/Makefile b/src/gallium/targets/egl-i965/Makefile
index dfb3cc45a7d6ff7bc755acacbf7f39e3fa06bdfc..fad56ef55544305ff62cae29dfd89b1a54cf59be 100644 (file)
--- a/src/gallium/targets/egl-i965/Makefile
+++ b/src/gallium/targets/egl-i965/Makefile
@@ -7,8 +7,10 @@ EGL_DRIVER_LIBS = -ldrm_intel
 
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \
-       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
-       $(TOP)/src/gallium/drivers/i965/libi965.a
+       $(TOP)/src/gallium/drivers/i965/libi965.a \
+       $(TOP)/src/gallium/winsys/sw/drm/libswdrm.a \
+       $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a \
+       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
 
 include ../Makefile.egl

diff --git a/src/gallium/targets/egl-nouveau/Makefile b/src/gallium/targets/egl-nouveau/Makefile
index 3da93790f2504c3b3fadf263d0ec47e5cdc405d1..e3fa8937e83a2fb57615131c1417b148d9aed0d3 100644 (file)
--- a/src/gallium/targets/egl-nouveau/Makefile
+++ b/src/gallium/targets/egl-nouveau/Makefile
@@ -9,7 +9,6 @@ EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
        $(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
        $(TOP)/src/gallium/drivers/nv50/libnv50.a \
-       $(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
-       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
+       $(TOP)/src/gallium/drivers/nouveau/libnouveau.a
 
 include ../Makefile.egl

diff --git a/src/gallium/targets/egl-radeon/Makefile b/src/gallium/targets/egl-radeon/Makefile
index f55d84de810a8cdb508c09f20801bfcaed27d699..8daadb59791295bd8f411edd8bad425fdefab775 100644 (file)
--- a/src/gallium/targets/egl-radeon/Makefile
+++ b/src/gallium/targets/egl-radeon/Makefile
@@ -7,7 +7,6 @@ EGL_DRIVER_LIBS = -ldrm_radeon
 
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
-       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/r300/libr300.a
 

diff --git a/src/gallium/targets/egl-swrast/Makefile b/src/gallium/targets/egl-swrast/Makefile
index 937343defe5f916c669ef668a9ac2527c1770b47..7d4f5054983f2e65e05dc9876277b6515a91df3a 100644 (file)
--- a/src/gallium/targets/egl-swrast/Makefile
+++ b/src/gallium/targets/egl-swrast/Makefile
@@ -7,6 +7,6 @@ CFLAGS+="-I$(TOP)/src/gallium/include"
 EGL_DRIVER_NAME = swrast
 EGL_DRIVER_SOURCES = swrast_glue.c
 EGL_DRIVER_LIBS =
-EGL_DRIVER_PIPES = $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
+EGL_DRIVER_PIPES =
 
 include ../Makefile.egl

diff --git a/src/gallium/targets/egl-vmwgfx/Makefile b/src/gallium/targets/egl-vmwgfx/Makefile
index 6db12e03a75055f36c878600271dcfc630686e0e..5f9385f42b093e23ba8ef6a61a7c202d8f02474e 100644 (file)
--- a/src/gallium/targets/egl-vmwgfx/Makefile
+++ b/src/gallium/targets/egl-vmwgfx/Makefile
@@ -7,7 +7,6 @@ EGL_DRIVER_LIBS =
 
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \
-       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/svga/libsvga.a