frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Fixes to pixelFormat <-> fbConfig conversion in WGL mode 

Fix FIXME in fbConfigToPixelFormat() to correctly populate RGBA-mask shift
parameters.  Also request colourindex pixelFormats correctly.

Now that they are requested correctly, don't skip colorindex visuals when
converting pixelFormats to fbConfigs.

Populate transparent colour information when converting pixelFormat from
DescribePixelFormats() to a fbConfig.

Signed-off-by: Marc Haesen <marha@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Marc Haesen 2012-07-21 21:18:44 +01:00 committed by Jon TURNEY
parent 45c432871d
commit f6e7b82aca
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
hw/xwin/glx/indirect.c
View File

@ -1625,6 +1625,18 @@ glxWinCreateContext(__GLXscreen * screen,
* Utility functions * Utility functions
*/ */
static int
GetShift(int Mask)
{
int Shift = 0;
while ((Mask &1) == 0) {
Shift++;
Mask >>=1;
}
return Shift;
}
static int static int
fbConfigToPixelFormat(__GLXconfig * mode, PIXELFORMATDESCRIPTOR * pfdret, fbConfigToPixelFormat(__GLXconfig * mode, PIXELFORMATDESCRIPTOR * pfdret,
int drawableTypeOverride) int drawableTypeOverride)
@ -1661,16 +1673,26 @@ fbConfigToPixelFormat(__GLXconfig * mode, PIXELFORMATDESCRIPTOR * pfdret,
pfd.dwFlags |= PFD_DOUBLEBUFFER; pfd.dwFlags |= PFD_DOUBLEBUFFER;
} }
pfd.iPixelType = PFD_TYPE_RGBA;
pfd.cColorBits = mode->redBits + mode->greenBits + mode->blueBits; pfd.cColorBits = mode->redBits + mode->greenBits + mode->blueBits;
pfd.cRedBits = mode->redBits; pfd.cRedBits = mode->redBits;
pfd.cRedShift = 0; /* FIXME */ pfd.cRedShift = GetShift(mode->redMask);
pfd.cGreenBits = mode->greenBits; pfd.cGreenBits = mode->greenBits;
pfd.cGreenShift = 0; /* FIXME */ pfd.cGreenShift = GetShift(mode->greenMask);
pfd.cBlueBits = mode->blueBits; pfd.cBlueBits = mode->blueBits;
pfd.cBlueShift = 0; /* FIXME */ pfd.cBlueShift = GetShift(mode->blueMask);
pfd.cAlphaBits = mode->alphaBits; pfd.cAlphaBits = mode->alphaBits;
pfd.cAlphaShift = 0; /* FIXME */ pfd.cAlphaShift = GetShift(mode->alphaMask);
if (mode->visualType == GLX_TRUE_COLOR) {
pfd.iPixelType = PFD_TYPE_RGBA;
pfd.dwVisibleMask =
(pfd.cRedBits << pfd.cRedShift) | (pfd.cGreenBits << pfd.cGreenShift) |
(pfd.cBlueBits << pfd.cBlueShift) | (pfd.cAlphaBits << pfd.cAlphaShift);
}
else {
pfd.iPixelType = PFD_TYPE_COLORINDEX;
pfd.dwVisibleMask = mode->transparentIndex;
}
pfd.cAccumBits = pfd.cAccumBits =
mode->accumRedBits + mode->accumGreenBits + mode->accumBlueBits + mode->accumRedBits + mode->accumGreenBits + mode->accumBlueBits +
@ -1910,25 +1932,27 @@ glxWinCreateConfigs(HDC hdc, glxWinScreen * screen)
/* EXT_visual_info / GLX 1.2 */ /* EXT_visual_info / GLX 1.2 */
if (pfd.iPixelType == PFD_TYPE_COLORINDEX) { if (pfd.iPixelType == PFD_TYPE_COLORINDEX) {
c->base.visualType = GLX_STATIC_COLOR; c->base.visualType = GLX_STATIC_COLOR;
c->base.transparentRed = GLX_NONE;
if (!getenv("GLWIN_ENABLE_COLORINDEX_FBCONFIGS")) { c->base.transparentGreen = GLX_NONE;
GLWIN_DEBUG_MSG c->base.transparentBlue = GLX_NONE;
("pixelFormat %d is PFD_TYPE_COLORINDEX, skipping", i + 1); c->base.transparentAlpha = GLX_NONE;
continue; c->base.transparentIndex = pfd.dwVisibleMask;
} c->base.transparentPixel = GLX_TRANSPARENT_INDEX;
} }
else { else {
c->base.visualType = GLX_TRUE_COLOR; c->base.visualType = GLX_TRUE_COLOR;
c->base.transparentRed =
(pfd.dwVisibleMask & c->base.redMask) >> pfd.cRedShift;
c->base.transparentGreen =
(pfd.dwVisibleMask & c->base.greenMask) >> pfd.cGreenShift;
c->base.transparentBlue =
(pfd.dwVisibleMask & c->base.blueMask) >> pfd.cBlueShift;
c->base.transparentAlpha =
(pfd.dwVisibleMask & c->base.alphaMask) >> pfd.cAlphaShift;
c->base.transparentIndex = GLX_NONE;
c->base.transparentPixel = GLX_TRANSPARENT_RGB;
} }
// pfd.dwVisibleMask; ???
c->base.transparentPixel = GLX_NONE;
c->base.transparentRed = GLX_NONE;
c->base.transparentGreen = GLX_NONE;
c->base.transparentBlue = GLX_NONE;
c->base.transparentAlpha = GLX_NONE;
c->base.transparentIndex = GLX_NONE;
/* ARB_multisample / SGIS_multisample */ /* ARB_multisample / SGIS_multisample */
c->base.sampleBuffers = 0; c->base.sampleBuffers = 0;
c->base.samples = 0; c->base.samples = 0;
@ -2180,14 +2204,6 @@ glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen)
c->base.indexBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0); c->base.indexBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);
c->base.rgbBits = 0; c->base.rgbBits = 0;
c->base.visualType = GLX_STATIC_COLOR; c->base.visualType = GLX_STATIC_COLOR;
if (!getenv("GLWIN_ENABLE_COLORINDEX_FBCONFIGS")) {
GLWIN_DEBUG_MSG
("pixelFormat %d is WGL_TYPE_COLORINDEX_ARB, skipping",
i + 1);
continue;
}
break; break;
case WGL_TYPE_RGBA_FLOAT_ARB: case WGL_TYPE_RGBA_FLOAT_ARB: