mesa: Branch 'master'

[Dave Airlie]

 src/mesa/drivers/dri/i915tex/intel_screen.c |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree b6becfae1087f2577b489677bdd680d64a7ffb4c (from 3943d7f8b12370dd77dda66e70aa8f1fcd217f9f)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Dec 31 10:01:17 2006 +1100

    fix issue with i915tex advertising visuals it can't support
    
    This may not be the proper way to fix this but it does work easily.

diff --git a/src/mesa/drivers/dri/i915tex/intel_screen.c b/src/mesa/drivers/dri/i915tex/intel_screen.c
index 9bbfabb..efa1b01 100644
--- a/src/mesa/drivers/dri/i915tex/intel_screen.c
+++ b/src/mesa/drivers/dri/i915tex/intel_screen.c
@@ -737,6 +737,9 @@ intelFillInModes(unsigned pixel_bits, un
     */
    stencil_bits_array[0] = 0;
    stencil_bits_array[1] = 0;
+   if (depth_bits == 24)
+      stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;
+
    stencil_bits_array[2] = (stencil_bits == 0) ? 8 : stencil_bits;
 
    depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 3 : 1;