zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implemented hardware gamma support for macOS 

Hardware gamma is limited to main display only, use shader-based correction for other displays
This commit is contained in:
alexey.lysiuk 2016-07-31 12:19:08 +03:00
parent a69182f9ef
commit d3457f4508
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/posix/cocoa/i_video.mm
View File

@ -1086,6 +1086,20 @@ SDLGLFB::SDLGLFB(void*, const int width, const int height, int, int, const bool
, m_lock(-1) , m_lock(-1)
, m_isUpdatePending(false) , m_isUpdatePending(false)
{ {
CGGammaValue gammaTable[GAMMA_TABLE_SIZE];
uint32_t actualChannelSize;
const CGError result = CGGetDisplayTransferByTable(kCGDirectMainDisplay, GAMMA_CHANNEL_SIZE,
gammaTable, &gammaTable[GAMMA_CHANNEL_SIZE], &gammaTable[GAMMA_CHANNEL_SIZE * 2], &actualChannelSize);
m_supportsGamma = kCGErrorSuccess == result && GAMMA_CHANNEL_SIZE == actualChannelSize;
if (m_supportsGamma)
{
for (uint32_t i = 0; i < GAMMA_TABLE_SIZE; ++i)
{
m_originalGamma[i] = static_cast<WORD>(gammaTable[i] * 65535.0f);
}
}
} }
SDLGLFB::SDLGLFB() SDLGLFB::SDLGLFB()
@ -1169,10 +1183,26 @@ void SDLGLFB::SwapBuffers()
void SDLGLFB::SetGammaTable(WORD* table) void SDLGLFB::SetGammaTable(WORD* table)
{ {
if (m_supportsGamma)
{
CGGammaValue gammaTable[GAMMA_TABLE_SIZE];
for (uint32_t i = 0; i < GAMMA_TABLE_SIZE; ++i)
{
gammaTable[i] = static_cast<CGGammaValue>(table[i] / 65535.0f);
}
CGSetDisplayTransferByTable(kCGDirectMainDisplay, GAMMA_CHANNEL_SIZE,
gammaTable, &gammaTable[GAMMA_CHANNEL_SIZE], &gammaTable[GAMMA_CHANNEL_SIZE * 2]);
}
} }
void SDLGLFB::ResetGammaTable() void SDLGLFB::ResetGammaTable()
{ {
if (m_supportsGamma)
{
SetGammaTable(m_originalGamma);
}
} }
int SDLGLFB::GetClientWidth() int SDLGLFB::GetClientWidth()

7
src/posix/cocoa/sdlglvideo.h
View File

@ -71,7 +71,12 @@ protected:
int m_lock; int m_lock;
bool m_isUpdatePending; bool m_isUpdatePending;
static const bool m_supportsGamma = false; static const uint32_t GAMMA_CHANNEL_SIZE = 256;
static const uint32_t GAMMA_CHANNEL_COUNT = 3;
static const uint32_t GAMMA_TABLE_SIZE = GAMMA_CHANNEL_SIZE * GAMMA_CHANNEL_COUNT;
bool m_supportsGamma;
WORD m_originalGamma[GAMMA_TABLE_SIZE];
SDLGLFB(); SDLGLFB();