a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

D modes now work in 32bpp windowed mode (gfx filters etc)

Browse Source
This commit is contained in:
pagefault
2003-07-23 17:09:05 +00:00
parent 1c13ff3988
commit 9342dd9ca6
2 changed files with 160 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zsnes/src/video/sw_draw.asm
View File

@@ -462,9 +462,9 @@ NEWSYM DrawWin320x240x16
sub edi,640 sub edi,640
add esi,64 add esi,64
%ifdef __WIN32__ %ifdef __WIN32__
cmp eax,239 cmp ebx,239
%else %else
cmp eax,223 cmp ebx,223
%endif %endif
jne .Copying2MMX jne .Copying2MMX
mov ecx,128 mov ecx,128

217
zsnes/src/win/winlink.cpp
View File

@@ -71,6 +71,7 @@ LPDIRECTDRAW BasiclpDD = NULL;
LPDIRECTDRAW7 lpDD = NULL; LPDIRECTDRAW7 lpDD = NULL;
LPDIRECTDRAWSURFACE7 DD_Primary = NULL; LPDIRECTDRAWSURFACE7 DD_Primary = NULL;
LPDIRECTDRAWSURFACE7 DD_CFB = NULL; LPDIRECTDRAWSURFACE7 DD_CFB = NULL;
LPDIRECTDRAWSURFACE7 DD_CFB16 = NULL;
LPDIRECTDRAWSURFACE7 DD_BackBuffer = NULL; LPDIRECTDRAWSURFACE7 DD_BackBuffer = NULL;
LPDIRECTDRAWCLIPPER lpDDClipper = NULL; LPDIRECTDRAWCLIPPER lpDDClipper = NULL;
RECT rcWindow; RECT rcWindow;
@@ -124,6 +125,7 @@ BYTE IsActivated=1;
WORD PrevRes=0; WORD PrevRes=0;
RECT BlitArea; RECT BlitArea;
BYTE AltSurface=0;
extern "C" { extern "C" {
DWORD MouseButton; DWORD MouseButton;
@@ -302,7 +304,7 @@ void DrawScreen()
DDrawError(); DDrawError();
} }
} }
DD_Primary->Blt(&rcWindow, DD_CFB, &BlitArea, DDBLT_WAIT, NULL); DD_Primary->Blt(&rcWindow, AltSurface == 0 ? DD_CFB : DD_CFB16, &BlitArea, DDBLT_WAIT, NULL);
} }
} }
@@ -1077,6 +1079,12 @@ void ReleaseDirectDraw()
DD_CFB = NULL; DD_CFB = NULL;
} }
if (DD_CFB16)
{
DD_CFB16->Release();
DD_CFB16 = NULL;
}
if (lpDDClipper) if (lpDDClipper)
{ {
lpDDClipper->Release(); lpDDClipper->Release();
@@ -1462,6 +1470,24 @@ int InitDirectDraw()
return FALSE; return FALSE;
} }
// create alt. drawing surface
if ( BitDepth == 32 )
{
ddsd2.dwFlags |= DDSD_PIXELFORMAT;
ddsd2.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT);
ddsd2.ddpfPixelFormat.dwFlags = DDPF_RGB;
ddsd2.ddpfPixelFormat.dwRGBBitCount = 16;
ddsd2.ddpfPixelFormat.dwRBitMask = 0xF800;
ddsd2.ddpfPixelFormat.dwGBitMask = 0x07E0;
ddsd2.ddpfPixelFormat.dwBBitMask = 0x001F;
if (lpDD->CreateSurface(&ddsd2, &DD_CFB16, NULL) != DD_OK)
{
MessageBox(NULL, "IDirectDraw7::CreateSurface failed.", "DirectDraw Error", MB_ICONERROR);
return FALSE;
}
}
if (!blur_buffer) blur_buffer = malloc(SurfaceX * SurfaceY * (BitDepth == 16 ? 2 : 4)); if (!blur_buffer) blur_buffer = malloc(SurfaceX * SurfaceY * (BitDepth == 16 ? 2 : 4));
else blur_buffer = realloc(blur_buffer, 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)); if (!blur_temp) blur_temp = malloc(SurfaceX * SurfaceY * (BitDepth == 16 ? 2 : 4));
@@ -1475,25 +1501,66 @@ DDSURFACEDESC2 ddsd;
DWORD LockSurface() DWORD LockSurface()
{ {
HRESULT hRes;
if (DD_CFB == NULL) return(0); if (AltSurface == 0)
{
memset(&ddsd,0,sizeof(ddsd)); if (DD_CFB != NULL)
ddsd.dwSize = sizeof( ddsd ); {
ddsd.dwFlags = DDSD_LPSURFACE | DDSD_PITCH; memset(&ddsd,0,sizeof(ddsd));
if (DD_CFB->Lock(NULL,&ddsd,DDLOCK_WAIT,NULL) != DD_OK) ddsd.dwSize = sizeof( ddsd );
{ ddsd.dwFlags = DDSD_LPSURFACE | DDSD_PITCH;
hRes = DD_CFB->Lock(NULL,&ddsd,DDLOCK_WAIT,NULL);
if (hRes == DD_OK)
{
SurfBuf = (BYTE*)ddsd.lpSurface;
return(ddsd.lPitch);
}
else
{
if (hRes == DDERR_SURFACELOST)
DD_CFB->Restore();
return(0);
}
}
else
return(0); return(0);
} }
else
{
if (DD_CFB16 != NULL)
{
memset(&ddsd,0,sizeof(ddsd));
ddsd.dwSize = sizeof( ddsd );
ddsd.dwFlags = DDSD_LPSURFACE | DDSD_PITCH;
SurfBuf = (BYTE*)ddsd.lpSurface; hRes = DD_CFB16->Lock(NULL,&ddsd,DDLOCK_WAIT,NULL);
return(ddsd.lPitch);
if (hRes == DD_OK)
{
SurfBuf = (BYTE*)ddsd.lpSurface;
return(ddsd.lPitch);
}
else
{
if (hRes == DDERR_SURFACELOST)
DD_CFB16->Restore();
return(0);
}
}
else
return(0);
}
} }
void UnlockSurface() void UnlockSurface()
{ {
DD_CFB->Unlock((struct tagRECT *)ddsd.lpSurface); if (AltSurface == 0)
DrawScreen(); DD_CFB->Unlock((struct tagRECT *)ddsd.lpSurface);
else
DD_CFB16->Unlock((struct tagRECT *)ddsd.lpSurface);
} }
extern "C" { extern "C" {
@@ -2154,25 +2221,54 @@ extern void ClearWin32();
void clearwin() void clearwin()
{ {
DWORD i,j,color32; HRESULT hRes;
DWORD *SURFDW;
pitch=LockSurface(); if (DD_CFB != NULL)
if (pitch==0) { return; } {
memset(&ddsd,0,sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd);
SurfBufD=(DWORD) &SurfBuf[0]; hRes = DD_CFB->Lock(NULL,&ddsd,DDLOCK_WAIT,NULL);
SURFDW=(DWORD *) &SurfBuf[0];
switch (BitDepth) if (hRes == DD_OK)
{ {
case 16: SurfBufD=(DWORD)ddsd.lpSurface;
pitch = ddsd.lPitch;
switch (BitDepth)
{
case 16:
ClearWin16();
break;
case 32:
ClearWin32();
break;
}
DD_CFB->Unlock((struct tagRECT *)ddsd.lpSurface);
}
else
if (hRes == DDERR_SURFACELOST)
DD_CFB->Restore();
}
if (DD_CFB16 != NULL)
{
memset(&ddsd,0,sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd);
hRes = DD_CFB16->Lock(NULL,&ddsd,DDLOCK_WAIT,NULL);
if (hRes == DD_OK)
{
SurfBufD=(DWORD)ddsd.lpSurface;
pitch = ddsd.lPitch;
ClearWin16(); ClearWin16();
break; DD_CFB16->Unlock((struct tagRECT *)ddsd.lpSurface);
case 32: }
ClearWin32(); else
break; if (hRes == DDERR_SURFACELOST)
} DD_CFB16->Restore();
UnlockSurface(); }
} }
void clear_display() void clear_display()
@@ -2234,12 +2330,13 @@ void drawscreenwin(void)
UpdateVFrame(); UpdateVFrame();
if (curblank!=0) return; if (curblank!=0) return;
AltSurface = 0;
if ( ((SurfaceX==512) || (SurfaceX==640)) && (BitDepth == 32) )
AltSurface = 1;
if (!(pitch = LockSurface())) if (!(pitch = LockSurface()))
{
DD_Primary->Restore();
DD_CFB->Restore();
return; return;
}
ScreenPtr=vidbuffer; ScreenPtr=vidbuffer;
ScreenPtr+=16*2+32*2+256*2; ScreenPtr+=16*2+32*2+256*2;
@@ -2301,23 +2398,22 @@ void drawscreenwin(void)
Refresh = 100; Refresh = 100;
InitDirectDraw(); InitDirectDraw();
} }
if (SurfaceX == 256 && SurfaceY == 240)
if (SurfaceX == 256 && SurfaceY == 240)
{ {
switch (BitDepth) switch (BitDepth)
{ {
case 16: case 16:
{ {
if (MotionBlur == 1) DrawWin256x224x16MB(); if (MotionBlur == 1) DrawWin256x224x16MB();
else DrawWin256x224x16(); else DrawWin256x224x16();
break; break;
} }
case 32: case 32:
{ {
if (MotionBlur == 1) DrawWin256x224x32MB(); if (MotionBlur == 1) DrawWin256x224x32MB();
else DrawWin256x224x32(); else DrawWin256x224x32();
break; break;
} }
SURFDW=(DWORD *) &SurfBuf[(resolutn-1)*pitch]; SURFDW=(DWORD *) &SurfBuf[(resolutn-1)*pitch];
color32=0x7F000000; color32=0x7F000000;
@@ -2335,14 +2431,14 @@ void drawscreenwin(void)
SURFDW[i]=color32; SURFDW[i]=color32;
} }
break; break;
case 24: case 24:
MessageBox (NULL, "Sorry. ZSNESw does not work in windowed 24 bit color modes. \nClick 'OK' to switch to a full screen mode.", "DDRAW Error" , MB_ICONERROR ); MessageBox (NULL, "Sorry. ZSNESw does not work in windowed 24 bit color modes. \nClick 'OK' to switch to a full screen mode.", "DDRAW Error" , MB_ICONERROR );
cvidmode=3; cvidmode=3;
initwinvideo(); initwinvideo();
Sleep(1000); Sleep(1000);
drawscreenwin(); drawscreenwin();
break; break;
default: default:
UnlockSurface(); UnlockSurface();
MessageBox (NULL, "Mode only available in 16 and 32 bit color", "DDRAW Error" , MB_ICONERROR ); MessageBox (NULL, "Mode only available in 16 and 32 bit color", "DDRAW Error" , MB_ICONERROR );
cvidmode=2; cvidmode=2;
@@ -2357,12 +2453,12 @@ void drawscreenwin(void)
{ {
switch (BitDepth) switch (BitDepth)
{ {
case 16: case 16:
{ {
DrawWin320x240x16(); DrawWin320x240x16();
break; break;
} }
case 32: case 32:
for(j=0;j<8;j++) for(j=0;j<8;j++)
{ {
SURFDW=(DWORD *) &SurfBuf[j*pitch]; SURFDW=(DWORD *) &SurfBuf[j*pitch];
@@ -2412,7 +2508,7 @@ void drawscreenwin(void)
} }
} }
break; break;
default: default:
UnlockSurface(); UnlockSurface();
MessageBox (NULL, "Mode only available in 16 and 32 bit color", "DDRAW Error" , MB_ICONERROR ); MessageBox (NULL, "Mode only available in 16 and 32 bit color", "DDRAW Error" , MB_ICONERROR );
cvidmode=2; cvidmode=2;
@@ -2428,6 +2524,7 @@ void drawscreenwin(void)
switch (BitDepth) switch (BitDepth)
{ {
case 16: case 16:
case 32: // using 16bpp AltSurface
AddEndBytes=pitch-1024; AddEndBytes=pitch-1024;
NumBytesPerLine=pitch; NumBytesPerLine=pitch;
WinVidMemStart=&SurfBuf[0]; WinVidMemStart=&SurfBuf[0];
@@ -2440,7 +2537,7 @@ void drawscreenwin(void)
break; break;
default: default:
UnlockSurface(); UnlockSurface();
MessageBox (NULL, "Mode only available in 16 bit color", "DDRAW Error" , MB_ICONERROR ); MessageBox (NULL, "Mode only available in 16 and 32 bit color", "DDRAW Error" , MB_ICONERROR );
cvidmode=2; cvidmode=2;
initwinvideo(); initwinvideo();
Sleep(1000); Sleep(1000);
@@ -2453,6 +2550,7 @@ void drawscreenwin(void)
switch (BitDepth) switch (BitDepth)
{ {
case 16: case 16:
case 32: // using 16bpp AltSurface
AddEndBytes=pitch-1024; AddEndBytes=pitch-1024;
NumBytesPerLine=pitch; NumBytesPerLine=pitch;
WinVidMemStart=&SurfBuf[16*640*2+64*2]; WinVidMemStart=&SurfBuf[16*640*2+64*2];
@@ -2465,12 +2563,12 @@ void drawscreenwin(void)
break; break;
default: default:
UnlockSurface(); UnlockSurface();
MessageBox (NULL, "Mode only available in 16 bit color", "DDRAW Error" , MB_ICONERROR ); MessageBox (NULL, "Mode only available in 16 and 32 bit color", "DDRAW Error" , MB_ICONERROR );
cvidmode=2; cvidmode=2;
initwinvideo(); initwinvideo();
Sleep(1000); Sleep(1000);
drawscreenwin(); drawscreenwin();
} }
} }
if (SurfaceX == 768 && SurfaceY == 720) if (SurfaceX == 768 && SurfaceY == 720)
{ {
@@ -2505,10 +2603,11 @@ void drawscreenwin(void)
initwinvideo(); initwinvideo();
Sleep(1000); Sleep(1000);
drawscreenwin(); drawscreenwin();
} }
} }
UnlockSurface(); UnlockSurface();
DrawScreen();
} }
extern void SwitchFullScreen(void); extern void SwitchFullScreen(void);