Module: Mesa
Branch: master
Commit: cff0eac702e0070d4d7f0e2ae5f785ec10597d4d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cff0eac702e0070d4d7f0e2ae5f785ec10597d4d
Author: Zack Rusin <za...@vmware.com>
Date: Tue Jan 31 23:12:22 2012 -0500
svga: fix a crash happening before setting fragment shaders.
In certain situations API's will call pipe->clear which doesn't
require fragment shader, but then we'd try to verify the pipeline
and assume fragment shader was always set. This was leading to
crash when API would just call simple clear's before anything else.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfons...@vmware.com>
---
src/gallium/drivers/svga/svga_state_need_swtnl.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/gallium/drivers/svga/svga_state_need_swtnl.c
b/src/gallium/drivers/svga/svga_state_need_swtnl.c
index 8c39a4b..32355d1 100644
--- a/src/gallium/drivers/svga/svga_state_need_swtnl.c
+++ b/src/gallium/drivers/svga/svga_state_need_swtnl.c
@@ -145,7 +145,8 @@ update_need_pipeline( struct svga_context *svga,
*/
if (svga->curr.reduced_prim == PIPE_PRIM_POINTS) {
unsigned sprite_coord_gen = svga->curr.rast->templ.sprite_coord_enable;
- unsigned generic_inputs = svga->curr.fs->generic_inputs;
+ unsigned generic_inputs =
+ svga->curr.fs ? svga->curr.fs->generic_inputs : 0;
if (sprite_coord_gen &&
(generic_inputs & ~sprite_coord_gen)) {
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
