[haiku-commits] haiku: hrev43669 - 3rdparty/mesa src/add-ons/opengl/mesa_software_renderer build/jam
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 17 Jan 2012 22:01:52 +0100 (CET)
hrev43669 adds 4 changesets to branch 'master'
old head: f2b4344867e97c3f4e742a1b4a15e6879644601a
new head: 2a14f70ce80c2f6f2839ebf09dba2fd35fc13c15
----------------------------------------------------------------------------
9097f91: mesa: Updated script to build Mesa optional package
* Move compiled binaries into lib.haiku
* Enables usage with makefile and scons Mesa builds
ec4f807: mesa: Update OptionalPacakge build script
* Add missing cpuinfo header
* Add diff to compile Mesa 7.8.2 for gcc2
3c0d5dc: opengl: Improve libGL linking and Mesa optional package
* Move compiled binaries into lib.haiku within Mesa optional
pacakge, this enables us to use Make or scons to build Mesa
* Untangle libGL linking and order library inclusion
* Remove zmuldef hacks
* Compile libgallium into the libGL on Mesa 8.0 / gcc4 images
* Don't Mesa calculate cpu optimizations due to visibility
issues, use Mesa cpu functions for this.
* Don't allow undefined symbols in libGL.so to ensure sanity.
* Move Mesa optional packages to haiku-files
2a14f70: opengl: Remove unneeded visibility flag
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
7 files changed, 503 insertions(+), 96 deletions(-)
3rdparty/mesa/Mesa-7.8.2-haiku.diff | 458 ++++++++++++++++
3rdparty/mesa/mesa-o-matic.sh | 37 +-
build/jam/OptionalBuildFeatures | 32 +-
src/add-ons/opengl/mesa_software_renderer/Jamfile | 6 +-
.../MesaSoftwareRenderer.cpp | 52 +--
src/kits/opengl/GLDispatcher.cpp | 4 -
src/kits/opengl/Jamfile | 10 +-
############################################################################
Commit: 9097f91c956bc85cfc019eec3894dfd477412dd2
URL: http://cgit.haiku-os.org/haiku/commit/?id=9097f91
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Tue Jan 17 14:51:55 2012 UTC
mesa: Updated script to build Mesa optional package
* Move compiled binaries into lib.haiku
* Enables usage with makefile and scons Mesa builds
----------------------------------------------------------------------------
diff --git a/3rdparty/mesa/mesa-o-matic.sh b/3rdparty/mesa/mesa-o-matic.sh
index e8cc212..f94c2ad 100755
--- a/3rdparty/mesa/mesa-o-matic.sh
+++ b/3rdparty/mesa/mesa-o-matic.sh
@@ -17,12 +17,6 @@ echo ""
# by the opengl kit.
MESA_PRIVATE_HEADERS="glheader.h glapi.h glapitable.h glapitemp.h glapi_priv.h
context.h driverfuncs.h meta.h colormac.h buffers.h framebuffer.h
renderbuffer.h state.h version.h swrast.h swrast_setup.h tnl.h t_context.h
t_pipeline.h vbo.h common_x86_asm.h common_ppc_features.h extensions.h
s_spantemp.h s_renderbuffer.h formats.h"
-# These are public header directories, all files grabbed
-MESA_PUBLIC_HEADERS="include/GL"
-
-# These libraries are 1:1 file find/grabs
-MESA_LIBRARIES="libmesa.a libglapi.a libGLU.a"
-
#######################################################################
# END CONFIG DATA, Dragons below!
#######################################################################
@@ -78,28 +72,29 @@ do
if [[ $GCC_VER -eq 2 ]]; then
setgcc gcc2
fi
- HEADERS=$( echo "$HEADERS_RAW" | cut -d':' -f2 | sed 's/\\//g' | tr -d
'\n' )
- ZIP_HEADERS="$ZIP_HEADERS $HEADERS"
-done
-echo "Collecting required Mesa public headers..."
-#for i in $MESA_PUBLIC_HEADERS
-#do
- HEADERS=$( find $MESA_PUBLIC_HEADERS -exec echo -n "{} " \; )
- ZIP_HEADERS="$ZIP_HEADERS $HEADERS"
-#done
+ for y in $( echo "$HEADERS_RAW" | cut -d':' -f2 | sed 's/\\//g' | tr -d
'\n' )
+ do
+ CLEAN_HEADER=$( echo "$y" | grep -v "include/GL" )
+ ZIP_HEADERS="$ZIP_HEADERS $CLEAN_HEADER"
+ done
+done
-ZIP_LIBRARIES=""
echo "Collecting required Mesa libraries..."
-for i in $MESA_LIBRARIES
+rm -rf lib.haiku
+mkdir -p lib.haiku
+for i in $( find . -name "*.a" )
do
- FOUND=$(findInTree $i)
- ZIP_LIBRARIES="$ZIP_LIBRARIES $FOUND"
+ cp $i lib.haiku/
done
+# Disabled as to give the choice to the user ah-la
stripOptionalPackageDebugSymbols
+#echo "Stripping debug symbols from Mesa libraries..."
+#find lib.haiku -exec strip --strip-debug {} \; ;
+
echo "Creating Mesa OptionalPackage..."
PLATFORM=$( uname -m )
ZIP_FILENAME="../mesa-$MESA_VER-gcc$GCC_VER-x86.zip"
-zip -9 $ZIP_FILENAME $ZIP_HEADERS $ZIP_LIBRARIES
+zip -9 $ZIP_FILENAME $ZIP_HEADERS ./include/GL/* ./lib.haiku/*
echo "Great Success! $ZIP_FILENAME created."
############################################################################
Commit: ec4f80739efcbd202445ede49c07abe880c595ab
URL: http://cgit.haiku-os.org/haiku/commit/?id=ec4f807
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Tue Jan 17 14:55:26 2012 UTC
mesa: Update OptionalPacakge build script
* Add missing cpuinfo header
* Add diff to compile Mesa 7.8.2 for gcc2
----------------------------------------------------------------------------
diff --git a/3rdparty/mesa/Mesa-7.8.2-haiku.diff
b/3rdparty/mesa/Mesa-7.8.2-haiku.diff
new file mode 100644
index 0000000..972a07e
--- /dev/null
+++ b/3rdparty/mesa/Mesa-7.8.2-haiku.diff
@@ -0,0 +1,458 @@
+diff -rupN Mesa-7.8.2/bin/mklib Mesa-7.8.2-haiku/bin/mklib
+--- Mesa-7.8.2/bin/mklib 2010-06-15 17:43:41.034340864 +0000
++++ Mesa-7.8.2-haiku/bin/mklib 2012-01-17 09:57:07.461373440 +0000
+@@ -260,7 +260,7 @@ if [ $STATIC = 1 ]; then
+ NEWOBJECTS=""
+ for OBJ in $OBJECTS ; do
+ case $OBJ in
+- -Wl,*)
++ -Wl,*|-L*|-l*)
+ echo "mklib: warning: ignoring $OBJ for static library"
+ ;;
+ *)
+@@ -307,7 +307,7 @@ fi
+ #
+ case $ARCH in
+
+- 'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/*)
++ 'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD')
+ # we assume gcc
+
+ if [ "x$LINK" = "x" ] ; then
+@@ -494,13 +494,16 @@ case $ARCH in
+ OPTS="${OPTS} -Wl,-Mmapfile.scope"
+ fi
+
+- # Check if objects are SPARC v9
++ # Check if objects are 64-bit
+ # file says: ELF 64-bit MSB relocatable SPARCV9 Version 1
+ set ${OBJECTS}
+ if [ ${LINK} = "cc" -o ${LINK} = "CC" ] ; then
+- SPARCV9=`file $1 | grep SPARCV9`
+- if [ "${SPARCV9}" ] ; then
+- OPTS="${OPTS} -xarch=v9"
++ ABI64=`file $1 | grep "ELF 64-bit"`
++ if [ "${ABI64}" ] ; then
++ case `uname -p` in
++ sparc) OPTS="${OPTS} -xarch=v9" ;;
++ i386) OPTS="${OPTS} -xarch=amd64" ;;
++ esac
+ fi
+ fi
+ if [ "${ALTOPTS}" ] ; then
+@@ -571,20 +574,6 @@ case $ARCH in
+ fi
+ ;;
+
+- 'NetBSD')
+- if [ $STATIC = 1 ] ; then
+- LIBNAME="lib${LIBNAME}_pic.a"
+- echo "mklib: Making NetBSD PIC static library: " ${LIBNAME}
+- FINAL_LIBS=`make_ar_static_lib cq 1 ${LIBNAME} ${OBJECTS}`
+- else
+- LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
+- echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
+- rm -f ${LIBNAME}
+- ld -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS}
+- FINAL_LIBS=${LIBNAME}
+- fi
+- ;;
+-
+ 'IRIX' | 'IRIX64')
+ if [ $STATIC = 1 ] ; then
+ LIBNAME="lib${LIBNAME}.a"
+@@ -778,9 +767,8 @@ case $ARCH in
+ OPTS="${OPTS} -exported_symbols_list ${EXPORTS}"
+ fi
+
+- LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
+- LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}"
+- LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}"
++ LINKNAME="lib${LIBNAME}.${LIBSUFFIX}"
++ LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
+
+ # examine first object to determine ABI
+ set ${OBJECTS}
+@@ -793,9 +781,6 @@ case $ARCH in
+ OPTS=${ALTOPTS}
+ fi
+
+- # XXX can we always add -isysroot /Developer/SDKs/MacOSX10.4u.sdk
+- # to OPTS here?
+-
+ # determine linker
+ if [ $CPLUSPLUS = 1 ] ; then
+ LINK="g++"
+@@ -807,8 +792,7 @@ case $ARCH in
+
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ ln -s ${LIBNAME} ${LINKNAME}
+- ln -s ${LIBNAME} ${LINKNAME2}
+- FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}"
++ FINAL_LIBS="${LIBNAME} ${LINKNAME}"
+ fi
+ ;;
+
+@@ -818,22 +802,6 @@ case $ARCH in
+ FINAL_LIBS=`make_ar_static_lib -ru 0 ${LIBNAME} ${OBJECTS}`
+ ;;
+
+- 'BeOS')
+- if [ $STATIC = 1 ] ; then
+- LIBNAME="lib${LIBNAME}.a"
+- echo "mklib: Making BeOS static library: " ${LIBNAME}
+- FINAL_LIBS=`make_ar_static_lib -cru 0 ${LIBNAME} ${OBJECTS}`
+- else
+- LIBNAME="lib${LIBNAME}.so"
+- echo "mklib: Making BeOS shared library: " ${LIBNAME}
+- gcc -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86
-lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}"
+- mimeset -f "${LIBNAME}"
+- # XXX remove the Mesa3D stuff here since mklib isn't mesa-specific.
+- setversion "${LIBNAME}" -app ${MAJOR} ${MINOR} ${PATCH} -short
"Powered by Mesa3D!" -long "Powered by Mesa3D!"
+- fi
+- FINAL_LIBS=${LIBNAME}
+- ;;
+-
+ 'QNX')
+ LIBNAME="lib${LIBNAME}.a"
+ echo "mklib: Making QNX library: " ${LIBNAME}
+@@ -927,6 +895,16 @@ case $ARCH in
+
+ CYGWIN*)
+ # GCC-based environment
++
++ if [ "x$LINK" = "x" ] ; then
++ # -linker was not specified so set default link command now
++ if [ $CPLUSPLUS = 1 ] ; then
++ LINK=g++
++ else
++ LINK=gcc
++ fi
++ fi
++
+ if [ $NOPREFIX = 1 ] ; then
+ # No "lib" or ".so" part
+ echo "mklib: Making CYGWIN shared library: " ${LIBNAME}
+@@ -935,7 +913,7 @@ case $ARCH in
+ OPTS=${ALTOPTS}
+ fi
+ rm -f ${LIBNAME}
+- ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
++ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} || exit
$?
+ FINAL_LIBS=${LIBNAME}
+ else
+ CYGNAME="cyg${LIBNAME}" # prefix with "cyg"
+@@ -943,7 +921,7 @@ case $ARCH in
+
+ if [ $STATIC = 1 ] ; then
+ LIBNAME=${LIBNAME}.a
+- echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
++ echo "mklib: Making CYGWIN static library: " ${LIBNAME}
+ OPTS="-ru"
+ if [ "${ALTOPTS}" ] ; then
+ OPTS=${ALTOPTS}
+@@ -961,13 +939,7 @@ case $ARCH in
+ if [ "${ALTOPTS}" ] ; then
+ OPTS=${ALTOPTS}
+ fi
+- echo "mklib: Making" $ARCH "shared library: "
${CYGNAME}-${MAJOR}.dll
+-
+- if [ $CPLUSPLUS = 1 ] ; then
+- LINK="g++"
+- else
+- LINK="gcc"
+- fi
++ echo "mklib: Making CYGWIN shared library: "
${CYGNAME}-${MAJOR}.dll
+
+ # rm any old libs
+ rm -f ${CYGNAME}-${MAJOR}.dll
+@@ -976,12 +948,7 @@ case $ARCH in
+ rm -f ${LIBNAME}.a
+
+ # make lib
+- ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS}
${DEPS}
+- # make build fail if link failed
+- es=$?
+- if [ "$es" -ne "0" ]; then
+- exit $es
+- fi
++ ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS}
${DEPS} || exit $?
+ # make usual symlinks
+ ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
+ # finish up
+@@ -992,6 +959,43 @@ case $ARCH in
+ fi
+ ;;
+
++ 'Haiku')
++ if [ $STATIC = 1 ] ; then
++ LIBNAME="lib${LIBNAME}.a"
++ if [ "x$LINK" = "x" ] ; then
++ # -linker was not specified so set default link
command now
++ if [ $CPLUSPLUS = 1 ] ; then
++ LINK=g++
++ else
++ LINK=gcc
++ fi
++ fi
++
++ OPTS="-ru"
++ if [ "${ALTOPTS}" ] ; then
++ OPTS=${ALTOPTS}
++ fi
++
++ echo "mklib: Making static library for Haiku: "
${LIBNAME}
++
++ # expand .a into .o files
++ NEW_OBJECTS=`expand_archives ${LIBNAME}.obj $OBJECTS`
++
++ # make static lib
++ FINAL_LIBS=`make_ar_static_lib ${OPTS} 1 ${LIBNAME}
${NEW_OBJECTS}`
++
++ # remove temporary extracted .o files
++ rm -rf ${LIBNAME}.obj
++ else
++ LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix
with ".so"
++ OPTS="-shared"
++
++ echo "mklib: Making shared library for Haiku: "
${LIBNAME}
++ ${LINK} ${OPTS} ${LDFLAGS} ${OBJECTS} ${DEPS} -o
${LIBNAME}
++ FINAL_LIBS="${LIBNAME}"
++ fi
++ ;;
++
+ 'example')
+ # If you're adding support for a new architecture, you can
+ # start with this:
+@@ -1021,4 +1025,9 @@ if [ ${INSTALLDIR} != "." ] ; then
+ echo "mklib: Installing" ${FINAL_LIBS} "in" ${INSTALLDIR}
+ test -d ${INSTALLDIR} || mkdir -p ${INSTALLDIR}
+ mv ${FINAL_LIBS} ${INSTALLDIR}/
++
++ if [ "x${FINAL_BINS}" != "x" ] ; then
++ echo "mklib: Installing" ${FINAL_BINS} "in" ${INSTALLDIR}
++ mv ${FINAL_BINS} ${INSTALLDIR}/
++ fi
+ fi
+diff -rupN Mesa-7.8.2/configs/current Mesa-7.8.2-haiku/configs/current
+--- Mesa-7.8.2/configs/current 1970-01-01 00:00:00.000000000 +0000
++++ Mesa-7.8.2-haiku/configs/current 2012-01-17 11:03:50.553910272 +0000
+@@ -0,0 +1,63 @@
++# Configuration for Haiku
++# Written by Alexander von Gluck IV
++#
++# Based on the BeOS config
++# written by Philippe Houdoin
++
++include $(TOP)/configs/default
++
++CONFIG_NAME = haiku
++
++# Haiku settings
++
++DEFINES = \
++ -DBEOS_THREADS \
++ -DGNU_ASSEMBLER \
++ -DUSE_X86_ASM \
++ -DUSE_MMX_ASM \
++ -DUSE_3DNOW_ASM \
++ -DUSE_SSE_ASM
++
++MESA_ASM_SOURCES = $(X86_SOURCES)
++GLAPI_ASM_SOURCES = $(X86_API)
++
++CC = gcc
++CXX = g++
++LD = gcc
++
++CFLAGS = -Wall -Wno-multichar $(DEFINES)
++CXXFLAGS = $(CFLAGS)
++LDFLAGS +=
++
++# Work around aliasing bugs - developers should comment this out
++CFLAGS += -fno-strict-aliasing
++#CFLAGS += -std=c99
++CXXFLAGS += -fno-strict-aliasing
++
++# No makedepend on Haiku, this will solve it
++MKDEP = true
++
++# Debug defines
++ifdef DEBUG
++ CFLAGS += -g -O0
++ LDFLAGS += -g
++ DEFINES += -DDEBUG
++else
++ CFLAGS += -O3
++endif
++
++# GLU settings
++GLU_LIB_NAME = libglu.a
++GLU_LIB = glu
++
++# Directories
++SRC_DIRS = glsl mesa/x86 mapi/glapi mesa glu
++GLU_DIRS = sgi
++DRIVER_DIRS =
++PROGRAM_DIRS =
++
++# Library/program dependencies
++GL_LIB_DEPS =
++OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
++GLU_LIB_DEPS =
++APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)
+diff -rupN Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku
+--- Mesa-7.8.2/configs/haiku 1970-01-01 00:00:00.000000000 +0000
++++ Mesa-7.8.2-haiku/configs/haiku 2012-01-17 11:03:50.553910272 +0000
+@@ -0,0 +1,63 @@
++# Configuration for Haiku
++# Written by Alexander von Gluck IV
++#
++# Based on the BeOS config
++# written by Philippe Houdoin
++
++include $(TOP)/configs/default
++
++CONFIG_NAME = haiku
++
++# Haiku settings
++
++DEFINES = \
++ -DBEOS_THREADS \
++ -DGNU_ASSEMBLER \
++ -DUSE_X86_ASM \
++ -DUSE_MMX_ASM \
++ -DUSE_3DNOW_ASM \
++ -DUSE_SSE_ASM
++
++MESA_ASM_SOURCES = $(X86_SOURCES)
++GLAPI_ASM_SOURCES = $(X86_API)
++
++CC = gcc
++CXX = g++
++LD = gcc
++
++CFLAGS = -Wall -Wno-multichar $(DEFINES)
++CXXFLAGS = $(CFLAGS)
++LDFLAGS +=
++
++# Work around aliasing bugs - developers should comment this out
++CFLAGS += -fno-strict-aliasing
++#CFLAGS += -std=c99
++CXXFLAGS += -fno-strict-aliasing
++
++# No makedepend on Haiku, this will solve it
++MKDEP = true
++
++# Debug defines
++ifdef DEBUG
++ CFLAGS += -g -O0
++ LDFLAGS += -g
++ DEFINES += -DDEBUG
++else
++ CFLAGS += -O3
++endif
++
++# GLU settings
++GLU_LIB_NAME = libglu.a
++GLU_LIB = glu
++
++# Directories
++SRC_DIRS = glsl mesa/x86 mapi/glapi mesa glu
++GLU_DIRS = sgi
++DRIVER_DIRS =
++PROGRAM_DIRS =
++
++# Library/program dependencies
++GL_LIB_DEPS =
++OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
++GLU_LIB_DEPS =
++APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)
+Binary files Mesa-7.8.2/lib/libglu.a and Mesa-7.8.2-haiku/lib/libglu.a differ
+diff -rupN Mesa-7.8.2/Makefile Mesa-7.8.2-haiku/Makefile
+--- Mesa-7.8.2/Makefile 2010-06-16 21:22:57.033030144 +0000
++++ Mesa-7.8.2-haiku/Makefile 2012-01-17 09:56:45.423886848 +0000
+@@ -84,6 +84,7 @@ freebsd \
+ freebsd-dri \
+ freebsd-dri-amd64 \
+ freebsd-dri-x86 \
++haiku \
+ hpux10 \
+ hpux10-gcc \
+ hpux10-static \
+diff -rupN Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h
Mesa-7.8.2-haiku/src/gallium/auxiliary/draw/draw_private.h
+--- Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h 2010-06-15
17:43:42.046137344 +0000
++++ Mesa-7.8.2-haiku/src/gallium/auxiliary/draw/draw_private.h 2012-01-17
09:59:43.815005696 +0000
+@@ -70,7 +70,7 @@ struct vertex_header {
+
+ /* This will probably become float (*data)[4] soon:
+ */
+- float data[][4];
++ float (*data)[4];
+ };
+
+ /* NOTE: It should match vertex_id size above */
+diff -rupN Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h
Mesa-7.8.2-haiku/src/gallium/auxiliary/os/os_thread.h
+--- Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h 2010-06-15
17:43:42.056098816 +0000
++++ Mesa-7.8.2-haiku/src/gallium/auxiliary/os/os_thread.h 2012-01-17
10:00:38.613154816 +0000
+@@ -257,7 +257,7 @@ typedef unsigned pipe_condvar;
+ * pipe_barrier
+ */
+
+-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) ||
defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU)
++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
+
+ typedef pthread_barrier_t pipe_barrier;
+
+diff -rupN Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h
Mesa-7.8.2-haiku/src/gallium/auxiliary/util/u_debug.h
+--- Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h 2010-06-15
17:43:42.066584576 +0000
++++ Mesa-7.8.2-haiku/src/gallium/auxiliary/util/u_debug.h 2012-01-17
10:02:01.553385984 +0000
+@@ -91,8 +91,10 @@ debug_printf(const char *format, ...)
+ (void) format; /* silence warning */
+ #endif
+ }
+-
+-#endif /* !PIPE_OS_HAIKU */
++#else /* is Haiku */
++/* Haiku provides debug_printf in libroot with OS.h */
++#include <OS.h>
++#endif
+
+ /*
+ * ... isn't portable so we need to pass arguments in parentheses.
+diff -rupN Mesa-7.8.2/src/glu/sgi/Makefile
Mesa-7.8.2-haiku/src/glu/sgi/Makefile
+--- Mesa-7.8.2/src/glu/sgi/Makefile 2010-02-05 00:10:40.063963136 +0000
++++ Mesa-7.8.2-haiku/src/glu/sgi/Makefile 2012-01-17 10:02:42.222822400
+0000
+@@ -135,13 +135,19 @@ $(TOP)/$(LIB_DIR):
+ -mkdir $(TOP)/$(LIB_DIR)
+
+ # Make the library:
+-$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
++$(TOP)/$(LIB_DIR)/lib$(GLU_LIB).so: $(OBJECTS)
+ $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+ -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
+ -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
+ -exports glu.exports -id
$(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
+ $(GLU_LIB_DEPS) $(OBJECTS)
+
++$(TOP)/$(LIB_DIR)/lib$(GLU_LIB).a: $(OBJECTS)
++ $(MKLIB) -o $(GLU_LIB) -static -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
++ -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
++ -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
++ -exports glu.exports -id
$(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
++ $(GLU_LIB_DEPS) $(OBJECTS)
+
+ clean:
+ -rm -f *.o */*.o */*/*.o
+diff -rupN Mesa-7.8.2/src/mesa/glapi/glapi.h
Mesa-7.8.2-haiku/src/mesa/glapi/glapi.h
+--- Mesa-7.8.2/src/mesa/glapi/glapi.h 2010-06-15 17:43:43.026214400 +0000
++++ Mesa-7.8.2-haiku/src/mesa/glapi/glapi.h 2012-01-17 10:51:04.699662336
+0000
+@@ -62,7 +62,7 @@ typedef void (*_glapi_proc)(void); /* ge
+ #endif
+
+
+-#if defined(__GNUC__)
++#if defined(__GNUC__) && __GNUC__ > 2
+ # define likely(x) __builtin_expect(!!(x), 1)
+ # define unlikely(x) __builtin_expect(!!(x), 0)
+ #else
diff --git a/3rdparty/mesa/mesa-o-matic.sh b/3rdparty/mesa/mesa-o-matic.sh
index f94c2ad..411296f 100755
--- a/3rdparty/mesa/mesa-o-matic.sh
+++ b/3rdparty/mesa/mesa-o-matic.sh
@@ -15,7 +15,7 @@ echo ""
# These are the Mesa headers and libraries used by the opengl kit
# Headers are probed for dependencies, only specify ones referenced
# by the opengl kit.
-MESA_PRIVATE_HEADERS="glheader.h glapi.h glapitable.h glapitemp.h glapi_priv.h
context.h driverfuncs.h meta.h colormac.h buffers.h framebuffer.h
renderbuffer.h state.h version.h swrast.h swrast_setup.h tnl.h t_context.h
t_pipeline.h vbo.h common_x86_asm.h common_ppc_features.h extensions.h
s_spantemp.h s_renderbuffer.h formats.h"
+MESA_PRIVATE_HEADERS="glheader.h glapi.h glapitable.h glapitemp.h glapi_priv.h
context.h driverfuncs.h meta.h colormac.h buffers.h framebuffer.h
renderbuffer.h state.h version.h swrast.h swrast_setup.h tnl.h t_context.h
t_pipeline.h vbo.h common_x86_asm.h common_ppc_features.h extensions.h
s_spantemp.h s_renderbuffer.h formats.h cpuinfo.h"
#######################################################################
# END CONFIG DATA, Dragons below!
@@ -95,6 +95,6 @@ done
echo "Creating Mesa OptionalPackage..."
PLATFORM=$( uname -m )
ZIP_FILENAME="../mesa-$MESA_VER-gcc$GCC_VER-x86.zip"
-zip -9 $ZIP_FILENAME $ZIP_HEADERS ./include/GL/* ./lib.haiku/*
+zip -r -9 $ZIP_FILENAME $ZIP_HEADERS ./include/GL/* ./lib.haiku/*
echo "Great Success! $ZIP_FILENAME created."
############################################################################
Commit: 3c0d5dcaf1efee8798e0d9a6543f1733abb96155
URL: http://cgit.haiku-os.org/haiku/commit/?id=3c0d5dc
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Tue Jan 17 14:57:49 2012 UTC
opengl: Improve libGL linking and Mesa optional package
* Move compiled binaries into lib.haiku within Mesa optional
pacakge, this enables us to use Make or scons to build Mesa
* Untangle libGL linking and order library inclusion
* Remove zmuldef hacks
* Compile libgallium into the libGL on Mesa 8.0 / gcc4 images
* Don't Mesa calculate cpu optimizations due to visibility
issues, use Mesa cpu functions for this.
* Don't allow undefined symbols in libGL.so to ensure sanity.
* Move Mesa optional packages to haiku-files
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index d9709a6..27697da 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -171,13 +171,18 @@ if $(HAIKU_BUILD_FEATURE_CLUCENE) {
# Mesa
-local mesaBaseURL = http://pub.haikufire.com/mesa ;
+local mesaBaseURL = http://haiku-files.org/files/optional-packages ;
if $(TARGET_ARCH) = x86 {
+ local glslObject ;
+ local galliumObjects ;
local zipFile ;
if $(HAIKU_GCC_VERSION[1]) >= 4 {
- HAIKU_MESA_FILE = mesa-8.0-devel-gcc4-x86.zip ;
+ #HAIKU_MESA_FILE = mesa-8.0dev-x86-gcc4-2012-01-17.zip ;
+ HAIKU_MESA_FILE = mesa-8.0devdbg-x86-gcc4-2012-01-17.zip ;
+ glslObject = lib.haiku/libglsl.a ;
+ galliumObjects = lib.haiku/libgallium.a ;
} else {
- HAIKU_MESA_FILE = mesa-7.8.2-gcc2-x86.zip ;
+ HAIKU_MESA_FILE = mesa-7.8.2-x86-gcc2-2012-01-17.zip ;
}
zipFile = [ DownloadFile $(HAIKU_MESA_FILE)
@@ -189,24 +194,15 @@ if $(TARGET_ARCH) = x86 {
HAIKU_MESA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MESA_DIR)
: include/ : $(zipFile) : extracted-mesa ] ;
- if $(HAIKU_GCC_VERSION[1]) >= 4 {
- HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
- :
- src/mesa/libmesa.a
- src/mapi/glapi/libglapi.a
- lib/libGLU.a
- : $(zipFile)
- : extracted-mesa ] ;
- } else {
- # Older Mesa 7.8
- HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
+ HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
:
- src/mesa/libmesa.a
- src/mesa/libglapi.a
- lib/libGLU.a
+ lib.haiku/libglu.a
+ $(galliumObjects)
+ lib.haiku/libglapi.a
+ $(glslObject)
+ lib.haiku/libmesa.a
: $(zipFile)
: extracted-mesa ] ;
- }
HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;
diff --git a/src/add-ons/opengl/mesa_software_renderer/Jamfile
b/src/add-ons/opengl/mesa_software_renderer/Jamfile
index 855bda7..95177f4 100644
--- a/src/add-ons/opengl/mesa_software_renderer/Jamfile
+++ b/src/add-ons/opengl/mesa_software_renderer/Jamfile
@@ -49,6 +49,8 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa tnl ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ;
Addon Mesa\ Software\ Renderer :
- MesaSoftwareRenderer.cpp
- : libGL.so be $(TARGET_LIBSUPC++)
+ MesaSoftwareRenderer.cpp :
+ libGL.so
+ be
+ $(TARGET_LIBSUPC++)
;
diff --git a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
index 7d9a93a..4dd4df9 100644
--- a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
+++ b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
@@ -30,6 +30,7 @@ extern "C" {
#include "drivers/common/driverfuncs.h"
#include "drivers/common/meta.h"
#include "main/colormac.h"
+#include "main/cpuinfo.h"
#include "main/buffers.h"
#include "main/formats.h"
#include "main/framebuffer.h"
@@ -600,60 +601,19 @@ MesaSoftwareRenderer::_Error(gl_context* ctx)
const GLubyte*
MesaSoftwareRenderer::_GetString(gl_context* ctx, GLenum name)
{
+
switch (name) {
case GL_VENDOR:
return (const GLubyte*) "Mesa Project";
case GL_RENDERER: {
+ _mesa_get_cpu_features();
static char buffer[256] = { '\0' };
if (!buffer[0]) {
+ char* cpuInfo = _mesa_get_cpu_string();
// Let's build an renderer string
- strncat(buffer, "Software Rasterizer",
sizeof(buffer));
-
- // Append any CPU-specific information.
-#ifdef USE_X86_ASM
- if (_mesa_x86_cpu_features)
- strncat(buffer, ", optimized for x86",
sizeof(buffer));
-#ifdef USE_MMX_ASM
- if (cpu_has_mmx) {
- strncat(buffer, (cpu_has_mmxext) ?
"/MMX+" : "/MMX",
- sizeof(buffer));
- }
-#endif
-#ifdef USE_3DNOW_ASM
- if (cpu_has_3dnow) {
- strncat(buffer, (cpu_has_3dnowext) ?
"/3DNow!+" : "/3DNow!",
- sizeof(buffer));
- }
-#endif
-#ifdef USE_SSE_ASM
- if (cpu_has_xmm) {
- strncat(buffer, (cpu_has_xmm2) ?
"/SSE2" : "/SSE",
- sizeof(buffer));
- }
-#endif
-
-#elif defined(USE_SPARC_ASM)
-
- strncat(buffer, ", optimized for SPARC",
sizeof(buffer));
-
-#elif defined(USE_PPC_ASM)
-
- if (_mesa_ppc_cpu_features) {
- strncat(buffer, (cpu_has_64) ? ",
optimized for "
- "PowerPC 64" : ", optimized for
PowerPC",
- sizeof(buffer));
- }
-
-#ifdef USE_VMX_ASM
- if (cpu_has_vmx)
- strncat(buffer, "/Altivec",
sizeof(buffer));
-#endif
-
- if (! cpu_has_fpu)
- strncat(buffer, "/No FPU",
sizeof(buffer));
-#endif
-
+ sprintf(buffer, "Software Rasterizer for %s",
cpuInfo);
+ free(cpuInfo);
}
return (const GLubyte*) buffer;
}
diff --git a/src/kits/opengl/GLDispatcher.cpp b/src/kits/opengl/GLDispatcher.cpp
index 31a35b6..953339b 100644
--- a/src/kits/opengl/GLDispatcher.cpp
+++ b/src/kits/opengl/GLDispatcher.cpp
@@ -67,10 +67,6 @@ extern "C" {
return (dispatch->func) args
-#if __GNUC__ > 2
-#include "glapitemp.h"
-#endif
-
#endif /* USE_X86_ASM */
}
diff --git a/src/kits/opengl/Jamfile b/src/kits/opengl/Jamfile
index c18cb65..ca60fd2 100644
--- a/src/kits/opengl/Jamfile
+++ b/src/kits/opengl/Jamfile
@@ -32,7 +32,7 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mapi glapi ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa glapi ] ;
LINKFLAGS on libGL.so = [ on libGL.so return $(LINKFLAGS) ]
- -Xlinker --strip-debug -Xlinker --whole-archive -Xlinker -zmuldefs ;
+ -Xlinker --whole-archive -Xlinker --no-undefined -fvisibility=default ;
# For GCC2
if $(HAIKU_GCC_VERSION[1]) < 3 {
@@ -41,15 +41,15 @@ if $(HAIKU_GCC_VERSION[1]) < 3 {
SharedLibrary libGL.so : $(sources) :
+ # Glut
+ <opengl>glut.o
# Mesa libraries (from Mesa optional package):
$(HAIKU_MESA_LIBS)
- # Glut
- <opengl>glut.o
-
# External libraries:
- be
game # BWindowScreen needed by BGLScreen stub class
+ network
+ be
$(TARGET_LIBSTDC++)
;
############################################################################
Revision: hrev43669
Commit: 2a14f70ce80c2f6f2839ebf09dba2fd35fc13c15
URL: http://cgit.haiku-os.org/haiku/commit/?id=2a14f70
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Tue Jan 17 14:59:04 2012 UTC
opengl: Remove unneeded visibility flag
----------------------------------------------------------------------------
diff --git a/src/kits/opengl/Jamfile b/src/kits/opengl/Jamfile
index ca60fd2..ca1347d 100644
--- a/src/kits/opengl/Jamfile
+++ b/src/kits/opengl/Jamfile
@@ -32,7 +32,7 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mapi glapi ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa glapi ] ;
LINKFLAGS on libGL.so = [ on libGL.so return $(LINKFLAGS) ]
- -Xlinker --whole-archive -Xlinker --no-undefined -fvisibility=default ;
+ -Xlinker --whole-archive -Xlinker --no-undefined ;
# For GCC2
if $(HAIKU_GCC_VERSION[1]) < 3 {
Other related posts:
- » [haiku-commits] haiku: hrev43669 - 3rdparty/mesa src/add-ons/opengl/mesa_software_renderer build/jam - kallisti5
