[Gzz-commits] gzz gfx/demo/opengl/stencil.py gzz/gfx/gl/Stenc...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/10 07:52:48

Modified files:
        gfx/demo/opengl: stencil.py 
        gzz/gfx/gl     : Stencil.java 

Log message:
        Debugging; revealing a really nasty driver bug

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/stencil.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/Stencil.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/opengl/stencil.py
diff -c gzz/gfx/demo/opengl/stencil.py:1.1 gzz/gfx/demo/opengl/stencil.py:1.2
*** gzz/gfx/demo/opengl/stencil.py:1.1  Tue Sep 10 05:53:15 2002
--- gzz/gfx/demo/opengl/stencil.py      Tue Sep 10 07:52:48 2002
***************
*** 1,6 ****
--- 1,8 ----
  from __future__ import nested_scopes
  from java.lang import System
+ from java.lang import Runnable
  from java.util import Random
+ from gzz.gfx.gl import Stencil
  
  stb = GZZGL.getGLFloat("STENCIL_BITS")[0]
  print "Stencil: ",stb
***************
*** 88,105 ****
                Disable TEXTURE_2D
            """ % (t.getTexId(),) ))
  
        stencs = vs.coords.affineCoordsys(0, "STM",
!           10, 200, 200, 50*ds(), 50*ds(), 50*ds(), 50*ds())
        dcs = vs.coords.affineCoordsys(0, "D",
!           10, 200, 200, 50*ds(), 50*ds(), 50*ds(), 50*ds())
            
!       def mask():
!           vs.map.put(coloredQuad((1,1,1)), stencs)
!       def cont():
!           vs.map.put(coloredQuad((0,0,1)), dcs)
  
!       mask()
! 
!       self.drawStenciled(vs, mask, cont)
        
  currentScene = StencilScene()
--- 90,110 ----
                Disable TEXTURE_2D
            """ % (t.getTexId(),) ))
  
+       rs = 800
+       ro = 50
        stencs = vs.coords.affineCoordsys(0, "STM",
!           10, 500+ro*ds(), 500+ro*ds(), rs*ds(), rs*ds(), rs*ds(), rs*ds())
        dcs = vs.coords.affineCoordsys(0, "D",
!           10, 500+ro*ds(), 500+ro*ds(), rs*ds(), rs*ds(), rs*ds(), rs*ds())
            
!       class mask(Runnable):
!           def run(self):
!               vs.map.put(coloredQuad((1,1,1)), stencs)
!       class cont(Runnable):
!           def run(self):
!               vs.map.put(coloredQuad((0,0,1)), dcs)
  
!       # self.drawStenciled(vs, mask, cont)
!       Stencil.drawStenciled(vs, mask(), None, None, cont(), 0)
        
  currentScene = StencilScene()
Index: gzz/gzz/gfx/gl/Stencil.java
diff -c gzz/gzz/gfx/gl/Stencil.java:1.1 gzz/gzz/gfx/gl/Stencil.java:1.2
*** gzz/gzz/gfx/gl/Stencil.java:1.1     Tue Sep 10 07:39:36 2002
--- gzz/gzz/gfx/gl/Stencil.java Tue Sep 10 07:52:48 2002
***************
*** 19,24 ****
--- 19,28 ----
      private static Vob initZero;
      private static Vob exit;
  
+     static {
+       init();
+     }
+ 
      private static void init() {
        if(initStencil != null) return;
  
***************
*** 52,66 ****
  
        initContents_depth = GZZGL.createCallList(
  "    StencilFunc EQUAL 1 255\n"
            );
        initContents_nodepth = GZZGL.createCallList(
  "    StencilFunc EQUAL 1 255\n"+
  "    DepthMask 0\n"+
  "    Disable DEPTH_TEST\n"
            );
  
        initZero = GZZGL.createCallList(
! "    StencilFunc EQUAL 1 255\n"+
  "    StencilOp ZERO ZERO ZERO\n"+ // XXX
  "    StencilMask 1\n"+
  "    ColorMask 0 0 0 0\n"
--- 56,72 ----
  
        initContents_depth = GZZGL.createCallList(
  "    StencilFunc EQUAL 1 255\n"
+ "    StencilMask 0\n"
            );
        initContents_nodepth = GZZGL.createCallList(
  "    StencilFunc EQUAL 1 255\n"+
  "    DepthMask 0\n"+
+ "    StencilMask 0\n"
  "    Disable DEPTH_TEST\n"
            );
  
        initZero = GZZGL.createCallList(
! "    StencilFunc ALWAYS 1 255\n"+
  "    StencilOp ZERO ZERO ZERO\n"+ // XXX
  "    StencilMask 1\n"+
  "    ColorMask 0 0 0 0\n"