ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTK : Color init change (patch by chrono) 

This fixes the wrong colors when using Cairo output


git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@724 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
bgk 2008-09-13 16:58:32 +00:00
parent 592db68254
commit a159851cc5
3 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/screenarea-cairo.cpp
View File

@ -63,17 +63,7 @@ void ScreenAreaCairo::vDrawPixels(u8 * _puiData)
}
else
{
// TODO : Find a way to use systemXXXShift cleanly to avoid this loop
u32 * puiPixel = m_puiPixels;
u8 * puiSrc = _puiData + iSrcPitch;
for (int i = 0; i < (m_iWidth + 1) * m_iHeight; i++)
{
u8 iR = *puiSrc++;
u8 iG = *puiSrc++;
u8 iB = *puiSrc++;
puiSrc++;
*puiPixel++ = (iR << 16) + (iG << 8) + iB;
}
memcpy(m_puiPixels, _puiData + iSrcPitch, m_iHeight * iSrcPitch);
}
queue_draw();

82
src/gtk/window.cpp
View File

@ -686,6 +686,56 @@ Window::~Window()
m_poInstance = NULL;
}
void Window::vInitColors(EColorFormat _eColorFormat)
{
switch (_eColorFormat)
{
case ColorFormatBGR:
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
systemRedShift = 3;
systemGreenShift = 11;
systemBlueShift = 19;
RGB_LOW_BITS_MASK = 0x00010101;
#else
systemRedShift = 27;
systemGreenShift = 19;
systemBlueShift = 11;
RGB_LOW_BITS_MASK = 0x01010100;
#endif
break;
default:
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
systemRedShift = 19;
systemGreenShift = 11;
systemBlueShift = 3;
RGB_LOW_BITS_MASK = 0x00010101;
#else
systemRedShift = 11;
systemGreenShift = 19;
systemBlueShift = 27;
RGB_LOW_BITS_MASK = 0x01010100;
#endif
break;
}
for (int i = 0; i < 0x10000; i++)
{
systemColorMap32[i] = (((i & 0x1f) << systemRedShift)
| (((i & 0x3e0) >> 5) << systemGreenShift)
| (((i & 0x7c00) >> 10) << systemBlueShift));
}
for (int i = 0; i < 24; )
{
systemGbPalette[i++] = (0x1f) | (0x1f << 5) | (0x1f << 10);
systemGbPalette[i++] = (0x15) | (0x15 << 5) | (0x15 << 10);
systemGbPalette[i++] = (0x0c) | (0x0c << 5) | (0x0c << 10);
systemGbPalette[i++] = 0;
}
Init_2xSaI(32);
}
void Window::vInitScreenArea(EVideoOutput _eVideoOutput)
{
Gtk::Alignment * poC;
@ -700,14 +750,17 @@ void Window::vInitScreenArea(EVideoOutput _eVideoOutput)
{
#ifdef USE_OPENGL
case OutputOpenGL:
vInitColors(ColorFormatBGR);
m_poScreenArea = Gtk::manage(new ScreenAreaGl(m_iScreenWidth, m_iScreenHeight));
break;
#endif // USE_OPENGL
case OutputXvideo:
vInitColors(ColorFormatBGR);
m_poScreenArea = Gtk::manage(new ScreenAreaXv(m_iScreenWidth, m_iScreenHeight));
break;
case OutputCairo:
default:
vInitColors(ColorFormatRGB);
m_poScreenArea = Gtk::manage(new ScreenAreaCairo(m_iScreenWidth, m_iScreenHeight));
break;
}
@ -725,18 +778,6 @@ void Window::vInitScreenArea(EVideoOutput _eVideoOutput)
void Window::vInitSystem()
{
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
systemRedShift = 3;
systemGreenShift = 11;
systemBlueShift = 19;
RGB_LOW_BITS_MASK = 0x00010101;
#else
systemRedShift = 27;
systemGreenShift = 19;
systemBlueShift = 11;
RGB_LOW_BITS_MASK = 0x01010100;
#endif
systemColorDepth = 32;
systemVerbose = 0;
systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
@ -747,25 +788,8 @@ void Window::vInitSystem()
emulating = 0;
for (int i = 0; i < 0x10000; i++)
{
systemColorMap32[i] = (((i & 0x1f) << systemRedShift)
| (((i & 0x3e0) >> 5) << systemGreenShift)
| (((i & 0x7c00) >> 10) << systemBlueShift));
}
gbFrameSkip = 0;
for (int i = 0; i < 24; )
{
systemGbPalette[i++] = (0x1f) | (0x1f << 5) | (0x1f << 10);
systemGbPalette[i++] = (0x15) | (0x15 << 5) | (0x15 << 10);
systemGbPalette[i++] = (0x0c) | (0x0c << 5) | (0x0c << 10);
systemGbPalette[i++] = 0;
}
Init_2xSaI(32);
soundInit();
}

7
src/gtk/window.h
View File

@ -116,6 +116,12 @@ protected:
EmulatorSGB2
};
enum EColorFormat
{
ColorFormatRGB,
ColorFormatBGR
};
enum EVideoOutput
{
OutputCairo,
@ -258,6 +264,7 @@ private:
void vInitSDL();
void vInitConfig();
void vCheckConfig();
void vInitColors(EColorFormat _eColorFormat);
void vInitScreenArea(EVideoOutput _eVideoOutput);
void vLoadConfig(const std::string & _rsFile);
void vSaveConfig(const std::string & _rsFile);