[Gzz-commits] gzz/gfx/libpaper texops_NV2X.py textures.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/10/15 08:24:26

Modified files:
        gfx/libpaper   : texops_NV2X.py textures.py 

Log message:
        HILO_OFFSET works with 2960 driver, not with 3123

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texops_NV2X.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/textures.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text

Patches:
Index: gzz/gfx/libpaper/texops_NV2X.py
diff -c gzz/gfx/libpaper/texops_NV2X.py:1.4 gzz/gfx/libpaper/texops_NV2X.py:1.5
*** gzz/gfx/libpaper/texops_NV2X.py:1.4 Tue Oct 15 08:03:48 2002
--- gzz/gfx/libpaper/texops_NV2X.py     Tue Oct 15 08:24:26 2002
***************
*** 42,47 ****
--- 42,50 ----
      ],
      [   ("T2", "DSDT"),
          ("O", "FOOBAR")
+     ],
+     [   ("T2", "DSDT_HILO"),
+         ("OH", "FOOBAR")
      ]
  ]
  
***************
*** 59,64 ****
--- 62,68 ----
      "D" : "DOT_PRODUCT_NV",
      "D2" : "DOT_PRODUCT_TEXTURE_2D_NV",
      "O" : "OFFSET_TEXTURE_2D_NV",
+     "OH" : "OFFSET_HILO_TEXTURE_2D_NV",
  }
  
  shaderTargets = {
***************
*** 67,72 ****
--- 71,77 ----
      "D": None,
      "D2": "TEXTURE_2D",
      "O": "TEXTURE_2D",
+     "OH": "TEXTURE_2D",
  }
  
  shaderTexgenTypes = {
***************
*** 75,80 ****
--- 80,86 ----
      "D" : "TexGenDotVector",
      "D2" : "TexGenDotVector",
      "O" : "TexGen2D",
+     "OH" : "TexGen2D",
  }
  
  
***************
*** 139,142 ****
  def makeNormalShaderPass(maxaniso = None):
      # XXX: TODO: implement maxaniso as in texops_STD
      #return ShaderPass(shaderTypes[3])
!     return ShaderPass(shaderTypes[4])
--- 145,148 ----
  def makeNormalShaderPass(maxaniso = None):
      # XXX: TODO: implement maxaniso as in texops_STD
      #return ShaderPass(shaderTypes[3])
!     return ShaderPass(shaderTypes[5])
Index: gzz/gfx/libpaper/textures.py
diff -c gzz/gfx/libpaper/textures.py:1.27 gzz/gfx/libpaper/textures.py:1.28
*** gzz/gfx/libpaper/textures.py:1.27   Tue Oct 15 08:03:48 2002
--- gzz/gfx/libpaper/textures.py        Tue Oct 15 08:24:26 2002
***************
*** 164,170 ****
      ptextures["DSDT"] = map(NamedTexture, [ 
          { "name" : "dsdtn",
            "args" : [512, 512, 0, 2,
!                     "DSDT_NV", "DSDT_NV",  # XXX signed
                      "noise", ["type", "normal", "freq", "10", "scale", "0.2", 
"bias", ".5"]]
            },
          ])
--- 164,178 ----
      ptextures["DSDT"] = map(NamedTexture, [ 
          { "name" : "dsdtn",
            "args" : [512, 512, 0, 2,
!                     "DSDT_NV", "DSDT_NV",
!                     "noise", ["type", "normal", "freq", "10", "scale", "0.2", 
"bias", ".5"]]
!           },
!         ])
! 
!     ptextures["DSDT_HILO"] = map(NamedTexture, [ 
!         { "name" : "dsdtn",
!           "args" : [512, 512, 0, 2,
!                     "SIGNED_HILO_NV", "HILO_NV",
                      "noise", ["type", "normal", "freq", "10", "scale", "0.2", 
"bias", ".5"]]
            },
          ])