From 85ef9930f56bf15181f9a0b238f03d55303cf411 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 22 Nov 2010 19:42:40 +0000 Subject: Updated to mesalib 7.9 --- mesalib/configs/autoconf.in | 59 +++++++++++++++++++++++++++++------ mesalib/configs/beos | 3 +- mesalib/configs/bluegene-osmesa | 1 - mesalib/configs/bluegene-xlc-osmesa | 1 - mesalib/configs/catamount-osmesa-pgi | 1 - mesalib/configs/darwin | 3 +- mesalib/configs/default | 50 +++++++++++++++++++++-------- mesalib/configs/freebsd-dri | 4 +-- mesalib/configs/linux-cell | 5 +-- mesalib/configs/linux-debug | 2 +- mesalib/configs/linux-dri | 8 ++--- mesalib/configs/linux-dri-xcb | 5 +-- mesalib/configs/linux-egl | 5 ++- mesalib/configs/linux-fbdev | 5 ++- mesalib/configs/linux-i965 | 1 + mesalib/configs/linux-indirect | 4 +-- mesalib/configs/linux-llvm | 10 +++--- mesalib/configs/linux-opengl-es | 10 +++--- mesalib/configs/linux-osmesa | 3 +- mesalib/configs/linux-osmesa-static | 1 - mesalib/configs/linux-osmesa16 | 3 +- mesalib/configs/linux-osmesa16-static | 1 - mesalib/configs/linux-osmesa32 | 3 +- 23 files changed, 117 insertions(+), 71 deletions(-) (limited to 'mesalib/configs') diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in index fbd5faa5f..9bdbefebd 100644 --- a/mesalib/configs/autoconf.in +++ b/mesalib/configs/autoconf.in @@ -14,6 +14,8 @@ ARCH_FLAGS = @ARCH_FLAGS@ ASM_FLAGS = @ASM_FLAGS@ PIC_FLAGS = @PIC_FLAGS@ DEFINES = @DEFINES@ +API_DEFINES = @API_DEFINES@ +GLES_OVERLAY = @GLES_OVERLAY@ CFLAGS = @CPPFLAGS@ @CFLAGS@ \ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \ @@ -26,8 +28,19 @@ INTEL_LIBS = @INTEL_LIBS@ INTEL_CFLAGS = @INTEL_CFLAGS@ X11_LIBS = @X11_LIBS@ X11_CFLAGS = @X11_CFLAGS@ +LLVM_CFLAGS = @LLVM_CFLAGS@ +LLVM_LDFLAGS = @LLVM_LDFLAGS@ +LLVM_LIBS = @LLVM_LIBS@ +GLW_CFLAGS = @GLW_CFLAGS@ +GLUT_CFLAGS = @GLUT_CFLAGS@ -# Assembler +TALLOC_LIBS = @TALLOC_LIBS@ +TALLOC_CFLAGS = @TALLOC_CFLAGS@ + +# dlopen +DLOPEN_LIBS = @DLOPEN_LIBS@ + +# Source selection MESA_ASM_SOURCES = @MESA_ASM_SOURCES@ GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@ @@ -49,6 +62,9 @@ GLU_LIB = GLU GLUT_LIB = glut GLW_LIB = GLw OSMESA_LIB = @OSMESA_LIB@ +GLESv1_CM_LIB = GLESv1_CM +GLESv2_LIB = GLESv2 +VG_LIB = OpenVG # Library names (actual file names) GL_LIB_NAME = @GL_LIB_NAME@ @@ -57,6 +73,9 @@ GLUT_LIB_NAME = @GLUT_LIB_NAME@ GLW_LIB_NAME = @GLW_LIB_NAME@ OSMESA_LIB_NAME = @OSMESA_LIB_NAME@ EGL_LIB_NAME = @EGL_LIB_NAME@ +GLESv1_CM_LIB_NAME = @GLESv1_CM_LIB_NAME@ +GLESv2_LIB_NAME = @GLESv2_LIB_NAME@ +VG_LIB_NAME = @VG_LIB_NAME@ # Globs used to install the lib and all symlinks GL_LIB_GLOB = @GL_LIB_GLOB@ @@ -65,6 +84,9 @@ GLUT_LIB_GLOB = @GLUT_LIB_GLOB@ GLW_LIB_GLOB = @GLW_LIB_GLOB@ OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@ EGL_LIB_GLOB = @EGL_LIB_GLOB@ +GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@ +GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@ +VG_LIB_GLOB = @VG_LIB_GLOB@ # Directories to build LIB_DIR = @LIB_DIR@ @@ -75,18 +97,15 @@ EGL_DRIVERS_DIRS = @EGL_DRIVERS_DIRS@ GALLIUM_DIRS = @GALLIUM_DIRS@ GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@ GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@ -GALLIUM_WINSYS_DRM_DIRS = @GALLIUM_WINSYS_DRM_DIRS@ +GALLIUM_TARGET_DIRS = @GALLIUM_TARGET_DIRS@ GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@ GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) -# Which subdirs under $(TOP)/progs/ to enter: -PROGRAM_DIRS = @PROGRAM_DIRS@ - # Driver specific build vars DRI_DIRS = @DRI_DIRS@ -WINDOW_SYSTEM = @WINDOW_SYSTEM@ -EGL_DISPLAYS = @EGL_DISPLAYS@ +EGL_PLATFORMS = @EGL_PLATFORMS@ +EGL_CLIENT_APIS = @EGL_CLIENT_APIS@ # Dependencies X11_INCLUDES = @X11_INCLUDES@ @@ -107,6 +126,9 @@ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \ $(EXTRA_LIB_PATH) @GLW_LIB_DEPS@ APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@ +GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@ +GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@ +VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@ # DRI dependencies DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@ @@ -155,6 +177,23 @@ GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@ GLW_PC_CFLAGS = @GLW_PC_CFLAGS@ OSMESA_PC_REQ = @OSMESA_PC_REQ@ OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@ - -EGL_DRI2_CFLAGS = @EGL_DRI2_CFLAGS@ -EGL_DRI2_LIBS = @EGL_DRI2_LIBS@ +GLESv1_CM_PC_LIB_PRIV = @GLESv1_CM_PC_LIB_PRIV@ +GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@ +EGL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ +EGL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ +EGL_PC_CFLAGS = @GL_PC_CFLAGS@ + +XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@ +XCB_DRI2_LIBS = @XCB_DRI2_LIBS@ +LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ +LIBUDEV_LIBS = @LIBUDEV_LIBS@ + +MESA_LLVM = @MESA_LLVM@ + +LLVM_VERSION = @LLVM_VERSION@ +ifneq ($(LLVM_VERSION),) + HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=)) + DEFINES += -DHAVE_LLVM=$(HAVE_LLVM) +endif + +HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@ diff --git a/mesalib/configs/beos b/mesalib/configs/beos index 69a8fd426..ac8d6fc6f 100644 --- a/mesalib/configs/beos +++ b/mesalib/configs/beos @@ -90,10 +90,9 @@ else endif # Directories -SRC_DIRS = gallium mesa glu glut/beos glew +SRC_DIRS = gallium mesa glu glut/beos GLU_DIRS = sgi DRIVER_DIRS = beos -PROGRAM_DIRS = beos samples redbook demos tests # Library/program dependencies GL_LIB_DEPS = diff --git a/mesalib/configs/bluegene-osmesa b/mesalib/configs/bluegene-osmesa index d22454fa2..88511109d 100644 --- a/mesalib/configs/bluegene-osmesa +++ b/mesalib/configs/bluegene-osmesa @@ -24,7 +24,6 @@ OSMESA_LIB_NAME = libOSMesa.a # Directories SRC_DIRS = mesa glu DRIVER_DIRS = osmesa -PROGRAM_DIRS = osdemos # Dependencies diff --git a/mesalib/configs/bluegene-xlc-osmesa b/mesalib/configs/bluegene-xlc-osmesa index b0c762de9..292199a61 100644 --- a/mesalib/configs/bluegene-xlc-osmesa +++ b/mesalib/configs/bluegene-xlc-osmesa @@ -20,7 +20,6 @@ OSMESA_LIB_NAME = libOSMesa.a # Directories SRC_DIRS = mesa glu DRIVER_DIRS = osmesa -PROGRAM_DIRS = osdemos # Dependencies diff --git a/mesalib/configs/catamount-osmesa-pgi b/mesalib/configs/catamount-osmesa-pgi index 835f6eb7d..74fd53ab8 100644 --- a/mesalib/configs/catamount-osmesa-pgi +++ b/mesalib/configs/catamount-osmesa-pgi @@ -23,7 +23,6 @@ OSMESA_LIB_NAME = libOSMesa.a # Directories SRC_DIRS = mesa glu DRIVER_DIRS = osmesa -PROGRAM_DIRS = osdemos # Dependencies diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin index e51968487..990610724 100644 --- a/mesalib/configs/darwin +++ b/mesalib/configs/darwin @@ -52,9 +52,8 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: -SRC_DIRS = glsl glx/apple mesa gallium glu glut/glx glew +SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu glut/glx GLU_DIRS = sgi DRIVER_DIRS = osmesa #DRIVER_DIRS = dri DRI_DIRS = swrast -PROGRAM_DIRS = xdemos diff --git a/mesalib/configs/default b/mesalib/configs/default index f12bec8fa..f2aedefc0 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -9,8 +9,8 @@ CONFIG_NAME = default # Version info MESA_MAJOR=7 -MESA_MINOR=8 -MESA_TINY=2 +MESA_MINOR=9 +MESA_TINY=0 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY) # external projects. This should be useless now that we use libdrm. @@ -52,20 +52,24 @@ INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool GL_LIB = GL GLU_LIB = GLU GLUT_LIB = glut -GLEW_LIB = GLEW GLW_LIB = GLw OSMESA_LIB = OSMesa EGL_LIB = EGL +GLESv1_CM_LIB = GLESv1_CM +GLESv2_LIB = GLESv2 +VG_LIB = OpenVG # Library names (actual file names) GL_LIB_NAME = lib$(GL_LIB).so GLU_LIB_NAME = lib$(GLU_LIB).so GLUT_LIB_NAME = lib$(GLUT_LIB).so -GLEW_LIB_NAME = lib$(GLEW_LIB).a GLW_LIB_NAME = lib$(GLW_LIB).so OSMESA_LIB_NAME = lib$(OSMESA_LIB).so EGL_LIB_NAME = lib$(EGL_LIB).so +GLESv1_CM_LIB_NAME = lib$(GLESv1_CM_LIB).so +GLESv2_LIB_NAME = lib$(GLESv2_LIB).so +VG_LIB_NAME = lib$(VG_LIB).so # globs used to install the lib and all symlinks GL_LIB_GLOB = $(GL_LIB_NAME)* @@ -74,6 +78,12 @@ GLUT_LIB_GLOB = $(GLUT_LIB_NAME)* GLW_LIB_GLOB = $(GLW_LIB_NAME)* OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)* EGL_LIB_GLOB = $(EGL_LIB_NAME)* +GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)* +GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* +VG_LIB_GLOB = $(VG_LIB_NAME)* + +TALLOC_LIBS = `pkg-config --libs talloc` +TALLOC_CFLAGS = `pkg-config --cflags talloc` # Optional assembly language optimization files for libGL MESA_ASM_SOURCES = @@ -86,11 +96,10 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2 # Directories to build LIB_DIR = lib -SRC_DIRS = glsl mesa gallium egl gallium/winsys glu glut/glx glew glw +SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \ + gallium egl gallium/winsys gallium/targets glu glut/glx glw GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa -# Which subdirs under $(TOP)/progs/ to enter: -PROGRAM_DIRS = demos redbook samples glsl objviewer xdemos # EGL drivers to build EGL_DRIVERS_DIRS = glx @@ -98,29 +107,35 @@ 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_DIRS = softpipe trace rbug identity galahad i915 i965 svga r300 nvfx nv50 failover GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) -GALLIUM_WINSYS_DIRS = drm xlib -GALLIUM_WINSYS_DRM_DIRS = swrast +GALLIUM_WINSYS_DIRS = sw sw/xlib +GALLIUM_TARGET_DIRS = libgl-xlib GALLIUM_STATE_TRACKERS_DIRS = glx vega -# native displays EGL should support -EGL_DISPLAYS = x11 +# native platforms EGL should support +EGL_PLATFORMS = x11 +EGL_CLIENT_APIS = $(GL_LIB) # Library dependencies #EXTRA_LIB_PATH ?= -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread $(TALLOC_LIBS) EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -ldl -lpthread OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm +GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread +GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread +VG_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread # Program dependencies - specific GL/glut libraries added in Makefiles APP_LIB_DEPS = -lm X11_LIBS = -lX11 +DLOPEN_LIBS = -ldl + # Installation directories (for make install) INSTALL_DIR = /usr/local INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR) @@ -153,3 +168,12 @@ GLW_PC_LIB_PRIV = GLW_PC_CFLAGS = OSMESA_PC_REQ = OSMESA_PC_LIB_PRIV = +GLESv1_CM_PC_REQ_PRIV = +GLESv1_CM_PC_LIB_PRIV = +GLESv1_CM_PC_CFLAGS = +GLESv2_PC_REQ_PRIV = +GLESv2_PC_LIB_PRIV = +GLESv2_PC_CFLAGS = +VG_PC_REQ_PRIV = +VG_PC_LIB_PRIV = +VG_PC_CFLAGS = diff --git a/mesalib/configs/freebsd-dri b/mesalib/configs/freebsd-dri index 0b91cfc37..a4aa82e96 100644 --- a/mesalib/configs/freebsd-dri +++ b/mesalib/configs/freebsd-dri @@ -41,10 +41,8 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 # Directories -SRC_DIRS = glx gallium mesa glu glut/glx glew glw +SRC_DIRS = glx gallium mesa glu glut/glx glw DRIVER_DIRS = dri -PROGRAM_DIRS = -WINDOW_SYSTEM=dri DRM_SOURCE_PATH=$(TOP)/../drm diff --git a/mesalib/configs/linux-cell b/mesalib/configs/linux-cell index e89a08cd9..606a11a8c 100644 --- a/mesalib/configs/linux-cell +++ b/mesalib/configs/linux-cell @@ -6,7 +6,7 @@ CONFIG_NAME = linux-cell # Omiting other gallium drivers: -GALLIUM_DRIVERS_DIRS = cell softpipe trace +GALLIUM_DRIVERS_DIRS = cell softpipe trace rbug identity # Compiler and flags @@ -37,7 +37,8 @@ CXXFLAGS = $(COMMON_C_CPP_FLAGS) # Omitting glw here: -SRC_DIRS = glsl mesa gallium gallium/winsys glu glut/glx glew +SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \ + gallium gallium/winsys gallium/targets glu glut/glx # Build no traditional Mesa drivers: DRIVER_DIRS = diff --git a/mesalib/configs/linux-debug b/mesalib/configs/linux-debug index 01763b1a3..60e0b9769 100644 --- a/mesalib/configs/linux-debug +++ b/mesalib/configs/linux-debug @@ -5,5 +5,5 @@ include $(TOP)/configs/linux CONFIG_NAME = linux-debug OPT_FLAGS = -g -CFLAGS += -pedantic +#CFLAGS += -pedantic DEFINES += -DDEBUG -DDEBUG_MATH diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri index e8e8ccfcf..6f86277c4 100644 --- a/mesalib/configs/linux-dri +++ b/mesalib/configs/linux-dri @@ -45,22 +45,20 @@ 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) +DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -ltalloc $(LIBDRM_LIB) GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ -lm -lpthread -ldl $(LIBDRM_LIB) # Directories SRC_DIRS := glx egl $(SRC_DIRS) -PROGRAM_DIRS := egl $(PROGRAM_DIRS) # EGL directories EGL_DRIVERS_DIRS = glx DRIVER_DIRS = dri -WINDOW_SYSTEM = dri -GALLIUM_WINSYS_DIRS = drm -GALLIUM_WINSYS_DRM_DIRS = vmware intel i965 +GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 +GALLIUM_TARGET_DIRS = egl-swrast GALLIUM_STATE_TRACKERS_DIRS = egl DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \ diff --git a/mesalib/configs/linux-dri-xcb b/mesalib/configs/linux-dri-xcb index c5ed89c4b..8092a048d 100644 --- a/mesalib/configs/linux-dri-xcb +++ b/mesalib/configs/linux-dri-xcb @@ -47,11 +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) -SRC_DIRS = glx gallium mesa glu glut/glx glew glw -PROGRAM_DIRS = xdemos +SRC_DIRS = glx gallium mesa glu glut/glx glw DRIVER_DIRS = dri -WINDOW_SYSTEM=dri - DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \ savage sis tdfx unichrome diff --git a/mesalib/configs/linux-egl b/mesalib/configs/linux-egl index 2c2834b81..6393e942c 100644 --- a/mesalib/configs/linux-egl +++ b/mesalib/configs/linux-egl @@ -47,11 +47,10 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ # Directories -SRC_DIRS = gallium mesa gallium/winsys glu egl -PROGRAM_DIRS = egl +SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl DRIVER_DIRS = dri -WINDOW_SYSTEM = dri GALLIUM_WINSYS_DIRS = egl_drm +GALLIUM_TARGET_DIRS = DRI_DIRS = intel diff --git a/mesalib/configs/linux-fbdev b/mesalib/configs/linux-fbdev index 0b03c33af..4fc638404 100644 --- a/mesalib/configs/linux-fbdev +++ b/mesalib/configs/linux-fbdev @@ -4,14 +4,13 @@ include $(TOP)/configs/linux CONFIG_NAME = linux-fbdev -CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER +CFLAGS += -DUSE_GLFBDEV_DRIVER # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing -SRC_DIRS = gallium mesa glu glut/fbdev glew +SRC_DIRS += glut/fbdev DRIVER_DIRS = fbdev osmesa -PROGRAM_DIRS = fbdev demos redbook samples GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread OSMESA_LIB_DEPS = -lm -lpthread diff --git a/mesalib/configs/linux-i965 b/mesalib/configs/linux-i965 index e66abc347..7656a2adc 100644 --- a/mesalib/configs/linux-i965 +++ b/mesalib/configs/linux-i965 @@ -6,3 +6,4 @@ CONFIG_NAME = linux-i965 GALLIUM_DRIVER_DIRS = i965 GALLIUM_WINSYS_DIRS = drm/i965/xlib +GALLIUM_TARGET_DIRS = diff --git a/mesalib/configs/linux-indirect b/mesalib/configs/linux-indirect index 0914fba19..272d34e84 100644 --- a/mesalib/configs/linux-indirect +++ b/mesalib/configs/linux-indirect @@ -47,7 +47,5 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl # Directories -SRC_DIRS = glx glu glut/glx glew glw +SRC_DIRS = glx glu glut/glx glw DRIVER_DIRS = -PROGRAM_DIRS = -WINDOW_SYSTEM=dri diff --git a/mesalib/configs/linux-llvm b/mesalib/configs/linux-llvm index 27e082ebf..6aa434032 100644 --- a/mesalib/configs/linux-llvm +++ b/mesalib/configs/linux-llvm @@ -10,12 +10,12 @@ CONFIG_NAME = linux-llvm GALLIUM_DRIVERS_DIRS += llvmpipe OPT_FLAGS = -O3 -ansi -pedantic -ARCH_FLAGS = -m32 -mmmx -msse -msse2 -mstackrealign +ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign -DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DDRAW_LLVM -DHAVE_UDIS86 +DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86 # override -std=c99 -CFLAGS += -std=gnu99 +CFLAGS += -std=gnu99 -D__STDC_CONSTANT_MACROS LLVM_VERSION := $(shell llvm-config --version) @@ -24,6 +24,8 @@ ifeq ($(LLVM_VERSION),) MESA_LLVM=0 else MESA_LLVM=1 + HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=)) + DEFINES += -DHAVE_LLVM=$(HAVE_LLVM) # $(info Using LLVM version: $(LLVM_VERSION)) endif @@ -39,4 +41,4 @@ else endif LD = g++ -GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++ -ludis86 +GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -ltalloc -lstdc++ -ludis86 diff --git a/mesalib/configs/linux-opengl-es b/mesalib/configs/linux-opengl-es index 259c26a93..93c0d4770 100644 --- a/mesalib/configs/linux-opengl-es +++ b/mesalib/configs/linux-opengl-es @@ -6,8 +6,8 @@ CONFIG_NAME = linux-opengl-es # Directories to build LIB_DIR = lib -SRC_DIRS = egl glsl mesa/es gallium gallium/winsys -PROGRAM_DIRS = es1/screen es1/xegl es2/xegl +SRC_DIRS = egl glsl mapi/es1api mapi/es2api mesa/es \ + gallium gallium/winsys gallium/targets # egl st needs this DEFINES += -DGLX_DIRECT_RENDERING @@ -22,7 +22,7 @@ GALLIUM_DRIVERS_DIRS = softpipe GALLIUM_STATE_TRACKERS_DIRS = es # build egl_x11_{swrast,i915}.so -GALLIUM_DRIVERS_DIRS += trace i915 +GALLIUM_DRIVERS_DIRS += trace rbug i915 GALLIUM_STATE_TRACKERS_DIRS += egl -GALLIUM_WINSYS_DIRS += drm -GALLIUM_WINSYS_DRM_DIRS += intel swrast +GALLIUM_WINSYS_DIRS += drm/intel +GALLIUM_TARGET_DIRS += egl-swrast egl-i915 diff --git a/mesalib/configs/linux-osmesa b/mesalib/configs/linux-osmesa index 3015f5fcb..4cc5e51f1 100644 --- a/mesalib/configs/linux-osmesa +++ b/mesalib/configs/linux-osmesa @@ -17,9 +17,8 @@ CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing # Directories -SRC_DIRS = glsl mesa glu +SRC_DIRS = mapi/glapi glsl mesa glu DRIVER_DIRS = osmesa -PROGRAM_DIRS = osdemos # Dependencies diff --git a/mesalib/configs/linux-osmesa-static b/mesalib/configs/linux-osmesa-static index a03e63eb7..722079463 100644 --- a/mesalib/configs/linux-osmesa-static +++ b/mesalib/configs/linux-osmesa-static @@ -24,7 +24,6 @@ OSMESA_LIB_NAME = libOSMesa.a # Directories SRC_DIRS = mesa glu DRIVER_DIRS = osmesa -PROGRAM_DIRS = osdemos # Dependencies diff --git a/mesalib/configs/linux-osmesa16 b/mesalib/configs/linux-osmesa16 index 090ca2730..e6c26a286 100644 --- a/mesalib/configs/linux-osmesa16 +++ b/mesalib/configs/linux-osmesa16 @@ -20,9 +20,8 @@ OSMESA_LIB_NAME = libOSMesa16.so # Directories -SRC_DIRS = glsl mesa glu +SRC_DIRS = mapi/glapi glsl mesa glu DRIVER_DIRS = osmesa -PROGRAM_DIRS = # Dependencies diff --git a/mesalib/configs/linux-osmesa16-static b/mesalib/configs/linux-osmesa16-static index 146aeb85a..a6c0cab1b 100644 --- a/mesalib/configs/linux-osmesa16-static +++ b/mesalib/configs/linux-osmesa16-static @@ -24,7 +24,6 @@ OSMESA_LIB_NAME = libOSMesa16.a # Directories SRC_DIRS = gallium mesa glu DRIVER_DIRS = osmesa -PROGRAM_DIRS = # Dependencies diff --git a/mesalib/configs/linux-osmesa32 b/mesalib/configs/linux-osmesa32 index 63de7f9a4..dafa31b2e 100644 --- a/mesalib/configs/linux-osmesa32 +++ b/mesalib/configs/linux-osmesa32 @@ -20,9 +20,8 @@ OSMESA_LIB_NAME = libOSMesa32.so # Directories -SRC_DIRS = glsl mesa glu +SRC_DIRS = mapi/glapi glsl mesa glu DRIVER_DIRS = osmesa -PROGRAM_DIRS = # Dependencies -- cgit v1.2.3