MesaLib: apply patch from http://patchwork.freedesktop.org/patch/18053/ to workaround vmwgfx assertion.

This commit is contained in:
Juan RP 2014-03-23 12:08:19 +01:00
parent 0d953db70b
commit 5ae0907767
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,16 @@
See http://patchwork.freedesktop.org/patch/18053/
--- src/gallium/drivers/svga/svga_resource_texture.c
+++ src/gallium/drivers/svga/svga_resource_texture.c
@@ -205,7 +205,10 @@ svga_texture_get_handle(struct pipe_screen *screen,
struct svga_winsys_screen *sws = svga_winsys_screen(texture->screen);
unsigned stride;
- assert(svga_texture(texture)->key.cachable == 0);
+ if (svga_texture(texture)->key.cachable) {
+ debug_warn_once("svga: texture->key.cachable=1");
+ }
+
svga_texture(texture)->key.cachable = 0;
stride = util_format_get_nblocksx(texture->format, texture->width0) *
util_format_get_blocksize(texture->format);

View File

@ -1,7 +1,7 @@
# Template build file for 'MesaLib'. # Template build file for 'MesaLib'.
pkgname=MesaLib pkgname=MesaLib
version=10.1.0 version=10.1.0
revision=4 revision=5
wrksrc="Mesa-${version}" wrksrc="Mesa-${version}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm