- removed support for paletted Windows display modes.

This was only relevant for DirectDraw which has been removed.
This commit is contained in:
Christoph Oelckers 2018-03-27 10:41:38 +02:00
parent ded21cba8e
commit dd491d6558
10 changed files with 1 additions and 68 deletions

View file

@ -76,7 +76,6 @@ public:
bool WipeDo(int ticks); bool WipeDo(int ticks);
void WipeCleanup(); void WipeCleanup();
void Swap(); void Swap();
bool Is8BitMode() { return false; }
bool IsHWGammaActive() const { return HWGammaActive; } bool IsHWGammaActive() const { return HWGammaActive; }
void SetVSync(bool vsync); void SetVSync(bool vsync);

View file

@ -64,11 +64,8 @@ public:
void WipeCleanup() override; void WipeCleanup() override;
#ifdef WIN32 #ifdef WIN32
void PaletteChanged() override { }
int QueryNewPalette() override { return 0; }
void Blank() override { } void Blank() override { }
bool PaintToWindow() override; bool PaintToWindow() override;
bool Is8BitMode() override { return false; }
int GetTrueHeight() override { return TrueHeight; } int GetTrueHeight() override { return TrueHeight; }
#endif #endif

View file

@ -121,11 +121,6 @@ public:
void GetFlash(PalEntry &rgb, int &amount) { DBGBREAK; } void GetFlash(PalEntry &rgb, int &amount) { DBGBREAK; }
int GetPageCount() { DBGBREAK; return 0; } int GetPageCount() { DBGBREAK; return 0; }
bool IsFullscreen() { DBGBREAK; return 0; } bool IsFullscreen() { DBGBREAK; return 0; }
#ifdef _WIN32
void PaletteChanged() {}
int QueryNewPalette() { return 0; }
bool Is8BitMode() { return false; }
#endif
float Gamma; float Gamma;
}; };

View file

@ -451,12 +451,6 @@ public:
// Releases the screenshot buffer. // Releases the screenshot buffer.
virtual void ReleaseScreenshotBuffer() {} virtual void ReleaseScreenshotBuffer() {}
#ifdef _WIN32
virtual void PaletteChanged () = 0;
virtual int QueryNewPalette () = 0;
virtual bool Is8BitMode() = 0;
#endif
// The original size of the framebuffer as selected in the video menu. // The original size of the framebuffer as selected in the video menu.
int VideoWidth = 0; int VideoWidth = 0;
int VideoHeight = 0; int VideoHeight = 0;

View file

@ -894,27 +894,6 @@ int D3DFB::GetPageCount ()
return 1; return 1;
} }
//==========================================================================
//
// D3DFB :: PaletteChanged
//
//==========================================================================
void D3DFB::PaletteChanged ()
{
}
//==========================================================================
//
// D3DFB :: QueryNewPalette
//
//==========================================================================
int D3DFB::QueryNewPalette ()
{
return 0;
}
//========================================================================== //==========================================================================
// //
// D3DFB :: IsValid // D3DFB :: IsValid

View file

@ -616,22 +616,6 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
} }
break; break;
case WM_PALETTECHANGED:
if ((HWND)wParam == Window)
break;
if (screen != NULL)
{
screen->PaletteChanged ();
}
return DefWindowProc (hWnd, message, wParam, lParam);
case WM_QUERYNEWPALETTE:
if (screen != NULL)
{
return screen->QueryNewPalette ();
}
return DefWindowProc (hWnd, message, wParam, lParam);
case WM_ERASEBKGND: case WM_ERASEBKGND:
return true; return true;

View file

@ -933,8 +933,7 @@ bool I_SetCursor(FTexture *cursorpic)
{ {
HCURSOR cursor; HCURSOR cursor;
if (cursorpic != NULL && cursorpic->UseType != ETextureType::Null && if (cursorpic != NULL && cursorpic->UseType != ETextureType::Null)
(screen == NULL || !screen->Is8BitMode()))
{ {
// Must be no larger than 32x32. // Must be no larger than 32x32.
if (cursorpic->GetWidth() > 32 || cursorpic->GetHeight() > 32) if (cursorpic->GetWidth() > 32 || cursorpic->GetHeight() > 32)

View file

@ -1199,15 +1199,6 @@ bool Win32GLFrameBuffer::IsFullscreen()
return m_Fullscreen; return m_Fullscreen;
} }
void Win32GLFrameBuffer::PaletteChanged()
{
}
int Win32GLFrameBuffer::QueryNewPalette()
{
return 0;
}
HRESULT Win32GLFrameBuffer::GetHR() HRESULT Win32GLFrameBuffer::GetHR()
{ {
return 0; return 0;

View file

@ -61,8 +61,6 @@ public:
bool IsFullscreen(); bool IsFullscreen();
void PaletteChanged();
int QueryNewPalette();
void InitializeState(); void InitializeState();

View file

@ -37,8 +37,6 @@ public:
void GetFlash (PalEntry &rgb, int &amount); void GetFlash (PalEntry &rgb, int &amount);
int GetPageCount (); int GetPageCount ();
bool IsFullscreen (); bool IsFullscreen ();
void PaletteChanged ();
int QueryNewPalette ();
void Blank (); void Blank ();
bool PaintToWindow (); bool PaintToWindow ();
void SetVSync (bool vsync); void SetVSync (bool vsync);
@ -64,7 +62,6 @@ public:
bool WipeDo(int ticks); bool WipeDo(int ticks);
void WipeCleanup(); void WipeCleanup();
HRESULT GetHR (); HRESULT GetHR ();
bool Is8BitMode() { return false; }
virtual int GetTrueHeight() { return TrueHeight; } virtual int GetTrueHeight() { return TrueHeight; }
private: private: