From 6c78b8e97b21cc9152e75727ed879643f605ede3 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Wed, 14 May 2008 17:20:56 +0200 Subject: mesa: Made linux-dri targets build EGL --- configs/linux-dri | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'configs') diff --git a/configs/linux-dri b/configs/linux-dri index 67e60cbd4c..225536ef28 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -54,14 +54,16 @@ USING_EGL=0 # Directories SRC_DIRS := glx/x11 $(SRC_DIRS) -ifeq ($(USING_EGL), 1) +#ifeq ($(USING_EGL), 1) SRC_DIRS := egl $(SRC_DIRS) PROGRAM_DIRS = egl -endif +#endif + + DRIVER_DIRS = dri WINDOW_SYSTEM=dri -GALLIUM_WINSYS_DIRS = dri +GALLIUM_WINSYS_DIRS = dri egl_drm # gamma are missing because they have not been converted to use the new # interface. -- cgit v1.2.3 From 6f25d6d48d52063c50f773d005adcdf2a924e82d Mon Sep 17 00:00:00 2001 From: Zack Rusin Date: Thu, 22 May 2008 22:13:38 -0400 Subject: disable egl by default --- configs/linux-dri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/linux-dri b/configs/linux-dri index 225536ef28..5221d043cf 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -63,7 +63,7 @@ PROGRAM_DIRS = egl DRIVER_DIRS = dri WINDOW_SYSTEM=dri -GALLIUM_WINSYS_DIRS = dri egl_drm +GALLIUM_WINSYS_DIRS = dri # gamma are missing because they have not been converted to use the new # interface. -- cgit v1.2.3 From 3972961e62d5918f4ef4f0ceb3d8ee9549676a7c Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Thu, 22 May 2008 16:24:10 +0200 Subject: mesa: On second thought lets not build the driver --- configs/linux-dri | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'configs') diff --git a/configs/linux-dri b/configs/linux-dri index 5221d043cf..bcc2b61561 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -53,17 +53,17 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ USING_EGL=0 # Directories -SRC_DIRS := glx/x11 $(SRC_DIRS) -#ifeq ($(USING_EGL), 1) -SRC_DIRS := egl $(SRC_DIRS) +SRC_DIRS := glx/x11 egl $(SRC_DIRS) +PROGRAM_DIRS := egl $(PROGRAM_DIRS) +ifeq ($(USING_EGL), 1) PROGRAM_DIRS = egl -#endif +endif DRIVER_DIRS = dri -WINDOW_SYSTEM=dri -GALLIUM_WINSYS_DIRS = dri +WINDOW_SYSTEM = dri +GALLIUM_WINSYS_DIRS = dri # gamma are missing because they have not been converted to use the new # interface. -- cgit v1.2.3 From 9395fb6e8d341d7a3f923b5ec03630ab656c8f2f Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Thu, 22 May 2008 16:24:51 +0200 Subject: mesa: Added linux-egl target, that only builds the i915simple driver and egl drivers --- configs/linux-egl | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 configs/linux-egl (limited to 'configs') diff --git a/configs/linux-egl b/configs/linux-egl new file mode 100644 index 0000000000..e906806f4b --- /dev/null +++ b/configs/linux-egl @@ -0,0 +1,65 @@ +# -*-makefile-*- +# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others + +include $(TOP)/configs/default + +CONFIG_NAME = linux-dri + +# Compiler and flags +CC = gcc +CXX = g++ + +#MKDEP = /usr/X11R6/bin/makedepend +#MKDEP = gcc -M +#MKDEP_OPTIONS = -MF depend + +OPT_FLAGS = -O -g +PIC_FLAGS = -fPIC + +# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. +ARCH_FLAGS ?= + +DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ + -D_BSD_SOURCE -D_GNU_SOURCE \ + -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ + -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ + -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN + +X11_INCLUDES = -I/usr/X11R6/include + +CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ + $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS) + +CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) + + +MESA_ASM_SOURCES = + +# Library/program dependencies +EXTRA_LIB_PATH=-L/usr/X11R6/lib + +LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) +LIBDRM_LIB = $(shell pkg-config --libs libdrm) +DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -lpthread -ldl \ + $(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 + +DRIVER_DIRS = dri +WINDOW_SYSTEM = dri +GALLIUM_WINSYS_DIRS = egl_drm + +# gamma are missing because they have not been converted to use the new +# interface. +DRI_DIRS = intel -- cgit v1.2.3 From 2064826bdae9be8679ec8eb3f2b6be467da0594d Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Fri, 23 May 2008 16:18:42 +0200 Subject: egl: Stoped compiling EGL completely --- configs/linux-dri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/linux-dri b/configs/linux-dri index bcc2b61561..193d0a550a 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -53,9 +53,10 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ USING_EGL=0 # Directories -SRC_DIRS := glx/x11 egl $(SRC_DIRS) +SRC_DIRS := glx/x11 $(SRC_DIRS) PROGRAM_DIRS := egl $(PROGRAM_DIRS) ifeq ($(USING_EGL), 1) +SRC_DIRS := egl $(SRC_DIRS) PROGRAM_DIRS = egl endif -- cgit v1.2.3 From a22462f6ef769129ee56223f1edc2cb851505da8 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Fri, 23 May 2008 16:25:51 +0200 Subject: egl: Don't build EGL programs either --- configs/linux-dri | 1 - 1 file changed, 1 deletion(-) (limited to 'configs') diff --git a/configs/linux-dri b/configs/linux-dri index 193d0a550a..cd82c571c7 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -54,7 +54,6 @@ USING_EGL=0 # Directories SRC_DIRS := glx/x11 $(SRC_DIRS) -PROGRAM_DIRS := egl $(PROGRAM_DIRS) ifeq ($(USING_EGL), 1) SRC_DIRS := egl $(SRC_DIRS) PROGRAM_DIRS = egl -- cgit v1.2.3