Adam Jackson (1):
Unbreak Linux builds with -fvisibility=hidden.
Andreas Micheler (1):
faster write_rgba_span_front()
Brian (69):
added md5 sums
fix even-sized point positioning (bug 11874)
Merge branch 'mesa_7_0_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
fix bug 9962 (vbo splitting) as in trunk
initial 7.0.2 notes
fix swizzle error test (bug 11881)
fix potential NULL dereference (bug 11880)
remove SHELL line, replace -e test with new logic (Daniel Stone)
fix potential NULL dereference (bug 11879)
move free() after dereference (bug 11878)
fix byte swap bug for GLuint stencil indexes (bug 11909)
fix link to 7.0.1 relnotes
Implement mutex/locking around texture object reference counting.
free any render/framebuffers left in hash tables when freeing shared state
Add PCI IDs for the G33, Q33, and Q35 chipsets.
added more i915/945 chipsets
fix blending/banding bug
Fix a few more problems with freeing FBOs/textures during context destruction.
added some temporary texobj ref counting debug output
more tex obj ref count debugging (temporary)
Added _mesa_free_attrib_data() to free anything left in the attribute stack upon context destruction.
copy Target in _mesa_copy_texture_object()
Rewrite quite a bit of the code for glPush/PopAttrib() for texture state.
more debug output (context destroy, fb destroy)
log deleting/binding of FBOs
Remove recent texobj refcount debug/logging code.
don't map buffer in _mesa_validate_DrawElements() unless needed
refactor bounds checking code
remove unneeded CallStack array
remove CallDepth++/-- accidentally removed in prev commit
new __gluInvertMatrix() function (Mesa bug 6748)
Fixed bugs 6748, 12141
s/movaps/movups/ (see bug 12216)
fix i965 bugs, x86-64 bugs
sync with trunk, fixing bug 12239
Use temporary matrix in __gluInvertMatrixd() to fix aliasing problem (see bugs 12269, 6748)
updated VC7 project files
clean-up (see bug 12317)
fix comment
Update depth test state when binding new framebuffer object
In _mesa_make_current(), don't unbind FBOs from the old context.
fix indirect rendering crash
updated with pkg-config info
added DSTDIR, pkg-config items
added .pc.in files to tarballs
Fix state.texgen parsing error (bug 12313).
added program_error2() function for better error reporting
fix ARB fp/vp parsing bug 12313
fix copypixels overlap test bug (#12417)
fix glCopyPixel/glPixelZoom bug 12417)
updated link
From trunk: mesa: bind VBO_ATTRIB_XXX to correct input array when executing a display list. fix #10604
fix bug 10604
Added bluegene-xlc-osmesa config (Alexander Neundorf)
fixes for bluegene-xlc-osmesa config
added bluegene-xlc-osmesa, fortran fixes
fix for __IBMC__
fix -D_BSD_SOURC
fix DrawRangeElements error msg
Restore old _TriangleCaps code to fix Blender problem (bug 12164)
fix blend bug 12164
bump versions to 7.0.2
for Miniglx, use git sources
prep for 7.0.2 release
update the DRM/DRI instructions
fix VBO-split infinite loop (bug 12164)
updated glext.h license info (Khronos), plus other clean-ups
replace 'brick' with correct program name in printfs
fix fog, rescale_normals bugs (from gallium branch)
Christoph Kubisch (1):
updated VC7 project files
Colin McDonald (1):
fixed problem with big glDrawArrays (see bug 12141)
Dan Nicholson (4):
DESTDIR support.
pkg-config support
add support for LDFLAGS env var
Ignore more generated files in progs/
Dan Torop (1):
fix spantmp2 READ_RGBA inline asm (#11931)
Dave Airlie (1):
i965: fix vblank on 965gm laptops by bringing in code from i915
Michel Dänzer (3):
i915tex: Make sure pitch is aligned properly for render-to-texture.
i915tex: Unreference texture buffers on context destruction.
i915tex: Work around texture pitch related performance drops on i915 at least.
Mrc Gran (1):
fix force_s3tc_enable option
Roland Bär (1):
[i965] Bug #11812: Fix fwrite return value checks in AUB file code.
Roland Scheidegger (6):
suppress warning about ncon visuals (bug #6689)
fix another occurence of movaps which might not be aligned
unbreak 3d textures (typo when setting tex layout)
make sure optimized fog params get updated
fog: fix issues with negative fog coords (may fix #10529)
minor fog calc cleanup
Wang Zhenyu (1):
i915tex: Add support for 945GME
Xiang, Haihao (14):
i965: flush batch buffer when getting the maximum. This makes
i965: samplers group in fours in WM_STATE. fix bug#9415
i965: check NULL pointer. fix bug#12193
i965: store read drawable info in intel_context. Some OpenGL
i965: Take the upper limitation on LOD into account.
fix bug#11009
i965: limit on LOD Bias, fix#11987
i965: take the secondary color into account when drawing
i965: fix #11378
i965: fix bug#11925
i965: The cube map texture coordinates must be devided by the
i965: handle all unfilled mode in clip stage. fix bug #12453
mesa: make sure the gotten value isn't greater than the
Brian's fix for bug9829
Zou Nan hai (2):
fix a bug in 965 ARB_occlusion_query,
fix fd.o bug #12217, recalcuate urb when clip plane size change
diff --git a/Makefile b/Makefile
index 3cab262..e05e0e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
# Top-level Mesa makefile
-SHELL = /bin/bash
-
TOP = .
SUBDIRS = src progs
@@ -70,6 +68,7 @@ aix-gcc \
aix-static \
beos \
bluegene-osmesa \
+bluegene-xlc-osmesa \
darwin \
darwin-static \
darwin-static-x86ppc \
@@ -156,7 +155,7 @@ sunos5-v9 \
sunos5-v9-static \
sunos5-v9-cc-g++ \
ultrix-gcc:
- @ if [ -e configs/current ] ; then \
+ @ if test -f configs/current || test -L configs/current ; then \
echo "Please run 'make realclean' before changing configs" ; \
exit 1 ; \
fi
@@ -166,10 +165,10 @@ ultrix-gcc:
# Rules for making release tarballs
-DIRECTORY = Mesa-7.0.1
-LIB_NAME = MesaLib-7.0.1
-DEMO_NAME = MesaDemos-7.0.1
-GLUT_NAME = MesaGLUT-7.0.1
+DIRECTORY = Mesa-7.0.2-rc1
+LIB_NAME = MesaLib-7.0.2-rc1
+DEMO_NAME = MesaDemos-7.0.2-rc1
+GLUT_NAME = MesaGLUT-7.0.2-rc1
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
@@ -213,6 +212,7 @@ MAIN_FILES = \
$(DIRECTORY)/src/mesa/Makefile* \
$(DIRECTORY)/src/mesa/sources \
$(DIRECTORY)/src/mesa/descrip.mms \
+ $(DIRECTORY)/src/mesa/gl.pc.in \
$(DIRECTORY)/src/mesa/depend \
$(DIRECTORY)/src/mesa/main/*.[chS] \
$(DIRECTORY)/src/mesa/main/descrip.mms \
@@ -320,6 +320,7 @@ DRI_FILES = \
SGI_GLU_FILES = \
$(DIRECTORY)/src/glu/Makefile \
$(DIRECTORY)/src/glu/descrip.mms \
+ $(DIRECTORY)/src/glu/glu.pc.in \
$(DIRECTORY)/src/glu/sgi/Makefile \
$(DIRECTORY)/src/glu/sgi/Makefile.mgw \
$(DIRECTORY)/src/glu/sgi/Makefile.win \
@@ -396,6 +397,7 @@ GLUT_FILES = \
$(DIRECTORY)/include/GL/glutf90.h \
$(DIRECTORY)/src/glut/glx/Makefile* \
$(DIRECTORY)/src/glut/glx/depend \
+ $(DIRECTORY)/src/glut/glx/glut.pc.in \
$(DIRECTORY)/src/glut/glx/*def \
$(DIRECTORY)/src/glut/glx/descrip.mms \
$(DIRECTORY)/src/glut/glx/mms_depend \
@@ -418,6 +420,7 @@ DEPEND_FILES = \
$(TOP)/src/mesa/depend \
$(TOP)/src/glx/x11/depend \
$(TOP)/src/glw/depend \
+ $(TOP)/src/glw/glw.pc.in \
$(TOP)/src/glut/glx/depend \
$(TOP)/src/glu/sgi/depend
diff --git a/bin/mklib b/bin/mklib
index 8334595..499e789 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -34,6 +34,7 @@ MINOR=0
PATCH=""
DEPS=""
LINK=""
+LDFLAGS=""
CPLUSPLUS=0
STATIC=0
DLOPEN=0
@@ -63,6 +64,7 @@ do
echo ' -LDIR search in DIR for library dependencies'
echo ' -linker L explicity specify the linker program to use (eg: gcc, g++)'
echo ' Not observed on all systems at this time.'
+ echo ' -ldflags OPT specify any additional linker flags in OPT'
echo ' -cplusplus link with C++ runtime'
echo ' -static make a static library (default is dynamic/shared)'
echo ' -dlopen make a shared library suitable for dynamic loading'
@@ -94,6 +96,10 @@ do
shift 1;
LINK=$1
;;
+ '-ldflags')
+ shift 1;
+ LDFLAGS=$1
+ ;;
-l*)
DEPS="$DEPS $1"
;;
@@ -216,7 +222,7 @@ case $ARCH in
rm -f ${LIBNAME}
# make lib
- ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
# finish up
FINAL_LIBS="${LIBNAME}"
elif [ $STATIC = 1 ] ; then
@@ -274,7 +280,7 @@ case $ARCH in
rm -f ${LIBNAME}.so
# make lib
- ${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
@@ -346,10 +352,10 @@ case $ARCH in
#echo "mklib: linker is" ${LINK} ${OPTS}
if [ $NOPREFIX = 1 ] ; then
rm -f ${LIBNAME}
- ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
else
rm -f ${LIBNAME}.${MAJOR} ${LIBNAME}
- ${LINK} ${OPTS} -o ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
ln -s ${LIBNAME}.${MAJOR} ${LIBNAME}
fi
FINAL_LIBS="${LIBNAME}.${MAJOR} ${LIBNAME}"
@@ -373,7 +379,7 @@ case $ARCH in
echo "mklib: Making FreeBSD shared library: " ${LIBNAME}
OPTS="-shared"
rm -f ${LIBNAME}
- ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
elif [ $STATIC = 1 ] ; then
STLIB="lib${LIBNAME}.a"
@@ -387,7 +393,7 @@ case $ARCH in
OPTS="-shared -Wl,-soname,${SHLIB}"
echo "mklib: Making FreeBSD shared library: " ${SHLIB}
rm -f ${SHLIB}
- ${LINK} ${OPTS} -o ${SHLIB} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${SHLIB} ${OBJECTS} ${DEPS}
ln -sf ${SHLIB} "lib${LIBNAME}.so"
FINAL_LIBS="${SHLIB} lib${LIBNAME}.so"
fi
@@ -445,7 +451,7 @@ case $ARCH in
fi
echo "mklib: Making IRIX " ${ABI} " shared library: " ${LIBNAME}
- ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
fi
;;
@@ -521,9 +527,9 @@ case $ARCH in
# On AIX a shared library is linked differently when
# you want to dlopen the file
if [ $DLOPEN = "1" ] ; then
- cc -G ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ cc -G ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
else
- cc ${OPTS} -o ${OFILE} ${OBJECTS} ${DEPS}
+ cc ${OPTS} ${LDFLAGS} -o ${OFILE} ${OBJECTS} ${DEPS}
ar ${X64} -r ${LIBNAME} ${OFILE}
fi
@@ -605,7 +611,7 @@ case $ARCH in
fi
echo "mklib: Making Darwin shared library: " ${LIBNAME}
- ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
ln -s ${LIBNAME} ${LINKNAME}
FINAL_LIBS="${LIBNAME} ${LINKNAME}"
fi
@@ -682,7 +688,7 @@ case $ARCH in
rm -f ${LIBNAME}.so.${MAJOR}
rm -f ${LIBNAME}.so
# make lib
- ${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
@@ -754,7 +760,7 @@ case $ARCH in
rm -f ${LIBNAME}.a
# make lib
- ${LINK} ${OPTS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
# finish up
diff --git a/configs/bluegene-xlc-osmesa b/configs/bluegene-xlc-osmesa
new file mode 100644
index 0000000..b0c762d
--- /dev/null
+++ b/configs/bluegene-xlc-osmesa
@@ -0,0 +1,29 @@
+# Configuration for building only libOSMesa on BlueGene using the IBM xlc compiler
+# This doesn't really have a lot of dependencies, so it should be usable
+# on similar systems too.
+# It uses static linking and disables multithreading.
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = bluegene-osmesa
+
+# Compiler and flags
+CC = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlc
+CXX = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlC
+CFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+
+MKLIB_OPTIONS = -static
+
+OSMESA_LIB_NAME = libOSMesa.a
+
+# Directories
+SRC_DIRS = mesa glu
+DRIVER_DIRS = osmesa
+PROGRAM_DIRS = osdemos
+
+
+# Dependencies
+OSMESA_LIB_DEPS = -lm
+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+APP_LIB_DEPS = -lOSMesa -lGLU -lm
diff --git a/configs/default b/configs/default
index 81f0338..2a08c16 100644
--- a/configs/default
+++ b/configs/default
@@ -10,7 +10,7 @@ CONFIG_NAME = default
# Version info
MESA_MAJOR=7
MESA_MINOR=0
-MESA_TINY=1
+MESA_TINY=2
# external projects. This should be useless now that we use libdrm.
DRM_SOURCE_PATH=$(TOP)/../drm
@@ -20,6 +20,7 @@ CC = cc
CXX = CC
CFLAGS = -O
CXXFLAGS = -O
+LDFLAGS =
GLU_CFLAGS =
# Misc tools and flags
diff --git a/docs/download.html b/docs/download.html
index 5c3989e..84451b8 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -9,7 +9,7 @@
Downloading
-Last stable release: 7.0.1
+Last stable release: 7.0.2
diff --git a/docs/fbdev-dri.html b/docs/fbdev-dri.html
index c7f59bb..0d9e52c 100644
--- a/docs/fbdev-dri.html
+++ b/docs/fbdev-dri.html
@@ -28,6 +28,12 @@ Xlib interfaces allowing some degree of application portability between
the X and X-less environments.
+
+Some of the files needed for building this configuration are not included
+in the normal Mesa releases so you'll need to get the latest sources
+sources from the git repository.
+
+
2. Compilation
diff --git a/docs/install.html b/docs/install.html
index 804dee5..4cd0d4c 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -57,50 +57,31 @@ the DRI hardware drivers.
-DRM kernel modules and header files from the
-DRI project.
+For Mesa 7.0.2
+DRM version 2.3 is required.
-
-If you don't already have the DRM file, you can get the sources from
-CVS by doing:
-
-cvs -z3 -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/dri co drm
-
-
-See the
-DRI Building Instructions for the steps to build the DRM modules. Mesa
-6.5 requires at least libdrm 2.0.1 or greater.
-
-
-You can verify that the DRM files have been properly installed by
-running pkg-config --modversion libdrm
-
-
-
-
-Recent /usr/include/GL/glxproto.h file.
-You'll need this if you get any errors about _GLXvop_BindTexImageEXT
-being undefined.
+To check if you already have it, run:
+
+pkg-config --modversion libdrm
-Download/install the
-glproto
-module from X.org git, or grab the
-glxproto.h file and put it in the
-Mesa/include/GL/ directory.
+You can download and install a
+tarball release or get the code from git with:
+
+git clone git://anongit.freedesktop.org/git/mesa/drm
+
+Then revert to the drm-2.3.0 tag with:
+
+git-reset --hard drm-2.3.0
-
-DRI-enabled X server.
-Visit
-XFree86
-or
+
+Relatively recent
-X.org
-for more information.
-
+X.org release.
+Mesa depends on a number of X header and library files.
@@ -287,7 +268,15 @@ already installed, you'll have to choose different directories, like
To install Mesa's headers and libraries, run make install.
But first, check the Mesa/configs/default file and examine the values
of the INSTALL_DIR and DRI_DRIVER_INSTALL_DIR variables.
-Change them if needed, then run make install
+Change them if needed, then run make install.
+
+
+
+The variable
+DESTDIR may also be used to install the contents to a temporary
+staging directory.
+This can be useful for package management.
+For example: make install DESTDIR=/somepath/
@@ -298,6 +287,26 @@ This is a handy way to compare multiple OpenGL implementations.
+1.5 pkg-config support
+
+
+Running make install will install package configuration files
+for the pkg-config utility.
+
+
+
+When compiling your OpenGL application you can use pkg-config to determine
+the proper compiler and linker flags.
+
+
+
+For example, compiling and linking a GLUT application can be done with:
+
+
+ gcc `pkg-config --cflags --libs glut` mydemo.c -o mydemo
+
+
+
2. Windows Compilation and Installation
diff --git a/docs/license.html b/docs/license.html
index 944a5dd..44b980d 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -86,29 +86,32 @@ and their respective licenses.
Mesa Component Licenses
-Component Location Primary Author License
-----------------------------------------------------------------------------
-Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+Component Location License
+------------------------------------------------------------------
+Main Mesa code src/mesa/ Mesa (MIT)
-Device drivers src/mesa/drivers/* See drivers See drivers
+Device drivers src/mesa/drivers/* MIT, generally
-Ext headers include/GL/glext.h SGI SGI Free B
+Ext headers include/GL/glext.h Khronos
include/GL/glxext.h
-GLUT src/glut/ Mark Kilgard Mark's copyright
+GLUT src/glut/ Mark Kilgard's copyright
-Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+SGI GLU library src/glu/sgi/ SGI Free B
-SGI GLU library src/glu/sgi/ SGI SGI Free B
+demo programs progs/demos/ see source files
-demo programs progs/demos/ various see source files
+X demos progs/xdemos/ see source files
-X demos progs/xdemos/ Brian Paul see source files
+SGI demos progs/samples/ SGI license
-SGI demos progs/samples/ SGI SGI copyright
-
-RedBook demos progs/redbook/ SGI SGI copyright
+RedBook demos progs/redbook/ SGI license
+
+In general, consult the source files for license terms.
+
+
+