← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mesa/lucid

« back to all changes in this revision

Viewing changes to src/gallium/drivers/softpipe/sp_quad_depth_test.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen, Timo Aaltonen, Robert Hooker
  • Date: 2010-02-19 15:52:12 UTC
  • mfrom: (3.1.10 experimental)
  • Revision ID: james.westby@ubuntu.com-20100219155212-blqov938av7m6exj
Tags: 7.7-3ubuntu1
https://launchpad.net/bugs/522048
[ Timo Aaltonen ]
* Merge from Debian experimental.

[ Robert Hooker ]
* Add 100_no_abi_tag.patch: Removes the ABI tag in /usr/lib/libGL.so.1
  which prevented ldconfig from using a libGL from another directory
  at a higher priority than the one in /usr/lib.
* Install libGL alternatives with libgl1-mesa-swx11 as well. (LP: #522048)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/drivers/softpipe/sp_quad_depth_test.c
34
34
#include "tgsi/tgsi_scan.h"
35
35
#include "sp_context.h"
36
36
#include "sp_quad.h"
37
 
#include "sp_surface.h"
38
37
#include "sp_quad_pipe.h"
39
38
#include "sp_tile_cache.h"
40
39
#include "sp_state.h"           /* for sp_fragment_shader */
667
666
   }
668
667
 
669
668
   if (qs->softpipe->framebuffer.zsbuf && 
 
669
       pf_get_component_bits(qs->softpipe->framebuffer.zsbuf->format, PIPE_FORMAT_COMP_Z) &&
670
670
       (qs->softpipe->depth_stencil->depth.enabled ||
671
671
        qs->softpipe->depth_stencil->stencil[0].enabled)) {
672
672
 
885
885
   boolean alpha = qs->softpipe->depth_stencil->alpha.enabled;
886
886
 
887
887
   boolean depth = (qs->softpipe->framebuffer.zsbuf && 
 
888
                    pf_get_component_bits(qs->softpipe->framebuffer.zsbuf->format, PIPE_FORMAT_COMP_Z) &&
888
889
                    qs->softpipe->depth_stencil->depth.enabled);
889
890
 
890
891
   unsigned depthfunc = qs->softpipe->depth_stencil->depth.func;
895
896
 
896
897
   boolean occlusion = qs->softpipe->active_query_count;
897
898
 
898
 
 
899
899
   if (!alpha &&
900
900
       !depth &&
901
901
       !stencil) {