[Scummvm-cvs-logs] SF.net SVN: scummvm: [22041] scummvm/trunk/graphics/scaler

[sev at users.sourceforge.net]

Revision: 22041
Author:   sev
Date:     2006-04-19 15:53:37 -0700 (Wed, 19 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22041&view=rev

Log Message:
-----------
Fix ASM HQ routines, because RGBtoYUV and LUT16to32 are on heap now.

Modified Paths:
--------------
    scummvm/trunk/graphics/scaler/hq2x_i386.asm
    scummvm/trunk/graphics/scaler/hq3x_i386.asm
Modified: scummvm/trunk/graphics/scaler/hq2x_i386.asm
===================================================================
--- scummvm/trunk/graphics/scaler/hq2x_i386.asm	2006-04-19 20:26:27 UTC (rev 22040)
+++ scummvm/trunk/graphics/scaler/hq2x_i386.asm	2006-04-19 22:53:37 UTC (rev 22041)
@@ -58,7 +58,7 @@
     mov     edx,[%1]
     cmp     edx,[%2]
     je      %%fin
-    mov     ecx,_RGBtoYUV
+    mov     ecx,[_RGBtoYUV]
     movd    mm1,[ecx+edx*4]
     movq    mm5,mm1
     mov     edx,[%2]
@@ -180,7 +180,7 @@
 %endmacro
 
 %macro Interp6 3
-    mov        ecx, _LUT16to32
+    mov        ecx, [_LUT16to32]
     movd       mm1, [ecx+eax*4]
     mov        edx, %2
     movd       mm2, [ecx+edx*4]
@@ -204,7 +204,7 @@
 %endmacro
 
 %macro Interp7 3
-    mov        ecx, _LUT16to32
+    mov        ecx, [_LUT16to32]
     movd       mm1, [ecx+eax*4]
     mov        edx, %2
     movd       mm2, [ecx+edx*4]
@@ -227,7 +227,7 @@
 %endmacro
 
 %macro Interp9 3
-    mov        ecx, _LUT16to32
+    mov        ecx, [_LUT16to32]
     movd       mm1, [ecx+eax*4]
     mov        edx, %2
     movd       mm2, [ecx+edx*4]
@@ -251,7 +251,7 @@
 %endmacro
 
 %macro Interp10 3
-    mov        ecx, _LUT16to32
+    mov        ecx, [_LUT16to32]
     movd       mm1, [ecx+eax*4]
     mov        edx, %2
     movd       mm2, [ecx+edx*4]
@@ -530,7 +530,7 @@
     movzx   edx,ax  
     mov     [w9],edx
 .flags
-    mov     ebx,_RGBtoYUV
+    mov     ebx,[_RGBtoYUV]
     mov     eax,[w5]
     xor     ecx,ecx
     movd    mm5,[ebx+eax*4]

Modified: scummvm/trunk/graphics/scaler/hq3x_i386.asm
===================================================================
--- scummvm/trunk/graphics/scaler/hq3x_i386.asm	2006-04-19 20:26:27 UTC (rev 22040)
+++ scummvm/trunk/graphics/scaler/hq3x_i386.asm	2006-04-19 22:53:37 UTC (rev 22041)
@@ -55,7 +55,7 @@
     mov     edx,[%1]
     cmp     edx,[%2]
     je      %%fin
-    mov     ecx,_RGBtoYUV
+    mov     ecx,[_RGBtoYUV]
     movd    mm1,[ecx+edx*4]
     movq    mm5,mm1
     mov     edx,[%2]
@@ -164,7 +164,7 @@
 %endmacro
 
 %macro Interp3 2
-    mov        ecx, _LUT16to32
+    mov        ecx, [_LUT16to32]
     movd       mm1, [ecx+eax*4]
     mov        edx, %2
     movd       mm2, [ecx+edx*4]
@@ -183,7 +183,7 @@
 %endmacro
 
 %macro Interp4 3
-    mov        ecx, _LUT16to32
+    mov        ecx, [_LUT16to32]
     movd       mm1, [ecx+eax*4]
     mov        edx, %2
     movd       mm2, [ecx+edx*4]
@@ -468,7 +468,7 @@
     movzx   edx,ax  
     mov     [w9],edx
 .flags
-    mov     ebx,_RGBtoYUV
+    mov     ebx,[_RGBtoYUV]
     mov     eax,[w5]
     xor     ecx,ecx
     movd    mm5,[ebx+eax*4]


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