diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 1 | ||||
| -rw-r--r-- | configs/default | 6 | ||||
| -rw-r--r-- | configs/linux-dri | 2 | ||||
| -rw-r--r-- | configs/linux-dri-xcb | 13 | ||||
| -rw-r--r-- | configs/linux-egl | 6 | ||||
| -rw-r--r-- | configs/linux-opengl-es | 11 |
6 files changed, 10 insertions, 29 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index c6d315e4d2..d9fa2dafe9 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -85,7 +85,6 @@ PROGRAM_DIRS = @PROGRAM_DIRS@ DRI_DIRS = @DRI_DIRS@ WINDOW_SYSTEM = @WINDOW_SYSTEM@ EGL_DISPLAYS = @EGL_DISPLAYS@ -USING_EGL = @USING_EGL@ # Dependencies X11_INCLUDES = @X11_INCLUDES@ diff --git a/configs/default b/configs/default index ec9670dd63..3aa136b9c5 100644 --- a/configs/default +++ b/configs/default @@ -93,15 +93,15 @@ DRIVER_DIRS = x11 osmesa PROGRAM_DIRS = demos redbook samples glsl objviewer xdemos # EGL drivers to build -EGL_DRIVERS_DIRS = demo +EGL_DRIVERS_DIRS = glx # Gallium directories and GALLIUM_DIRS = auxiliary drivers state_trackers GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 r300 trace identity GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) -GALLIUM_WINSYS_DIRS = xlib egl_xlib -GALLIUM_WINSYS_DRM_DIRS = +GALLIUM_WINSYS_DIRS = drm xlib +GALLIUM_WINSYS_DRM_DIRS = swrast GALLIUM_STATE_TRACKERS_DIRS = glx # native displays EGL should support diff --git a/configs/linux-dri b/configs/linux-dri index ff9bcc9396..95f77ade1d 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -55,7 +55,7 @@ SRC_DIRS := glx/x11 egl $(SRC_DIRS) PROGRAM_DIRS := egl $(PROGRAM_DIRS) # EGL directories -EGL_DRIVERS_DIRS = demo glx +EGL_DRIVERS_DIRS = glx DRIVER_DIRS = dri WINDOW_SYSTEM = dri diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index 827fb97330..7b99dccdb8 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -47,21 +47,8 @@ DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx) - -# This is now 0 by default since it seems to confuse the hell out of people -# and generate a lot of extra noise on bugzilla. If you need to build with -# EGL, do 'make linux-dri USING_EGL=1' - -USING_EGL=0 - -# Directories -ifeq ($(USING_EGL), 1) -SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glew glw -PROGRAM_DIRS = egl -else SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw PROGRAM_DIRS = xdemos -endif DRIVER_DIRS = dri WINDOW_SYSTEM=dri diff --git a/configs/linux-egl b/configs/linux-egl index e906806f4b..6494a68aeb 100644 --- a/configs/linux-egl +++ b/configs/linux-egl @@ -46,12 +46,6 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ $(LIBDRM_LIB) -# This is now 0 by default since it seems to confuse the hell out of people -# and generate a lot of extra noise on bugzilla. If you need to build with -# EGL, do 'make linux-dri USING_EGL=1' - -USING_EGL=0 - # Directories SRC_DIRS = gallium mesa gallium/winsys glu egl PROGRAM_DIRS = egl diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es index 566cd758e3..259c26a931 100644 --- a/configs/linux-opengl-es +++ b/configs/linux-opengl-es @@ -9,19 +9,20 @@ LIB_DIR = lib SRC_DIRS = egl glsl mesa/es gallium gallium/winsys PROGRAM_DIRS = es1/screen es1/xegl es2/xegl +# egl st needs this +DEFINES += -DGLX_DIRECT_RENDERING + # no mesa or egl drivers DRIVER_DIRS = EGL_DRIVERS_DIRS = GALLIUM_DRIVERS_DIRS = softpipe -# build egl_softpipe.so -GALLIUM_WINSYS_DIRS = egl_xlib -# and libGLES*.so +# build libGLES*.so GALLIUM_STATE_TRACKERS_DIRS = es -# build egl_i915.so +# build egl_x11_{swrast,i915}.so GALLIUM_DRIVERS_DIRS += trace i915 GALLIUM_STATE_TRACKERS_DIRS += egl GALLIUM_WINSYS_DIRS += drm -GALLIUM_WINSYS_DRM_DIRS = intel +GALLIUM_WINSYS_DRM_DIRS += intel swrast |