Removed some old code

zsnes/src/linux/sdllink.c

@@ -128,8 +128,6 @@ void UpdateSound(void *userdata, Uint8 * stream, int len);
 extern int GUI36hzcall(void);
 extern int Game60hzcall(void);
 extern void SoundProcess();
-void *blur_temp=0;
-void *blur_buffer=0;
 _int64 copymaskRB = 0x001FF800001FF800LL;
 _int64 copymaskG = 0x0000FC000000FC00LL;
 _int64 copymagic = 0x0008010000080100LL;

zsnes/src/video/sw_draw.asm

@@ -134,142 +134,7 @@ NEWSYM DrawWin256x224x16
         popad
         ret
 
-EXTSYM copymaskRB,copymaskG,copymagic
+EXTSYM copymaskRB,copymaskG,copymagic,coef
-EXTSYM blur_buffer,blur_temp,coef,GUIOn,newengen,SpecialLine,HalfTransB,HalfTransC
-
-NEWSYM DrawWin256x224x16MB
-        pushad
-        mov  ax,ds
-        mov  es,ax
-        xor  eax,eax
-        mov  esi, [ScreenPtr]
-        mov  edi, [blur_temp]
-        or   edi,edi
-        jnz .blur_it
-        mov  edi, [SurfBufD]
-.blur_it:
-        movsx edx, word[resolutn]
-        sub  edx,2
-        cmp  byte[GUIOn],1
-        je  .Copying3
-        cmp  byte[newengen],0
-        jne .Copying3_hi
-.Copying3:
-        mov  ecx,32
-        mov  ebx, [pitch]
-        sub  ebx,512
-.CopyLoop:
-        movq mm0, [esi]
-        movq mm1, [esi+8]
-        movq [edi],mm0
-        movq [edi+8],mm1
-        add  esi,16
-        add  edi,16
-        dec  ecx
-        jnz .CopyLoop
-        inc  eax            
-        sub  edi,ebx
-        add  esi,64
-        cmp  eax,edx
-        jne .Copying3
-        jmp .Copying3_done
-.Copying3_hi:
-        lea  eax, [eax+2]
-        mov  ebx, [SpecialLine]
-        mov  edx, [pitch]
-        sub  edx,512
-.Copying3_hi_setup:
-        mov  ecx,32
-        cmp byte[ebx],0
-        ja .Copy_hi_av
-.CopyLoop_hi:
-        movq mm0, [esi]
-        movq mm1, [esi+8]
-        movq [edi],mm0
-        movq [edi+8],mm1
-        add  esi,16
-        add  edi,16
-        dec  ecx
-        jnz .CopyLoop_hi
-        jmp .Copying3_hi_end
-.Copy_hi_av:
-        movq mm4, [HalfTransC]
-.CopyLoop_hi_av:
-        movq mm0, [esi]
-        movq mm1, [esi+8]
-        movq mm2, [esi+75036*4]
-        movq mm3, [esi+75036*4+8]
-        pand mm0,mm4
-        pand mm1,mm4
-        pand mm2,mm4
-        pand mm3,mm4
-        psrlw mm0, 1
-        psrlw mm1, 1
-        psrlw mm2, 1
-        psrlw mm3, 1
-        paddw mm0,mm2
-        paddw mm1,mm3
-        movq [edi],mm0
-        movq [edi+8],mm1
-        add  esi,16
-        add  edi,16
-        dec  ecx
-        jnz .CopyLoop_hi_av
-.Copying3_hi_end:
-        inc  eax
-        inc  ebx
-        add  edi,edx
-        add  esi,64
-        cmp  ax,239
-        jne .Copying3_hi_setup
-.Copying3_done:
-        xor  eax,eax
-        mov  ecx,128
-        rep  stosd
-        mov  esi, [blur_buffer]
-        or   esi,esi
-        jz   near .no_blur
-        mov  edi, [SurfBufD]
-        mov  ebx, [blur_temp]
-        add  esi,256*240*2
-        add  edi,256*240*2
-        add  ebx,256*240*2
-        mov  ecx,-(256*60)
-        movq mm4, [HalfTransC]
-        movq mm5, [HalfTransB]
-.blur_loop:
-        movq mm0, [esi+ecx*8]
-        movq mm1, [ebx+ecx*8]
-        movq mm2,mm0
-        movq mm3,mm0
-        pand mm0,mm4
-        pand mm2,mm5
-        psrlw mm0,1
-        paddw mm0,mm2
-        movq mm2,mm0
-        pand mm0,mm4
-        pand mm2,mm5
-        psrlw mm0,1
-        paddw mm0,mm2
-        psubw mm3,mm0
-        movq mm0,mm1
-        pand mm0,mm4
-        pand mm1,mm5
-        psrlw mm0,1
-        paddw mm0,mm1
-        movq mm1,mm0
-        pand mm0,mm4
-        pand mm1,mm5
-        psrlw mm0,1
-        paddw mm0,mm1
-        paddw mm0,mm3
-        movq [esi+ecx*8],mm0
-        movq [esi+ecx*8],mm0
-        inc  ecx
-        jnz .blur_loop
-.no_blur:
-        emms
-        ret
 
 NEWSYM DrawWin256x224x32
         pushad
@@ -319,101 +184,6 @@ NEWSYM DrawWin256x224x32
         emms
         ret
 
-NEWSYM DrawWin256x224x32MB
-        pushad
-        mov  ax,ds
-        mov  es,ax
-        xor  eax,eax
-        mov  esi,[ScreenPtr]
-        mov  edi,[blur_temp]
-        or   edi,edi
-        jnz .blur_it2
-        mov  edi,[SurfBufD]
-.blur_it2:
-        movq mm4, [copymaskRB]
-        movq mm5, [copymaskG]
-        movq mm6, [copymagic]
-.Copying32b:
-        mov  ecx,64 ;256
-.CopyLoop32b:
-        movq mm0,[esi]
-        movq mm1,mm0
-        punpcklwd mm0,mm0
-        movq mm2,mm0
-        pand mm0,mm4
-        pmaddwd mm0,mm6
-        punpckhwd mm1,mm1
-        movq mm3,mm1
-        pand mm1,mm4
-        pmaddwd mm1,mm6
-        pslld mm2,5
-        pslld mm3,5
-        pand mm2,mm5
-        pand mm3,mm5
-        por  mm0,mm2
-        add  esi, 8
-        por  mm1,mm3
-        movq [edi],mm0
-        movq [edi+8],mm1
-        add  edi,16
-        dec  ecx
-        jnz .CopyLoop32b
-        inc  eax
-        add  edi, [pitch]
-        sub  edi,1024
-        sub  esi,512
-        add  esi,576
-        cmp  eax,239
-        jne .Copying32b
-        mov  esi, [blur_buffer]
-        or   esi,esi
-        jz   near .no_blur2
-        mov  edi,[SurfBufD]
-        mov  ebx,[blur_temp]
-        add  esi,256*240*4
-        add  edi,256*240*4
-        add  ebx,256*240*4
-        mov  ecx,-(256*240)
-        movq mm5, [coef]
-        pxor mm6,mm6
-.blur_loop2:
-        movq mm0, [esi+ecx*4]
-        movq mm1, mm0
-        movq mm3, [ebx+ecx*4]
-        movq mm4, mm3
-        punpcklbw mm0,mm6
-        punpckhbw mm1,mm6
-        punpcklbw mm3,mm6
-        punpckhbw mm4,mm6
-        movq mm2, mm3
-        movq mm3, mm0
-        punpcklwd mm0,mm2
-        punpckhwd mm3,mm2
-        movq mm2, mm4
-        movq mm4, mm1
-        punpcklwd mm1,mm2
-        punpckhwd mm4,mm2
-        pmaddwd mm0,mm5
-        psrld mm0,8
-        pmaddwd mm1,mm5
-        psrld mm1,8
-        pmaddwd mm3,mm5
-        psrld mm3,8
-        pmaddwd mm4,mm5
-        psrld mm4,8
-        packssdw mm0,mm3
-        packssdw mm1,mm4
-        packuswb mm0,mm1
-        movq [esi+ecx*4],mm0
-        movq [edi+ecx*4],mm0
-        inc  ecx
-        inc  ecx
-        jnz .blur_loop2
-.no_blur2:
-        popad
-        emms
-        ret
-
 NEWSYM DrawWin320x240x16
         pushad
         cmp byte [MMXSupport],0

zsnes/src/win/winlink.cpp

@@ -131,8 +131,6 @@ extern "C" {
 DWORD                   MouseButton;
 DWORD                   SurfaceX=0;
 DWORD                   SurfaceY=0;
-VOID *blur_temp=0;
-VOID *blur_buffer=0;
 }
 
 HANDLE hLock, hThread;
@@ -476,8 +474,6 @@ void ExitFunction()
    ReleaseDirectInput();
    ReleaseDirectSound();
    ReleaseDirectDraw();
-   if (blur_temp) free(blur_temp);
-   if (blur_buffer) free(blur_buffer);
    FreeLibrary(hM_dsound);
    FreeLibrary(hM_ddraw);
    FreeLibrary(hM_dinput8);
@@ -1515,11 +1511,6 @@ int InitDirectDraw()
        AltSurface = 1;
    }
 
-      if (!blur_buffer) blur_buffer = malloc(SurfaceX * SurfaceY * (BitDepth == 16 ? 2 : 4));
-	  else blur_buffer = realloc(blur_buffer, SurfaceX * SurfaceY * (BitDepth == 16 ? 2 : 4));
-	  if (!blur_temp) blur_temp = malloc(SurfaceX * SurfaceY * (BitDepth == 16 ? 2 : 4));
-	  else blur_temp = realloc(blur_temp, SurfaceX * SurfaceY * (BitDepth == 16 ? 2 : 4));
-
    return TRUE;
 }
 
@@ -2331,9 +2322,7 @@ void clear_display()
 }
 
 extern void DrawWin256x224x16();
-extern void DrawWin256x224x16MB();
 extern void DrawWin256x224x32();
-extern void DrawWin256x224x32MB();
 extern void DrawWin320x240x16();
 
 extern _int64 copymaskRB = 0x001FF800001FF800;
@@ -2417,21 +2406,20 @@ void drawscreenwin(void)
       Refresh = 100;
       InitDirectDraw();
    }
-
   if (SurfaceX == 256 && SurfaceY == 240)
+
+   if (SurfaceX == 256 && SurfaceY == 240)
    {
       switch (BitDepth)
       {
         case 16:
         {
-          if (MotionBlur == 1) DrawWin256x224x16MB();
+			DrawWin256x224x16();
-            else DrawWin256x224x16();
+			break;
-          break;
         }
         case 32:
-        {
+        {			
-          if (MotionBlur == 1) DrawWin256x224x32MB();
+			DrawWin256x224x32();
-            else DrawWin256x224x32();
+			break;
-          break;
         }
 
             SURFDW=(DWORD *) &SurfBuf[(resolutn-1)*pitch];