mesa: Changes to 'debian-experimental'
Rebased ref, commits from common ancestor:
commit 40b961f21d6a11575a34021882f18932838aca1b
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 18:32:02 2012 +0200
rules: Drop obsolete configure options.
diff --git a/debian/changelog b/debian/changelog
index a90db55..4bfd937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
* control: Drop libglw1-mesa, libglw1-mesa-dev, glw got moved to a
separate source package.
* libegl-mesa.symbols, libgles2-mesa.symbols: Add new symbols.
+ * rules: Drop obsolete configure options.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/rules b/debian/rules
index 732e6b3..1c00eb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,6 @@ include /usr/share/quilt/quilt.make
confflags-common = \
--disable-glu \
- --disable-glut \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -168,9 +167,7 @@ confflags-swx11+glu = \
--disable-egl \
--with-gallium-drivers= \
--with-driver=xlib \
- --disable-gl-osmesa \
--disable-egl \
- --disable-glut \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -178,10 +175,8 @@ confflags-swx11+glu-static = \
--disable-egl \
--with-gallium-drivers= \
--with-driver=xlib \
- --disable-gl-osmesa \
--enable-static \
--disable-egl \
- --disable-glut \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -189,8 +184,6 @@ confflags-swx11+glu-i386-i686 = \
--disable-egl \
--with-gallium-drivers= \
--with-driver=xlib \
- --disable-gl-osmesa \
- --disable-glut \
--disable-egl \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
CFLAGS="$(CFLAGS) -march=i686" \
commit c184a322b41bb218d699cb97c2bddf0f4fe70329
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 18:08:07 2012 +0200
rules: clean up --enable-motif
diff --git a/debian/rules b/debian/rules
index 547bbbd..732e6b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,7 +171,6 @@ confflags-swx11+glu = \
--disable-gl-osmesa \
--disable-egl \
--disable-glut \
- --enable-motif \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -183,7 +182,6 @@ confflags-swx11+glu-static = \
--enable-static \
--disable-egl \
--disable-glut \
- --enable-motif \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -194,7 +192,6 @@ confflags-swx11+glu-i386-i686 = \
--disable-gl-osmesa \
--disable-glut \
--disable-egl \
- --enable-motif \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
CFLAGS="$(CFLAGS) -march=i686" \
CXXFLAGS="$(CXXFLAGS) -march=i686"
commit 25c534e535990bed610a26140117f994bc94fb48
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 17:47:26 2012 +0200
remove rest of libglw1*
diff --git a/debian/libglw1-mesa-dev.install.in b/debian/libglw1-mesa-dev.install.in
deleted file mode 100644
index 822fa4a..0000000
--- a/debian/libglw1-mesa-dev.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/GL/GLw*A.h
-usr/lib/${DEB_HOST_MULTIARCH}/libGLw.a
-usr/lib/${DEB_HOST_MULTIARCH}/libGLw.so
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glw.pc
diff --git a/debian/libglw1-mesa.install.in b/debian/libglw1-mesa.install.in
deleted file mode 100644
index 14036ee..0000000
--- a/debian/libglw1-mesa.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libGLw.so.*
diff --git a/debian/libglw1-mesa.lintian-overrides b/debian/libglw1-mesa.lintian-overrides
deleted file mode 100644
index 7d53dee..0000000
--- a/debian/libglw1-mesa.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGLw1
diff --git a/debian/libglw1-mesa.shlibs b/debian/libglw1-mesa.shlibs
deleted file mode 100644
index 488d4da..0000000
--- a/debian/libglw1-mesa.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libGLw 1 libglw1-mesa | libglw1
diff --git a/debian/not-installed b/debian/not-installed
index 0bb613e..da26519 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -26,10 +26,6 @@ NOT_INSTALLED_i386 = \
usr/lib/*/i686/cmov/libGLU.so \
usr/lib/*/i686/cmov/libGLU.so.1 \
usr/lib/*/i686/cmov/libGLU.so.1.* \
- usr/lib/*/i686/cmov/libGLw.so \
- usr/lib/*/i686/cmov/libGLw.so.1 \
- usr/lib/*/i686/cmov/libGLw.so.1.* \
- usr/lib/*/i686/cmov/pkgconfig/glw.pc \
usr/lib/*/i686/cmov/pkgconfig/glu.pc \
usr/lib/*/i686/cmov/pkgconfig/gl.pc
commit ea2c2787a7102e2a476900fd177a2f8063e2f7ff
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 17:45:43 2012 +0200
libegl-mesa.symbols, libgles2-mesa.symbols: Add new symbols.
diff --git a/debian/changelog b/debian/changelog
index 8a35413..a90db55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
* control: Add libxcb-glx0-dev to build-depends.
* control: Drop libglw1-mesa, libglw1-mesa-dev, glw got moved to a
separate source package.
+ * libegl-mesa.symbols, libgles2-mesa.symbols: Add new symbols.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index c229766..d843f60 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -40,6 +40,7 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglGetScreensMESA@Base 7.8.1
eglInitialize@Base 7.8.1
eglMakeCurrent@Base 7.8.1
+ eglPostSubBufferNV@Base 8.0~rc1-1
eglQueryAPI@Base 7.8.1
eglQueryContext@Base 7.8.1
eglQueryModeStringMESA@Base 7.8.1
diff --git a/debian/libgles2-mesa.symbols b/debian/libgles2-mesa.symbols
index 8108fff..7a69f9b 100644
--- a/debian/libgles2-mesa.symbols
+++ b/debian/libgles2-mesa.symbols
@@ -43,6 +43,7 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
glDisable@Base 7.8.1
glDisableVertexAttribArray@Base 7.8.1
glDrawArrays@Base 7.8.1
+ glDrawBuffersNV@Base 8.0~rc1-1
glDrawElements@Base 7.8.1
glEGLImageTargetRenderbufferStorageOES@Base 7.8.1
glEGLImageTargetTexture2DOES@Base 7.8.1
commit cefd1e1feb3f6e44e6d471baba00cf9306bb8731
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 17:43:10 2012 +0200
control: Drop libglw1-mesa, libglw1-mesa-dev
glw got moved to a separate source package.
diff --git a/debian/changelog b/debian/changelog
index 74b687d..8a35413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Refresh patches.
* control: Add libxcb-glx0-dev to build-depends.
+ * control: Drop libglw1-mesa, libglw1-mesa-dev, glw got moved to a
+ separate source package.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/control b/debian/control
index 33ac547..08b118a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends:
x11proto-gl-dev (>= 1.4.11),
libxxf86vm-dev,
libexpat1-dev,
- lesstif2-dev,
dpkg-dev (>= 1.15.6),
libxfixes-dev,
libxdamage-dev,
@@ -754,47 +753,4 @@ Description: Mesa OpenGL utility library -- development files
For a complete description of GLU, please look at the libglu1-mesa
package.
-Package: libglw1-mesa
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Provides: libglw1
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: free implementation of the OpenGL API -- runtime
- Mesa is a 3-D graphics library with an API which is very similar to
- that of OpenGL. To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- Silicon Graphics, Inc. However, the author makes no claim that Mesa
- is in any way a compatible replacement for OpenGL or associated with
- Silicon Graphics, Inc.
- .
- This package provides a simple widgets library, libGLw, which
- allows Motif-based applications to embed an OpenGL drawing context.
- .
- On Linux, this library is also known as libGLw or libGLw.so.1.
-
-Package: libglw1-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- libglw1-mesa (= ${binary:Version}),
- libx11-dev,
- libxt-dev,
- lesstif2-dev | libmotif-dev,
- mesa-common-dev (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
-Provides: mesag3-widgets, mesag-widgets-dev, libglw-dev
-Conflicts: libglw-dev, libgl1-mesa-swx11-dev (<< 6.5.2-4)
-Replaces: libglw-dev
-Description: free implementation of the OpenGL API -- development files
- This package provides the development environment required for
- compiling programs with the Mesa widgets library, libGLw, which
- allows Motif-based applications to embed an OpenGL drawing context.
- The headers and static libraries for compiling programs that use this
- library are included.
-
# vim: tw=0
diff --git a/debian/rules b/debian/rules
index 449f72a..547bbbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,6 @@ include /usr/share/quilt/quilt.make
confflags-common = \
--disable-glu \
--disable-glut \
- --disable-glw \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
commit 8078554c03a234843cc45f7dfdf4e833683f76fa
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 17:40:48 2012 +0200
control: Add libxcb-glx0-dev to build-depends.
diff --git a/debian/changelog b/debian/changelog
index 1d03f1d..74b687d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Refresh patches.
+ * control: Add libxcb-glx0-dev to build-depends.
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
diff --git a/debian/control b/debian/control
index f58696c..33ac547 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends:
linux-libc-dev (>= 2.6.31) [linux-any],
libx11-xcb-dev,
libxcb-dri2-0-dev,
+ libxcb-glx0-dev,
libxcb-xfixes0-dev,
python-libxml2,
libudev-dev [linux-any],
commit 497f531113bdfc5df7a51f53e9fabae6788c596b
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 16:07:21 2012 +0200
Refresh patches.
diff --git a/debian/changelog b/debian/changelog
index 665574e..1d03f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
mesa (8.0~rc1-1) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* New upstream snapshot.
* Disable patch temporarily (needs a refresh):
- 11-hurd-ftbfs-again.diff
@@ -12,6 +13,9 @@ mesa (8.0~rc1-1) UNRELEASED; urgency=low
* Stop trying to ship swrastg through libgl1-mesa-dri-experimental,
it replaced the non-gallium variant.
+ [ Timo Aaltonen ]
+ * Refresh patches.
+
-- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100
mesa (7.11.2-1) unstable; urgency=low
diff --git a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
index 92c7f62..d2376e2 100644
--- a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
+++ b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
@@ -8,9 +8,9 @@ This patch by David Nusinow.
Index: mesa/src/mesa/main/compiler.h
===================================================================
---- mesa.orig/src/mesa/main/compiler.h
-+++ mesa/src/mesa/main/compiler.h
-@@ -375,8 +375,9 @@ static INLINE GLuint CPU_TO_LE32(GLuint
+--- mesa.orig/src/mesa/main/compiler.h 2012-01-18 16:04:58.338654818 +0200
++++ mesa/src/mesa/main/compiler.h 2012-01-18 16:05:00.930732513 +0200
+@@ -369,8 +369,9 @@
* USE_IEEE: Determine if we're using IEEE floating point
*/
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
diff --git a/debian/patches/05_kfreebsd-egl-x11.diff b/debian/patches/05_kfreebsd-egl-x11.diff
index 1bedcd6..3a050b4 100644
--- a/debian/patches/05_kfreebsd-egl-x11.diff
+++ b/debian/patches/05_kfreebsd-egl-x11.diff
@@ -8,11 +8,11 @@ Not that dri2 is going to work there, but well.
src/egl/drivers/dri2/platform_x11.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
-diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
-index 4e00c95..f38d6c0 100644
---- a/src/egl/drivers/dri2/platform_x11.c
-+++ b/src/egl/drivers/dri2/platform_x11.c
-@@ -997,7 +997,13 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp)
+Index: mesa/src/egl/drivers/dri2/platform_x11.c
+===================================================================
+--- mesa.orig/src/egl/drivers/dri2/platform_x11.c 2012-01-18 16:04:58.294653499 +0200
++++ mesa/src/egl/drivers/dri2/platform_x11.c 2012-01-18 16:05:08.790968112 +0200
+@@ -1083,7 +1083,13 @@
if (!dri2_load_driver(disp))
goto cleanup_conn;
@@ -26,6 +26,3 @@ index 4e00c95..f38d6c0 100644
if (dri2_dpy->fd == -1) {
_eglLog(_EGL_WARNING,
"DRI2: could not open %s (%s)", dri2_dpy->device_name,
---
-1.7.2.5
-
diff --git a/debian/patches/06_kfreebsd-ftbfs.diff b/debian/patches/06_kfreebsd-ftbfs.diff
index 9395d9d..66b3842 100644
--- a/debian/patches/06_kfreebsd-ftbfs.diff
+++ b/debian/patches/06_kfreebsd-ftbfs.diff
@@ -5,9 +5,11 @@ mesa fails to build on GNU/kFreeBSD, since some parts are not enabled.
Debian bug: http://bugs.debian.org/524690
---- a/configure.ac
-+++ b/configure.ac
-@@ -1024,7 +1024,7 @@ if test "$mesa_driver" = dri -o "$mesa_driver" = no; then
+Index: mesa/configure.ac
+===================================================================
+--- mesa.orig/configure.ac 2012-01-18 16:04:58.270652780 +0200
++++ mesa/configure.ac 2012-01-18 16:05:57.376424418 +0200
+@@ -1218,7 +1218,7 @@
;;
esac
;;
@@ -15,4 +17,4 @@ Debian bug: http://bugs.debian.org/524690
+ freebsd* | dragonfly* | *netbsd* | kfreebsd*-gnu*)
DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
- DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+
diff --git a/debian/patches/08-kfreebsd-gallium.diff b/debian/patches/08-kfreebsd-gallium.diff
index 91126b8..ed626c1 100644
--- a/debian/patches/08-kfreebsd-gallium.diff
+++ b/debian/patches/08-kfreebsd-gallium.diff
@@ -1,5 +1,7 @@
---- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c
-+++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+Index: mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+===================================================================
+--- mesa.orig/src/gallium/auxiliary/rtasm/rtasm_execmem.c 2012-01-18 16:04:58.230651581 +0200
++++ mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c 2012-01-18 16:06:09.872798989 +0200
@@ -37,7 +37,7 @@
#include "rtasm_execmem.h"
@@ -9,10 +11,12 @@
#define MAP_ANONYMOUS MAP_ANON
#endif
---- a/src/gallium/include/pipe/p_config.h
-+++ b/src/gallium/include/pipe/p_config.h
-@@ -147,7 +147,7 @@
- #define PIPE_OS_UNIX
+Index: mesa/src/gallium/include/pipe/p_config.h
+===================================================================
+--- mesa.orig/src/gallium/include/pipe/p_config.h 2012-01-18 16:04:58.238651821 +0200
++++ mesa/src/gallium/include/pipe/p_config.h 2012-01-18 16:06:09.872798989 +0200
+@@ -171,7 +171,7 @@
+ #define PIPE_OS_ANDROID
#endif
-#if defined(__FreeBSD__)
diff --git a/debian/patches/10-hurd-configure-tweaks.diff b/debian/patches/10-hurd-configure-tweaks.diff
index 60b0518..3dbfa92 100644
--- a/debian/patches/10-hurd-configure-tweaks.diff
+++ b/debian/patches/10-hurd-configure-tweaks.diff
@@ -1,9 +1,11 @@
Enable x86 assembler on Hurd.
Thanks to Pino Toscano.
---- a/configure.ac
-+++ b/configure.ac
-@@ -419,7 +419,7 @@ if test "x$enable_asm" = xyes; then
+Index: mesa/configure.ac
+===================================================================
+--- mesa.orig/configure.ac 2012-01-18 16:05:57.376424418 +0200
++++ mesa/configure.ac 2012-01-18 16:06:14.824947429 +0200
+@@ -473,7 +473,7 @@
case "$host_cpu" in
i?86)
case "$host_os" in
diff --git a/debian/patches/13-llvm-config-pick-a-version.diff b/debian/patches/13-llvm-config-pick-a-version.diff
index 0007d48..a4ad365 100644
--- a/debian/patches/13-llvm-config-pick-a-version.diff
+++ b/debian/patches/13-llvm-config-pick-a-version.diff
@@ -3,9 +3,9 @@ writing, 2.8 and 2.9), so pick a version. Let's assume the last version
receives bug fixes quickly, so pick 2.9 for now.
Index: mesa/configure.ac
===================================================================
---- mesa.orig/configure.ac 2011-08-01 17:04:54.000000000 +1000
-+++ mesa/configure.ac 2011-08-01 17:05:08.080884291 +1000
-@@ -1731,7 +1731,7 @@
+--- mesa.orig/configure.ac 2012-01-18 16:06:14.824947429 +0200
++++ mesa/configure.ac 2012-01-18 16:06:19.117076083 +0200
+@@ -1765,7 +1765,7 @@
esac
fi
if test "x$enable_gallium_llvm" = xyes; then
@@ -13,4 +13,4 @@ Index: mesa/configure.ac
+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-2.9], [no])
if test "x$LLVM_CONFIG" != xno; then
- LLVM_VERSION=`$LLVM_CONFIG --version`
+ LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
commit 4f8566413cfad452e90e56b0c82eaad6b5ccde11
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 18 16:04:27 2012 +0200
update the version
diff --git a/debian/changelog b/debian/changelog
index 9ba5f04..665574e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.12~0-1) UNRELEASED; urgency=low
+mesa (8.0~rc1-1) UNRELEASED; urgency=low
* New upstream snapshot.
* Disable patch temporarily (needs a refresh):
commit c85402aba91755808729fadf57a9f92285f4e61a
Author: Jakob Bornecrantz <jakob@vmware.com>
Date: Wed Jan 11 23:33:07 2012 +0100
mesa: Bump version number to 8.0-rc1
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
diff --git a/Makefile b/Makefile
index 1fa369a..64e3a7cd 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@ ultrix-gcc:
# Rules for making release tarballs
-PACKAGE_VERSION=8.0-devel
+PACKAGE_VERSION=8.0-rc1
PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 8723c1f..c1f4e8e 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -35,7 +35,7 @@ struct gl_context;
#define MESA_MAJOR 8
#define MESA_MINOR 0
#define MESA_PATCH 0
-#define MESA_VERSION_STRING "8.0-devel"
+#define MESA_VERSION_STRING "8.0-rc1"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 9c81e4eed1bc691f6308a230fddc80d2d2936a50
Author: Brian Paul <brianp@vmware.com>
Date: Fri Jan 13 13:45:58 2012 -0700
docs: add links to xf86-video-vmware wiki pages
(cherry picked from commit 548526f2e967d29e0aa1d9a37e4364100e84dc3f)
diff --git a/docs/vmware-guest.html b/docs/vmware-guest.html
index 9295644..727f99b 100644
--- a/docs/vmware-guest.html
+++ b/docs/vmware-guest.html
@@ -23,6 +23,15 @@ End users shouldn't have to go through all these steps once the driver is
included in newer Linux distributions.
</p>
+<p>
+For more information about the X components see these wiki pages at x.org:
+</p>
+<ul>
+<li><a href="http://wiki.x.org/wiki/vmware"; target="_parent">
+Driver Overview</a>
+<li><a href="http://wiki.x.org/wiki/vmware/vmware3D"; target="_parent">
+xf86-video-vmware Details</a>
+</ul>
<h2>Components</h2>
commit daa2545508202302208317ace78d328d60f4d35f
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 11 14:06:17 2012 -0800
mesa: Throw the required error for glCopyPixels from multisample FBO.
Fixes piglit EXT_framebuffer_multisample/negative-copypixels.
Reviewed-by: Brian Paul <brianp@vmware.com>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 9be6654c1f75bc402c807ec0caccebde032afa59)
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 9f5b0b3..01983d9 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -203,6 +203,12 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
goto end;
}
+ if (ctx->ReadBuffer->Name != 0 && ctx->ReadBuffer->Visual.samples > 0) {
+ _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION,
+ "glCopyPixels(multisample FBO)");
+ goto end;
+ }
+
if (!_mesa_source_buffer_exists(ctx, type) ||
!_mesa_dest_buffer_exists(ctx, type)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
commit baaa30ad52ac6eba0ee444c33678ffd357883a4d
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 11 14:02:41 2012 -0800
mesa: Throw the required error for glCopyTex{Sub,}Image from multisample FBO.
Fixes piglit EXT_framebuffer_multisample/negative-copyteximage.
Reviewed-by: Brian Paul <brianp@vmware.com>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 6950a4faf650fe119ee97aa18b006eed099038be)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 9475e84..d5e462b 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1909,6 +1909,13 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
"glCopyTexImage%dD(invalid readbuffer)", dimensions);
return GL_TRUE;
}
+
+ if (ctx->ReadBuffer->Visual.samples > 0) {
+ _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION,
+ "glCopyTexImage%dD(multisample FBO)",
+ dimensions);
+ return GL_TRUE;
+ }
}
/* Check border */
@@ -2008,6 +2015,13 @@ copytexsubimage_error_check1( struct gl_context *ctx, GLuint dimensions,
"glCopyTexImage%dD(invalid readbuffer)", dimensions);
return GL_TRUE;
}
+
+ if (ctx->ReadBuffer->Visual.samples > 0) {
+ _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION,
+ "glCopyTexSubImage%dD(multisample FBO)",
+ dimensions);
+ return GL_TRUE;
+ }
}
/* check target (proxies not allowed) */
commit b178514e24ee7f2f89448b384683fe42fd448c18
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 11 13:54:53 2012 -0800
mesa: Throw the required error for glReadPixels() from a multisampled FBO.
Fixes piglit EXT_framebuffer_multisample-negative-readpixels.
Reviewed-by: Brian Paul <brianp@vmware.com>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 86b7c6707f915b07347070901d602917bc25dd0f)
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index 0c0e539..c1489d2 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -782,6 +782,11 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height,
return;
}
+ if (ctx->ReadBuffer->Name != 0 && ctx->ReadBuffer->Visual.samples > 0) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(multisample FBO)");
+ return;
+ }
+
if (!_mesa_source_buffer_exists(ctx, format)) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)");
return;
commit 48e72b660549577c25a444826073f77232072dd9
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 11 13:46:43 2012 -0800
mesa: Avoid short-circuiting realloc of renderbuffers to new sample count.
Fixes piglit EXT_framebuffer_multisample/renderbuffer-samples.
Reviewed-by: Brian Paul <brianp@vmware.com>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 0e8d156c3cd70a67c99a82e42e7875f69b6a5b94)
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index aefcaf3..e6bab4b 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1395,7 +1395,8 @@ renderbuffer_storage(GLenum target, GLenum internalFormat,
if (rb->InternalFormat == internalFormat &&
rb->Width == (GLuint) width &&
- rb->Height == (GLuint) height) {
+ rb->Height == (GLuint) height &&
+ rb->NumSamples == samples) {
/* no change in allocation needed */
return;
}
commit 89fdeab1a201ae41b13693261fdc1aca6dbf79f7
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 9 16:41:02 2012 -0800
meta: Add GL_RED/GL_RG support to meta CopyTexImage.
Fixes some _mesa_problem()s in oglconform.
Reviewed-by: Brian Paul <brianp@vmware.com>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit f83756f80f509fc51030853f8aa0fef3309fe886)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index abf2f1f..dca3613 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -3071,6 +3071,8 @@ get_temp_image_type(struct gl_context *ctx, GLenum baseFormat)
switch (baseFormat) {
case GL_RGBA:
case GL_RGB:
+ case GL_RG:
+ case GL_RED:
case GL_ALPHA:
case GL_LUMINANCE:
case GL_LUMINANCE_ALPHA:
@@ -3086,7 +3088,8 @@ get_temp_image_type(struct gl_context *ctx, GLenum baseFormat)
case GL_DEPTH_STENCIL:
return GL_UNSIGNED_INT_24_8;
default:
- _mesa_problem(ctx, "Unexpected format in get_temp_image_type()");
+ _mesa_problem(ctx, "Unexpected format %d in get_temp_image_type()",
+ baseFormat);
return 0;
}
}
commit 504eaa12120c319aa990c12773f9cfe28ace0d07
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 11 15:31:30 2012 -0800
i965/gen7: Fix depth buffer rendering to tile offsets.
Previously, we were saying that everything from the starting tile to
region width+height was part of the limits of our depthbuffer, even if
the tile was near the bottom of the depthbuffer. This mean that our
range was not clipping to buffer buonds if the start tile was anything
but the start of the buffer.
In bebc91f0f3a1f2d19d36a7f1a4f7c992ace064e9, this was changed to
saying that we're just rendering to a region of the size of the
renderbuffer. This is great -- we get a range that should actually
match what we want. However, the hardware's range checking occurs
after the X/Y offset addition, so we were clipping out rendering to
small depth mip levels when an X/Y offset was present. Just add
tile_x/y to the width in that case -- the WM won't produce negative
x/y values pre-offset, so we just need to get the left/bottom sides of
the region to cover our buffer.
Fixes the following Piglit regressions on gen7:
spec/ARB_depth_buffer_float/fbo-clear-formats
spec/ARB_depth_texture/fbo-clear-formats
spec/EXT_packed_depth_stencil/fbo-clear-formats
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit e6d6a10c5a2962f93d4adcd251b9a47a4e438121)
diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
index f9652df..b6bca4b 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -376,8 +376,8 @@ static void emit_depthbuffer(struct brw_context *brw)
I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER,
offset);
OUT_BATCH((BRW_SURFACE_MIPMAPLAYOUT_BELOW << 1) |
- ((depth_irb->Base.Width - 1) << 6) |
- ((depth_irb->Base.Height - 1) << 19));
+ (((depth_irb->Base.Width + tile_x)- 1) << 6) |
+ (((depth_irb->Base.Height + tile_y) - 1) << 19));
OUT_BATCH(0);
if (intel->is_g4x || intel->gen >= 5)
diff --git a/src/mesa/drivers/dri/i965/gen7_misc_state.c b/src/mesa/drivers/dri/i965/gen7_misc_state.c
index 8a383f5..c2f58d5 100644
--- a/src/mesa/drivers/dri/i965/gen7_misc_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_misc_state.c
@@ -107,8 +107,8 @@ static void emit_depthbuffer(struct brw_context *brw)
OUT_RELOC(region->bo,
I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER,
offset);
- OUT_BATCH(((drb->Base.Width - 1) << 4) |
- ((drb->Base.Height - 1) << 18));
+ OUT_BATCH((((drb->Base.Width + tile_x) - 1) << 4) |
+ (((drb->Base.Height + tile_y) - 1) << 18));
OUT_BATCH(0);
OUT_BATCH(tile_x | (tile_y << 16));
OUT_BATCH(0);
commit 399b9799de9980b8ebc0ba46304be207b28b7825
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Nov 30 22:29:21 2011 +0000
gen6_hiz: Don't bind GL_DRAW_FRAMEBUFFER on GLES
When using Mesa with a GLES API, calling _mesa_FramebufferRenderbuffer
with GL_DRAW_FRAMEBUFFER will report a 'user error' because
get_framebuffer_target validates that this enum from the framebuffer
blit extension is only used on GL. To work around it this patch makes
it use the GL_FRAMEBUFFER enum instead in that case.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43418
Note: This is a candidate for the 8.0 branch.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit 9462b8447864c754252cd2580c9e1e4d36d5cc63)
diff --git a/src/mesa/drivers/dri/i965/gen6_hiz.c b/src/mesa/drivers/dri/i965/gen6_hiz.c
index e282511..92b1d61 100644
--- a/src/mesa/drivers/dri/i965/gen6_hiz.c
+++ b/src/mesa/drivers/dri/i965/gen6_hiz.c
@@ -109,6 +109,24 @@ static const uint32_t gen6_hiz_meta_save =
MESA_META_SELECT_FEEDBACK;
+static void
+gen6_hiz_get_framebuffer_enum(struct gl_context *ctx,
+ GLenum *bind_enum,
+ GLenum *get_enum)
+{
+ /* If the blit framebuffer extension isn't supported then Mesa will
+ report an error if we try to bind GL_DRAW_FRAMEBUFFER. However in
+ that case it should be safe to just save and restore
+ GL_FRAMEBUFFER instead. */
+ if (ctx->Extensions.EXT_framebuffer_blit && ctx->API == API_OPENGL) {
+ *bind_enum = GL_DRAW_FRAMEBUFFER;
+ *get_enum = GL_DRAW_FRAMEBUFFER_BINDING;
+ } else {
+ *bind_enum = GL_FRAMEBUFFER;
+ *get_enum = GL_FRAMEBUFFER_BINDING;
+ }
+}
+
/**
* Initialize static data needed for HiZ operations.
*/
@@ -117,10 +135,13 @@ gen6_hiz_init(struct brw_context *brw)
{
struct gl_context *ctx = &brw->intel.ctx;
struct brw_hiz_state *hiz = &brw->hiz;
+ GLenum fb_bind_enum, fb_get_enum;
if (hiz->fbo != 0)
return;
+ gen6_hiz_get_framebuffer_enum(ctx, &fb_bind_enum, &fb_get_enum);
+
/* Create depthbuffer.
*
* Until glRenderbufferStorage is called, the renderbuffer hash table
@@ -139,8 +160,8 @@ gen6_hiz_init(struct brw_context *brw)
/* Setup FBO. */
_mesa_GenFramebuffersEXT(1, &hiz->fbo);
- _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, hiz->fbo);
- _mesa_FramebufferRenderbufferEXT(GL_DRAW_FRAMEBUFFER,
+ _mesa_BindFramebufferEXT(fb_bind_enum, hiz->fbo);
+ _mesa_FramebufferRenderbufferEXT(fb_bind_enum,
GL_DEPTH_ATTACHMENT,
GL_RENDERBUFFER,
hiz->depth_rb->Name);
@@ -241,6 +262,7 @@ gen6_resolve_slice(struct intel_context *intel,
struct gl_context *ctx = &intel->ctx;
struct brw_context *brw = brw_context(ctx);
struct brw_hiz_state *hiz = &brw->hiz;
+ GLenum fb_bind_enum, fb_get_enum;
/* Do not recurse. */
assert(!brw->hiz.op);
@@ -250,11 +272,13 @@ gen6_resolve_slice(struct intel_context *intel,
assert(level <= mt->last_level);
assert(layer < mt->level[level].depth);
+ gen6_hiz_get_framebuffer_enum(ctx, &fb_bind_enum, &fb_get_enum);
+
/* Save state. */
GLint save_drawbuffer;
GLint save_renderbuffer;
_mesa_meta_begin(ctx, gen6_hiz_meta_save);
- _mesa_GetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &save_drawbuffer);
+ _mesa_GetIntegerv(fb_get_enum, &save_drawbuffer);
_mesa_GetIntegerv(GL_RENDERBUFFER_BINDING, &save_renderbuffer);
/* Initialize context data for HiZ operations. */
@@ -272,7 +296,7 @@ gen6_resolve_slice(struct intel_context *intel,
/* Setup FBO. */
gen6_hiz_setup_depth_buffer(brw, mt, level, layer);
- _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, hiz->fbo);
+ _mesa_BindFramebufferEXT(fb_bind_enum, hiz->fbo);
/* A rectangle primitive (3DPRIM_RECTLIST) consists of only three vertices.
@@ -316,7 +340,7 @@ gen6_resolve_slice(struct intel_context *intel,
*/
gen6_hiz_teardown_depth_buffer(hiz->depth_rb);
_mesa_BindRenderbufferEXT(GL_RENDERBUFFER, save_renderbuffer);
- _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, save_drawbuffer);
+ _mesa_BindFramebufferEXT(fb_bind_enum, save_drawbuffer);
_mesa_meta_end(ctx);
}
commit 2c1ee157c7e8526cd9e097ee25d63961d6aaf619
Author: Brian Paul <brianp@vmware.com>
Date: Fri Jan 13 10:54:22 2012 -0700
docs: new page describing how to build, install VMware SVGA3D guest driver
(cherry picked from commit 27915708ed4519cc5606e81fb789e8427501f355)
diff --git a/docs/contents.html b/docs/contents.html
index e3cea2a..33c2191 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -63,6 +63,7 @@ a:visited {
<LI><A HREF="extensions.html" target="MainFrame">Mesa Extensions</A>
<LI><A HREF="mangling.html" target="MainFrame">Function Name Mangling</A>
<LI><A href="llvmpipe.html" target="MainFrame">Gallium llvmpipe driver</A>
+<LI><A href="vmware-guest.html" target="MainFrame">VMware SVGA3D guest driver</a>
<LI><A href="postprocess.html" target="MainFrame">Gallium post-processing</A>
<LI><A href="viewperf.html" target="MainFrame">Viewperf Issues</A>
</ul>
diff --git a/docs/vmware-guest.html b/docs/vmware-guest.html
new file mode 100644
index 0000000..9295644
--- /dev/null
+++ b/docs/vmware-guest.html
@@ -0,0 +1,185 @@
+<html>
+
+<title>VMware guest GL driver</title>
+
+<link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<body>
+
+
+<h1>VMware guest GL driver</h1>
+
+<p>
+This page describes how to build, install and use the VMware guest GL driver
+(aka the SVGA or SVGA3D driver) for Linux using the latest source code.
+This driver gives a Linux virtual machine access to the host's GPU for
+hardware-accelerated 3D.
+VMware Workstation running on Linux or Windows and VMware Fusion running on
+MacOS are all supported.
+</p>
+
+<p>
+End users shouldn't have to go through all these steps once the driver is
+included in newer Linux distributions.
+</p>
+
+
+
+<h2>Components</h2>
+
+The components involved in this include:
+<ul>
+<li>Linux kernel module: vmwgfx
+<li>X server 2D driver: xf86-video-vmware
+<li>User-space libdrm library
+<li>Mesa/gallium OpenGL driver: "svga"
+</ul>
+
+
+<h2>Prerequisites</h2>
+
+<ul>
+<li>Kernel version at least 2.6.25
+<li>Xserver version at least 1.7
+<li>Ubuntu: For ubuntu you need to install a number of build dependencies.
+ <pre>
+ sudo apt-get install git-core
+ sudo apt-get install automake libtool libpthread-stubs0-dev
+ sudo apt-get install xserver-xorg-dev x11proto-xinerama-dev
+ sudo apt-get build-dep libgl1-mesa-dri libxcb-glx0-dev
+ </pre>
+<li>Fedora: For Fedora you also need to install a number of build dependencies.
+ <pre>
+ sudo yum install mesa-libGL-devel xorg-x11-server-devel xorg-x11-util-macros
+ sudo yum install automake gcc libtool expat-devel kernel-devel git-core
+ </pre>
+</ul>
+
+<p>
+Depending on your Linux distro, other packages may be needed.
+The configure scripts should tell you what's missing.
+</p>
+
+
Reply to: