zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Implement fullscreen 8bpp mode as a borderless, desktop-sized window when running on Windows, and expose an 8bpp mode to the game with the same size as the desktop when no fullscreen 8bpp modes are exposed by Windows. This is required on Windows 8 if we want to have any operation of classic mode in fullscreen, because Windows 8 drops the ability to set any mode other than 32bpp (leaving us largely in the same position we are when running under X)."

Browse source 
This reverts commit 705cc72fed880e857a68c483fd3ff1ead3df044d.

git-svn-id: https://svn.eduke32.com/eduke32@3305 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-12-18 18:07:28 +00:00
parent 50844b6e71
commit 817bc98964
1 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
polymer/eduke32/build/src/winlayer.c
View file

@ -71,8 +71,6 @@
// undefine to restrict windowed resolutions to conventional sizes // undefine to restrict windowed resolutions to conventional sizes
#define ANY_WINDOWED_SIZE #define ANY_WINDOWED_SIZE
#define FAKE_FS(x, y, bpp) (bpp == 8 && x == desktopxdim && y == desktopydim)
static mutex_t m_initprintf; static mutex_t m_initprintf;
static int32_t winlayer_have_ATI = 0; static int32_t winlayer_have_ATI = 0;
@ -1840,17 +1838,6 @@ void getvalidmodes(void)
} }
} }
} }
for (i=0; i<validmodecnt; i++)
if (validmode[i].fs && validmode[i].bpp == 8)
break;
if (i == validmodecnt)
{
initprintf("No fullscreen 8-bit modes exposed\n");
ADDMODE(desktopxdim, desktopydim, 8, 1, -1);
}
#ifdef USE_OPENGL #ifdef USE_OPENGL
cdsenummodes(); cdsenummodes();
#endif #endif
@ -1906,13 +1893,13 @@ void begindrawing(void)
if (offscreenrendering) return; if (offscreenrendering) return;
frameplace = fullscreen && !FAKE_FS(xres, yres, bpp) ? (intptr_t)lpOffscreen : (intptr_t)lpPixels; frameplace = fullscreen ? (intptr_t)lpOffscreen : (intptr_t)lpPixels;
if (!modechange) return; if (!modechange) return;
modechange=0; modechange=0;
if (!fullscreen || FAKE_FS(xres, yres, bpp)) if (!fullscreen)
{ {
bytesperline = xres|4; bytesperline = xres|4;
} }
@ -1974,7 +1961,7 @@ void showframe(int32_t w)
while (lockcount) enddrawing(); while (lockcount) enddrawing();
} }
if (!fullscreen || FAKE_FS(xres, yres, bpp)) if (!fullscreen)
{ {
BitBlt(hDC, 0, 0, xres, yres, hDCSection, 0, 0, SRCCOPY); BitBlt(hDC, 0, 0, xres, yres, hDCSection, 0, 0, SRCCOPY);
return; return;
@ -2062,8 +2049,8 @@ int32_t setpalette(int32_t start, int32_t num)
Bmemcpy(lpal.palPalEntry, curpalettefaded, sizeof(lpal.palPalEntry)); Bmemcpy(lpal.palPalEntry, curpalettefaded, sizeof(lpal.palPalEntry));
for (i=start, n=num-1; n>0; i++, n--) for (i=start, n=num-1; n>0; i++, n--)
curpalettefaded[i].f = lpal.palPalEntry[i].peFlags = PC_NOCOLLAPSE; curpalettefaded[i].f = lpal.palPalEntry[i].peFlags = PC_NOCOLLAPSE;
if (fullscreen && !FAKE_FS(xres, yres, bpp)) if (fullscreen)
{ {
if (!lpDDPalette) return -1; if (!lpDDPalette) return -1;
result = IDirectDrawPalette_SetEntries(lpDDPalette, 0, 0, 256, (LPPALETTEENTRY)lpal.palPalEntry); result = IDirectDrawPalette_SetEntries(lpDDPalette, 0, 0, 256, (LPPALETTEENTRY)lpal.palPalEntry);
@ -2118,7 +2105,7 @@ return 0;
// //
static int32_t setgammaramp(WORD gt[3][256]) static int32_t setgammaramp(WORD gt[3][256])
{ {
if (!fullscreen || bpp > 8 || FAKE_FS(xres, yres, bpp)) if (!fullscreen || bpp > 8)
{ {
// GL and windowed mode use DIB method // GL and windowed mode use DIB method
int32_t i; int32_t i;
@ -2191,9 +2178,8 @@ int32_t setgamma(void)
static int32_t getgammaramp(WORD gt[3][256]) static int32_t getgammaramp(WORD gt[3][256])
{ {
return -1;
if (!hWindow) return -1; if (!hWindow) return -1;
if (!fullscreen || bpp > 8 || FAKE_FS(xres, yres, bpp)) if (!fullscreen || bpp > 8)
{ {
int32_t i; int32_t i;
HDC hDC = GetDC(hWindow); HDC hDC = GetDC(hWindow);
@ -2992,13 +2978,8 @@ static BOOL CreateAppWindow(int32_t modenum)
ShowWindow(hWindow, SW_HIDE); // so Windows redraws what's behind if the window shrinks ShowWindow(hWindow, SW_HIDE); // so Windows redraws what's behind if the window shrinks
} }
if (fs && FAKE_FS(width, height, bitspp)) if (fs)
{
stylebitsex = 0;
stylebits = WS_POPUP | WS_MAXIMIZE | WS_VISIBLE | WS_CLIPSIBLINGS;
}
else if (fs)
{ {
stylebitsex = WS_EX_TOPMOST; stylebitsex = WS_EX_TOPMOST;
stylebits = WS_POPUP; stylebits = WS_POPUP;
@ -3039,7 +3020,7 @@ static BOOL CreateAppWindow(int32_t modenum)
} }
// resize the window // resize the window
if (!fs && !FAKE_FS(width, height, bitspp)) if (!fs)
{ {
rect.left = 0; rect.left = 0;
rect.top = 0; rect.top = 0;
@ -3073,7 +3054,7 @@ static BOOL CreateAppWindow(int32_t modenum)
SetWindowPos(hWindow, HWND_TOP, windowpos?windowx:x, windowpos?windowy:y, w, h, 0); SetWindowPos(hWindow, HWND_TOP, windowpos?windowx:x, windowpos?windowy:y, w, h, 0);
// fullscreen? // fullscreen?
if (!fs || FAKE_FS(width, height, bitspp)) if (!fs)
{ {
if (bitspp > 8) if (bitspp > 8)
{ {