[openMSX-commits] SF.net SVN: openmsx:[10895] openmsx/trunk/src/video

[<mth...@us...>]

Revision: 10895
          http://openmsx.svn.sourceforge.net/openmsx/?rev=10895&view=rev
Author:   mthuurne
Date:     2009-12-06 11:21:57 +0000 (Sun, 06 Dec 2009)

Log Message:
-----------
In genSwitch(), apply the permutation to all cases first instead of permuting individual cases. This is more consistent with the binary data generation functions.

Modified Paths:
--------------
    openmsx/trunk/src/video/hq2.py
    openmsx/trunk/src/video/hq3.py

Modified: openmsx/trunk/src/video/hq2.py
===================================================================
--- openmsx/trunk/src/video/hq2.py	2009-12-06 11:11:53 UTC (rev 10894)
+++ openmsx/trunk/src/video/hq2.py	2009-12-06 11:21:57 UTC (rev 10895)
@@ -3,7 +3,7 @@
 from hqcommon import (
 	blendWeights, computeLiteWeightCells, computeNeighbours, computeOffsets,
 	computeWeights, computeWeightCells, makeLite as commonMakeLite,
-	permuteCase, permuteCases, printSubExpr, printText,
+	permuteCases, printSubExpr, printText,
 	transformOffsets, transformWeights, writeBinaryFile, writeTextFile
 	)
 
@@ -14,10 +14,8 @@
 def genSwitch(pixelExpr, narrow):
 	permutation = (2, 9, 7, 4, 3, 10, 11, 1, 8, 0, 6, 5)
 	exprToCases = defaultdict(list)
-	for case, expr in enumerate(pixelExpr):
-		exprToCases[tuple(tuple(subExpr) for subExpr in expr)].append(
-			permuteCase(permutation, case)
-			)
+	for case, expr in enumerate(permuteCases(permutation, pixelExpr)):
+		exprToCases[tuple(tuple(subExpr) for subExpr in expr)].append(case)
 	#print exprToCases
 	yield 'switch (pattern) {\n'
 	for cases, expr in sorted(

Modified: openmsx/trunk/src/video/hq3.py
===================================================================
--- openmsx/trunk/src/video/hq3.py	2009-12-06 11:11:53 UTC (rev 10894)
+++ openmsx/trunk/src/video/hq3.py	2009-12-06 11:21:57 UTC (rev 10895)
@@ -3,7 +3,7 @@
 from hqcommon import (
 	blendWeights, computeLiteWeightCells, computeNeighbours, computeOffsets,
 	computeWeights, computeWeightCells, makeLite as commonMakeLite,
-	permuteCase, permuteCases, printSubExpr, printText,
+	permuteCases, printSubExpr, printText,
 	transformOffsets, transformWeights, writeBinaryFile, writeTextFile
 	)
 
@@ -140,10 +140,8 @@
 def genSwitch(pixelExpr):
 	permutation = (2, 9, 7, 4, 3, 10, 11, 1, 8, 0, 6, 5)
 	exprToCases = defaultdict(list)
-	for case, expr in enumerate(pixelExpr):
-		exprToCases[tuple(tuple(subExpr) for subExpr in expr)].append(
-			permuteCase(permutation, case)
-			)
+	for case, expr in enumerate(permuteCases(permutation, pixelExpr)):
+		exprToCases[tuple(tuple(subExpr) for subExpr in expr)].append(case)
 	yield 'switch (pattern) {\n'
 	for cases, expr in sorted(
 		( sorted(cases), expr )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.