[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/libutil nvcode.py
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] gzz/gfx/libutil nvcode.py |
Date: |
Fri, 31 Jan 2003 02:54:23 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 03/01/31 02:54:23
Modified files:
gfx/libutil : nvcode.py
Log message:
alias temporaries to prevent exceeding native resources on ati
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/nvcode.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
Patches:
Index: gzz/gfx/libutil/nvcode.py
diff -u gzz/gfx/libutil/nvcode.py:1.16 gzz/gfx/libutil/nvcode.py:1.17
--- gzz/gfx/libutil/nvcode.py:1.16 Thu Jan 30 14:18:56 2003
+++ gzz/gfx/libutil/nvcode.py Fri Jan 31 02:54:23 2003
@@ -647,12 +647,13 @@
"TEXTURE3": "TEMP TEXTURE3; TXP TEXTURE3, fragment.texcoord[3],
texture[3], 2D;",
"PRIMARY_COLOR_NV": "TEMP PRIMARY_COLOR_NV; MOV PRIMARY_COLOR_NV,
fragment.color.primary;",
"SECONDARY_COLOR_NV": "TEMP SECONDARY_COLOR_NV; MOV
SECONDARY_COLOR_NV, fragment.color.secondary;",
- "FOG": "TEMP FOG; MOV FOG, state.fog.color;",
+ "FOG": "PARAM FOG = state.fog.color;",
"SPARE0_NV": "TEMP SPARE0_NV; MOV SPARE0_NV.w, TEXTURE0;",
"SPARE1_NV": "TEMP SPARE1_NV;",
"ZERO": "PARAM ZERO = 0;",
- "E_TIMES_F_NV": "TEMP E_TIMES_F_NV; MUL E_TIMES_F_NV, E, F;",
- "SPARE0_PLUS_SECONDARY_COLOR_NV": "TEMP
SPARE0_PLUS_SECONDARY_COLOR_NV; ADD SPARE0_PLUS_SECONDARY_COLOR_NV, SPARE0,
SECONDARY_COLOR_NV;"
+ "E_TIMES_F_NV": "TEMP E_TIMES_F_NV; MUL E_TIMES_F_NV,
VARIABLE_E_NV, VARIABLE_F_NV;",
+ "SPARE0_PLUS_SECONDARY_COLOR_NV": "TEMP
SPARE0_PLUS_SECONDARY_COLOR_NV; ADD SPARE0_PLUS_SECONDARY_COLOR_NV, SPARE0,
SECONDARY_COLOR_NV;",
+ "result.color.w": "",
}
self.perStageConstants = 0
@@ -753,17 +754,6 @@
self.genOutputMapping(sumOut, comp, "SUM", scale, bias);
self.code += "\n"
-
- def genFinalCombiner(self):
- self.code += """
- MAD SUM, VARIABLE_A_NV, VARIABLE_B_NV, VARIABLE_D_NV;
- TEMP invA;
- SUB invA, 1, VARIABLE_A_NV;
- MAD_SAT result.color.xyz, invA, VARIABLE_C_NV, SUM;
-
- MOV result.color.w, VARIABLE_G_NV;
- """
-
def parseCode(self, code):
out = []
lines = code.split("\n")
@@ -817,8 +807,10 @@
self.code = """!!ARBfp1.0
TEMP VARIABLE_A_NV, VARIABLE_B_NV, VARIABLE_C_NV, VARIABLE_D_NV;
- TEMP VARIABLE_E_NV, VARIABLE_F_NV, VARIABLE_G_NV;
- TEMP AB, CD, SUM;\n\n"""
+ TEMP VARIABLE_E_NV, VARIABLE_F_NV;
+ ALIAS AB = VARIABLE_A_NV;
+ ALIAS CD = VARIABLE_C_NV;
+ ALIAS SUM = AB;\n\n"""
self.initParams()
@@ -846,12 +838,16 @@
"VARIABLE_A_NV",
"VARIABLE_B_NV",
"VARIABLE_C_NV",
- "VARIABLE_D_NV",
- "VARIABLE_G_NV",):
+ "VARIABLE_D_NV",):
if vars.has_key(var):
self.genInputMapping(var, *vars[var])
- self.genFinalCombiner()
+ self.code += """
+ MAD VARIABLE_D_NV, VARIABLE_A_NV, VARIABLE_B_NV, VARIABLE_D_NV;
+ SUB VARIABLE_A_NV, 1, VARIABLE_A_NV;
+ MAD_SAT result.color.xyz, VARIABLE_A_NV, VARIABLE_C_NV, VARIABLE_D_NV;
+ """
+ self.genInputMapping("result.color.w", *vars["VARIABLE_G_NV"])
self.code += "END"
return self.code