Mesa (master): gallium/util: Save and restore vertex buffer state in util_gen_mipmap.
Marek Olšák
mareko at kemper.freedesktop.org
Wed Jul 4 01:48:45 UTC 2012
Module: Mesa
Branch: master
Commit: 95ce454c8c4397a67aa038d91667882e413314d3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=95ce454c8c4397a67aa038d91667882e413314d3
Author: Stuart Abercrombie <sabercrombie at chromium.org>
Date: Fri Jun 29 16:31:24 2012 -0700
gallium/util: Save and restore vertex buffer state in util_gen_mipmap.
Calling glGenerateMipmap could overwrite vertex buffer state, leading
to incorrect rendering or crashes depending on the Gallium driver.
This was happening on WebGL Conformance test texture-size.
Before 784dd51198433e5c299da4a7742c68d21d68d1c1 this was covered up
by redundant vertex buffer validation.
Reviewed-by: Stéphane Marchesin <marcheu at chromium.org>
Signed-off-by: Marek Olšák <maraeo at gmail.com>
---
src/gallium/auxiliary/util/u_gen_mipmap.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c
index 82474cd..2ff1af7 100644
--- a/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -1556,6 +1556,7 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
cso_save_geometry_shader(ctx->cso);
cso_save_viewport(ctx->cso);
cso_save_vertex_elements(ctx->cso);
+ cso_save_vertex_buffers(ctx->cso);
/* bind our state */
cso_set_blend(ctx->cso, &ctx->blend);
@@ -1679,4 +1680,5 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
cso_restore_viewport(ctx->cso);
cso_restore_vertex_elements(ctx->cso);
cso_restore_stream_outputs(ctx->cso);
+ cso_restore_vertex_buffers(ctx->cso);
}
More information about the mesa-commit
mailing list