mesa: Changes to 'upstream-experimental'
Rebased ref, commits from common ancestor:
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>
+
+
+
+<h2>Getting the Latest Source Code</h2>
+
+Begin by saving your current directory location:
+ <pre>
+ export TOP=$PWD
+ </pre>
+
+<ul>
+<li>Mesa/Gallium master branch. This code is used to build libGL, and the direct rendering svga driver for libGL, vmwgfx_dri.so, and the X acceleration library libxatracker.so.x.x.x.
+ <pre>
+ git clone git://anongit.freedesktop.org/git/mesa/mesa
+ </pre>
+<li>VMware Linux guest kernel module. Note that this repo contains the complete DRM and TTM code. The vmware-specific driver is really only the files prefixed with vmwgfx.
+ <pre>
+ git clone git://anongit.freedesktop.org/git/mesa/vmwgfx
+ </pre>
+
+<li>libdrm, A user-space library that interfaces with drm. Most distros ship with this driver. Safest bet is really to replace the system one. Optionally you can point LIBDRM_CFLAGS and LIBDRM_LIBS to the libdrm-2.4.22 package in toolchain. But here, we replace:
+ <pre>
+ git clone git://anongit.freedesktop.org/git/mesa/drm
+ </pre>
+<li>xf86-video-vmware. The chainloading driver, vmware_drv.so, the legacy driver vmwlegacy_drv.so, and the vmwgfx driver vmwgfx_drv.so.
+ <pre>
+ git clone git://anongit.freedesktop.org/git/xorg/driver/xf86-video-vmware
+ </pre>
+</ul>
+
+
+<h2>Building the Code</h2>
+
+<ul>
+<li>Build libdrm: If you're on a 32-bit system, you should skip the --libdir configure option. Note also the comment about toolchain libdrm above.
+ <pre>
+ cd $TOP/drm
+ ./autogen.sh --prefix=/usr --enable-vmwgfx-experimental-api --libdir=/usr/lib64
+ make
+ sudo make install
+ </pre>
+<li>Build Mesa and the vmwgfx_dri.so driver, the vmwgfx_drv.so xorg driver, the X acceleration library libxatracker.
+The vmwgfx_dri.so is used by the OpenGL libraries during direct rendering,
+and by the Xorg server during accelerated indirect GL rendering.
+The libxatracker library is used exclusively by the X server to do render,
+copy and video acceleration:
+<br>
+The following configure options doesn't build the EGL system.
+<br>
+As before, if you're on a 32-bit system, you should skip the --libdir
+configure option.
+ <pre>
+ cd $TOP/mesa
+ ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --with-gallium-drivers=svga --with-dri-drivers= --enable-xa
+ make
+ sudo make install
+ </pre>
+
+Note that you may have to install other packages that Mesa depends upon
+if they're not installed in your system. You should be told what's missing.
+<br>
+<br>
+
+<li>xf86-video-vmware: Now, once libxatracker is installed, we proceed with building and replacing the current Xorg driver. First check if your system is 32- or 64-bit. If you're building for a 32-bit system, you will not be needing the --libdir=/usr/lib64 option to autogen.
+ <pre>
+ cd $TOP/xf86-video-vmware
+ ./autogen.sh --prefix=/usr --libdir=/usr/lib64
+ make
+ sudo make install
+ </pre>
+<li>vmwgfx kernel module. First make sure that any old version of this kernel module is removed from the system by issuing
+ <pre>
+ sudo rm /lib/modules/`uname -r`/kernel/drivers/gpu/drm/vmwgfx.ko*
+ </pre>
+Then
+ <pre>
+ cd $TOP/vmwgfx
+ make
+ sudo make install
+ sudo cp 00-vmwgfx.rules /etc/udev/rules.d
+ sudo depmod -ae
+ </pre>
+</ul>
+
+
+Now try to load the kernel module by issuing
+ <pre>
+ sudo modprobe vmwgfx</pre>
+Then type
+ <pre>
+ dmesg</pre>
+to watch the debug output. It should contain a number of lines prefixed with "[vmwgfx]".
+
+<p>
+Then restart the Xserver (or reboot).
+The lines starting with "vmwlegacy" or "VMWARE" in the file /var/log/Xorg.0.log
+should now have been replaced with lines starting with "vmwgfx", indicating that
+the new Xorg driver is in use.
+</p>
+
+
+<h2>Running OpenGL Programs</h2>
+
+<p>
+In a shell, run 'glxinfo' and look for the following to verify that the
+driver is working:
+</p>
+
+<pre>
+OpenGL vendor string: VMware, Inc.
+OpenGL renderer string: Gallium 0.4 on SVGA3D; build: RELEASE;
+OpenGL version string: 2.1 Mesa 8.0
+</pre>
+
+If you don't see this, try setting this environment variable:
+ <pre>
+ export LIBGL_DEBUG=verbose</pre>
+then rerun glxinfo and examine the output for error messages.
+</p>
+
+
+
+</body>
+</html>
commit 8b7f6de8b9b8797d88449e5329c65b11f6249b12
Author: Brian Paul <brianp@vmware.com>
Date: Fri Jan 13 09:41:35 2012 -0700
mesa: s/GLushort/GLubyte/ in pack_ubyte_AL44()
The AL44 format occupies one byte, not two.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
(cherry picked from commit b0af16abf1153da243b856e55f59ca1945860f47)
diff --git a/src/mesa/main/format_pack.c b/src/mesa/main/format_pack.c
index 0982c9a..85b2c69 100644
--- a/src/mesa/main/format_pack.c
+++ b/src/mesa/main/format_pack.c
@@ -636,7 +636,7 @@ pack_float_ARGB1555_REV(const GLfloat src[4], void *dst)
static void
pack_ubyte_AL44(const GLubyte src[4], void *dst)
{
- GLushort *d = ((GLushort *) dst);
+ GLubyte *d = ((GLubyte *) dst);
*d = PACK_COLOR_44(src[ACOMP], src[RCOMP]);
}
commit eb8063361ee74ca3d551950bfc5ffe6615ab06aa
Author: Brian Paul <brianp@vmware.com>
Date: Fri Jan 13 08:31:26 2012 -0700
osmesa: fix renderbuffer format selection
The gl_renderbuffer::Format field wasn't always set properly. This
didn't matter much in the past but with the recent swrast/renderbuffer
mapping changes, core Mesa will be directly touching OSMesa colorbuffers
so using the right MESA_FORMAT_x value is important.
Unfortunately, there aren't MESA_FORMATs for all the possible OSmesa
format/type combinations, such as GL_FLOAT / OSMESA_ARGB. If anyone
runs into these we can add new Mesa formats.
v2: add warnings for unsupported formats, fix ARGB_REV mix-up.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
(cherry picked from commit 540a8b2cfdedbf5a635f33c720aa795fae74e08b)
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 67d329f..3d5ff8a 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -723,9 +723,8 @@ osmesa_choose_line( struct gl_context *ctx )
static void
compute_row_addresses( OSMesaContext osmesa )
{
- GLint bytesPerPixel, bytesPerRow, i;
+ GLint bytesPerRow, i;
GLubyte *origin = (GLubyte *) osmesa->rb->Data;
- GLint bpc; /* bytes per channel */
GLint rowlength; /* in pixels */
GLint height = osmesa->rb->Height;
@@ -734,32 +733,7 @@ compute_row_addresses( OSMesaContext osmesa )
else
rowlength = osmesa->rb->Width;
- if (osmesa->rb->DataType == GL_UNSIGNED_BYTE)
- bpc = 1;
- else if (osmesa->rb->DataType == GL_UNSIGNED_SHORT)
- bpc = 2;
- else if (osmesa->rb->DataType == GL_FLOAT)
- bpc = 4;
- else {
- _mesa_problem(&osmesa->mesa,
- "Unexpected datatype in osmesa::compute_row_addresses");
- return;
- }
-
- if ((osmesa->format == OSMESA_RGB) || (osmesa->format == OSMESA_BGR)) {
- /* RGB mode */
- bytesPerPixel = 3 * bpc;
- }
- else if (osmesa->format == OSMESA_RGB_565) {
- /* 5/6/5 RGB pixel in 16 bits */
- bytesPerPixel = 2;
- }
- else {
- /* RGBA mode */
- bytesPerPixel = 4 * bpc;
- }
-
- bytesPerRow = rowlength * bytesPerPixel;
+ bytesPerRow = rowlength * _mesa_get_format_bytes(osmesa->rb->Format);
if (osmesa->yup) {
/* Y=0 is bottom line of window */
@@ -802,20 +776,33 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
/* Note: we can ignoring internalFormat for "window-system" renderbuffers */
(void) internalFormat;
+ /* Given the user-provided format and type, figure out which MESA_FORMAT_x
+ * to use.
+ * XXX There aren't Mesa formats for all the possible combinations here!
+ * XXX Specifically, there's only RGBA-order 16-bit/channel and float
+ * XXX formats.
+ * XXX The 8-bit/channel formats should all be OK.
+ */
if (osmesa->format == OSMESA_RGBA) {
if (rb->DataType == GL_UNSIGNED_BYTE) {
+ if (_mesa_little_endian())
+ rb->Format = MESA_FORMAT_RGBA8888_REV;
+ else
+ rb->Format = MESA_FORMAT_RGBA8888;
rb->GetRow = get_row_RGBA8;
rb->GetValues = get_values_RGBA8;
rb->PutRow = put_row_RGBA8;
rb->PutValues = put_values_RGBA8;
}
else if (rb->DataType == GL_UNSIGNED_SHORT) {
+ rb->Format = MESA_FORMAT_RGBA_16;
rb->GetRow = get_row_RGBA16;
rb->GetValues = get_values_RGBA16;
rb->PutRow = put_row_RGBA16;
rb->PutValues = put_values_RGBA16;
}
else {
+ rb->Format = MESA_FORMAT_RGBA_FLOAT32;
rb->GetRow = get_row_RGBA32;
rb->GetValues = get_values_RGBA32;
rb->PutRow = put_row_RGBA32;
@@ -824,18 +811,26 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
}
else if (osmesa->format == OSMESA_BGRA) {
if (rb->DataType == GL_UNSIGNED_BYTE) {
+ if (_mesa_little_endian())
+ rb->Format = MESA_FORMAT_ARGB8888;
+ else
+ rb->Format = MESA_FORMAT_ARGB8888_REV;
rb->GetRow = get_row_BGRA8;
rb->GetValues = get_values_BGRA8;
rb->PutRow = put_row_BGRA8;
rb->PutValues = put_values_BGRA8;
}
else if (rb->DataType == GL_UNSIGNED_SHORT) {
+ _mesa_warning(ctx, "Unsupported OSMesa format BGRA/GLushort");
+ rb->Format = MESA_FORMAT_RGBA_16; /* not exactly right */
rb->GetRow = get_row_BGRA16;
rb->GetValues = get_values_BGRA16;
rb->PutRow = put_row_BGRA16;
rb->PutValues = put_values_BGRA16;
}
else {
+ _mesa_warning(ctx, "Unsupported OSMesa format BGRA/GLfloat");
+ rb->Format = MESA_FORMAT_RGBA_FLOAT32; /* not exactly right */
rb->GetRow = get_row_BGRA32;
rb->GetValues = get_values_BGRA32;
rb->PutRow = put_row_BGRA32;
@@ -844,18 +839,26 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
}
else if (osmesa->format == OSMESA_ARGB) {
if (rb->DataType == GL_UNSIGNED_BYTE) {
+ if (_mesa_little_endian())
+ rb->Format = MESA_FORMAT_ARGB8888_REV;
+ else
+ rb->Format = MESA_FORMAT_ARGB8888;
rb->GetRow = get_row_ARGB8;
rb->GetValues = get_values_ARGB8;
rb->PutRow = put_row_ARGB8;
rb->PutValues = put_values_ARGB8;
}
else if (rb->DataType == GL_UNSIGNED_SHORT) {
+ _mesa_warning(ctx, "Unsupported OSMesa format ARGB/GLushort");
+ rb->Format = MESA_FORMAT_RGBA_16; /* not exactly right */
rb->GetRow = get_row_ARGB16;
rb->GetValues = get_values_ARGB16;
rb->PutRow = put_row_ARGB16;
rb->PutValues = put_values_ARGB16;
}
else {
+ _mesa_warning(ctx, "Unsupported OSMesa format ARGB/GLfloat");
+ rb->Format = MESA_FORMAT_RGBA_FLOAT32; /* not exactly right */
rb->GetRow = get_row_ARGB32;
rb->GetValues = get_values_ARGB32;
rb->PutRow = put_row_ARGB32;
@@ -864,18 +867,23 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
}
else if (osmesa->format == OSMESA_RGB) {
if (rb->DataType == GL_UNSIGNED_BYTE) {
+ rb->Format = MESA_FORMAT_RGB888;
rb->GetRow = get_row_RGB8;
rb->GetValues = get_values_RGB8;
rb->PutRow = put_row_RGB8;
rb->PutValues = put_values_RGB8;
}
else if (rb->DataType == GL_UNSIGNED_SHORT) {
+ _mesa_warning(ctx, "Unsupported OSMesa format RGB/GLushort");
+ rb->Format = MESA_FORMAT_RGBA_16; /* not exactly right */
rb->GetRow = get_row_RGB16;
rb->GetValues = get_values_RGB16;
rb->PutRow = put_row_RGB16;
rb->PutValues = put_values_RGB16;
}
else {
+ _mesa_warning(ctx, "Unsupported OSMesa format RGB/GLfloat");
+ rb->Format = MESA_FORMAT_RGBA_FLOAT32; /* not exactly right */
rb->GetRow = get_row_RGB32;
rb->GetValues = get_values_RGB32;
rb->PutRow = put_row_RGB32;
@@ -884,18 +892,23 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
}
else if (osmesa->format == OSMESA_BGR) {
if (rb->DataType == GL_UNSIGNED_BYTE) {
+ rb->Format = MESA_FORMAT_BGR888;
rb->GetRow = get_row_BGR8;
rb->GetValues = get_values_BGR8;
rb->PutRow = put_row_BGR8;
rb->PutValues = put_values_BGR8;
}
else if (rb->DataType == GL_UNSIGNED_SHORT) {
+ _mesa_warning(ctx, "Unsupported OSMesa format BGR/GLushort");
+ rb->Format = MESA_FORMAT_RGBA_16; /* not exactly right */
rb->GetRow = get_row_BGR16;
rb->GetValues = get_values_BGR16;
rb->PutRow = put_row_BGR16;
rb->PutValues = put_values_BGR16;
}
else {
+ _mesa_warning(ctx, "Unsupported OSMesa format BGR/GLfloat");
+ rb->Format = MESA_FORMAT_RGBA_FLOAT32; /* not exactly right */
rb->GetRow = get_row_BGR32;
rb->GetValues = get_values_BGR32;
rb->PutRow = put_row_BGR32;
@@ -904,6 +917,7 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
}
else if (osmesa->format == OSMESA_RGB_565) {
ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
+ rb->Format = MESA_FORMAT_RGB565;
rb->GetRow = get_row_RGB_565;
rb->GetValues = get_values_RGB_565;
rb->PutRow = put_row_RGB_565;
@@ -937,24 +951,6 @@ new_osmesa_renderbuffer(struct gl_context *ctx, GLenum format, GLenum type)
rb->ClassID = OSMESA_RENDERBUFFER_CLASS;
rb->InternalFormat = GL_RGBA;
- switch (type) {
- case GL_UNSIGNED_BYTE:
- rb->Format = MESA_FORMAT_RGBA8888_REV;
- break;
- case GL_UNSIGNED_SHORT:
- rb->Format = MESA_FORMAT_RGBA_16;
- break;
- case GL_UNSIGNED_SHORT_5_6_5:
- rb->Format = MESA_FORMAT_RGB565;
- type = GL_UNSIGNED_BYTE;
- break;
- case GL_FLOAT:
- rb->Format = MESA_FORMAT_RGBA_FLOAT32;
- break;
- default:
- assert(0 && "Unexpected type in new_osmesa_renderbuffer()");
- rb->Format = MESA_FORMAT_RGBA8888;
- }
rb->_BaseFormat = GL_RGBA;
rb->DataType = type;
}
commit b26682e12e38325b37ddfe7de8f705f29390c584
Author: Brian Paul <brianp@vmware.com>
Date: Fri Jan 13 08:31:26 2012 -0700
docs: freshen up the introduction page with Mesa 8.0 info, etc
(cherry picked from commit 0c14bbbc8634f516d75a06e2a52d11d674e41170)
diff --git a/docs/intro.html b/docs/intro.html
index 0806caf..303f5eb 100644
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -132,12 +132,26 @@ June 2007: Mesa 7.0 is released, implementing the OpenGL 2.1 specification
and OpenGL Shading Language.
</p>
+<p>
+2008: Keith Whitwell and other Tungsten Graphics employees develop
+<a href="http://en.wikipedia.org/wiki/Gallium3D"; target="_parent">Gallium</a>
+- a new GPU abstraction layer. The latest Mesa drivers are based on
+Gallium and other APIs such as OpenVG are implemented on top of Gallium.
+</p>
+
+<p>
+February 2012: Mesa 8.0 is released, implementing the OpenGL 3.0 specification
+and version 1.30 of the OpenGL Shading Language.
+</p>
<p>
-Ongoing: Mesa is used as the core of many hardware OpenGL drivers for
-the XFree86 and X.org X servers within the
-<A href="http://dri.freedesktop.org/"; target="_parent">DRI project</A>.
-I continue to enhance Mesa with new extensions and features.
+Ongoing: Mesa is the OpenGL implementation for several types of hardware
+made by Intel, AMD and NVIDIA, plus the VMware virtual GPU.
+There's also several software-based renderers: swrast (the legacy
+Mesa rasterizer), softpipe (a gallium reference driver) and llvmpipe
+(LLVM/JIT-based high-speed rasterizer).
+Work continues on the drivers and core Mesa to implement newer versions
+of the OpenGL specification.
</p>
@@ -151,6 +165,15 @@ of the OpenGL specification is implemented.
</p>
+<H2>Version 8.x features</H2>
+<p>
+Version 8.x of Mesa implements the OpenGL 3.0 API.
+The developers at Intel deserve a lot of credit for implementing most
+of the OpenGL 3.0 features in core Mesa, the GLSL compiler as well as
+the i965 driver.
+</p>
+
+
<H2>Version 7.x features</H2>
<p>
Version 7.x of Mesa implements the OpenGL 2.1 API. The main feature
commit deff0244edd6b822aea30b37955723012d69ca16
Author: Brian Paul <brianp@vmware.com>
Date: Thu Jan 12 11:52:22 2012 -0700
osmesa: fix glReadPixels, etc
Needed to implement the Map/UnmapRenderbuffer() driver hooks.
This fixes glRead/Draw/CopyPixels, etc.
See https://bugs.freedesktop.org/show_bug.cgi?id=44723
Note: This is a candidate for the 8.0 branch.
Tested-by: Kevin Hobbs <hobbsk@ohiou.edu>
(cherry picked from commit cb254b75d7d971b3f1baab45a82cedf0bd6c36c4)
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index acfe629..67d329f 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -56,6 +56,8 @@
#include "vbo/vbo.h"
+#define OSMESA_RENDERBUFFER_CLASS 0x053
+
/**
* OSMesa rendering context, derived from core Mesa struct gl_context.
@@ -932,11 +934,12 @@ new_osmesa_renderbuffer(struct gl_context *ctx, GLenum format, GLenum type)
rb->RefCount = 1;
rb->Delete = osmesa_delete_renderbuffer;
rb->AllocStorage = osmesa_renderbuffer_storage;
+ rb->ClassID = OSMESA_RENDERBUFFER_CLASS;
rb->InternalFormat = GL_RGBA;
switch (type) {
case GL_UNSIGNED_BYTE:
- rb->Format = MESA_FORMAT_RGBA8888;
+ rb->Format = MESA_FORMAT_RGBA8888_REV;
break;
case GL_UNSIGNED_SHORT:
rb->Format = MESA_FORMAT_RGBA_16;
@@ -959,6 +962,56 @@ new_osmesa_renderbuffer(struct gl_context *ctx, GLenum format, GLenum type)
}
+
+static void
+osmesa_MapRenderbuffer(struct gl_context *ctx,
+ struct gl_renderbuffer *rb,
+ GLuint x, GLuint y, GLuint w, GLuint h,
+ GLbitfield mode,
+ GLubyte **mapOut, GLint *rowStrideOut)
+{
Reply to: