diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-18 11:02:46 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-18 11:02:46 +1100 |
| commit | 015871a0753cb984f8a93232a7e8334a24b08406 (patch) | |
| tree | c5123bee6f600fbe44f15b77321fb9f60aea5392 /src/mesa/pipe/softpipe/sp_state_derived.c | |
| parent | c5ffd8e9afd3df1d4daf189344ec8cbf8a021143 (diff) | |
| parent | 04a5a8b3bcba64c506ee5646a3a8b737e124a66a (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_state_derived.c')
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_state_derived.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c index 736ac1c33b..94072a2d30 100644 --- a/src/mesa/pipe/softpipe/sp_state_derived.c +++ b/src/mesa/pipe/softpipe/sp_state_derived.c @@ -201,16 +201,16 @@ void softpipe_update_derived( struct softpipe_context *softpipe ) calculate_vertex_layout( softpipe ); if (softpipe->dirty & (SP_NEW_SCISSOR | - SP_NEW_DEPTH_STENCIL | + SP_NEW_DEPTH_STENCIL_ALPHA | SP_NEW_FRAMEBUFFER)) compute_cliprect(softpipe); if (softpipe->dirty & (SP_NEW_BLEND | - SP_NEW_DEPTH_STENCIL | - SP_NEW_ALPHA_TEST | + SP_NEW_DEPTH_STENCIL_ALPHA | SP_NEW_FRAMEBUFFER | SP_NEW_RASTERIZER | - SP_NEW_FS)) + SP_NEW_FS | + SP_NEW_QUERY)) sp_build_quad_pipeline(softpipe); softpipe->dirty = 0; |