KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wgl: Combine alpha pixelformat info in color.

This commit is contained in:
José Fonseca 2009-04-10 10:14:13 +01:00
parent 2921a49033
commit 3f2420e2e0
4 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/state_trackers/wgl/shared/stw_arbpixelformat.c
View File

@ -185,11 +185,11 @@ stw_query_attrib(
break;
case WGL_ALPHA_BITS_ARB:
*pvalue = (int) pf->alpha.alphabits;
*pvalue = (int) pf->color.alphabits;
break;
case WGL_ALPHA_SHIFT_ARB:
*pvalue = (int) pf->alpha.alphashift;
*pvalue = (int) pf->color.alphashift;
break;
case WGL_ACCUM_BITS_ARB:

2
src/gallium/state_trackers/wgl/shared/stw_context.c
View File

@ -115,7 +115,7 @@ stw_create_layer_context(
pf->color.redbits,
pf->color.greenbits,
pf->color.bluebits,
pf->alpha.alphabits,
pf->color.alphabits,
0,
pf->depth.depthbits,
pf->depth.stencilbits,

43
src/gallium/state_trackers/wgl/shared/stw_pixelformat.c
View File

@ -43,57 +43,48 @@ stw_add_standard_pixelformats(
uint flags )
{
struct stw_pixelformat_info *pf = *ppf;
struct stw_pixelformat_color_info color24 = { 8, 0, 8, 8, 8, 16 };
struct stw_pixelformat_alpha_info noalpha = { 0, 0 };
struct stw_pixelformat_alpha_info alpha8 = { 8, 24 };
struct stw_pixelformat_color_info color24 = { 8, 0, 8, 8, 8, 16, 0, 0 };
struct stw_pixelformat_color_info color24a8 = { 8, 0, 8, 8, 8, 16, 8, 24 };
struct stw_pixelformat_depth_info depth24s8 = { 24, 8 };
struct stw_pixelformat_depth_info depth16 = { 16, 0 };
pf->flags = STW_PF_FLAG_DOUBLEBUFFER | flags;
pf->color = color24;
pf->alpha = noalpha;
pf->depth = depth24s8;
pf++;
pf->flags = STW_PF_FLAG_DOUBLEBUFFER | flags;
pf->color = color24a8;
pf->depth = depth24s8;
pf++;
pf->flags = STW_PF_FLAG_DOUBLEBUFFER | flags;
pf->color = color24;
pf->alpha = alpha8;
pf->depth = depth24s8;
pf++;
pf->flags = STW_PF_FLAG_DOUBLEBUFFER | flags;
pf->color = color24;
pf->alpha = noalpha;
pf->depth = depth16;
pf++;
pf->flags = STW_PF_FLAG_DOUBLEBUFFER | flags;
pf->color = color24;
pf->alpha = alpha8;
pf->color = color24a8;
pf->depth = depth16;
pf++;
pf->flags = flags;
pf->color = color24;
pf->alpha = noalpha;
pf->depth = depth24s8;
pf++;
pf->flags = flags;
pf->color = color24a8;
pf->depth = depth24s8;
pf++;
pf->flags = flags;
pf->color = color24;
pf->alpha = alpha8;
pf->depth = depth24s8;
pf++;
pf->flags = flags;
pf->color = color24;
pf->alpha = noalpha;
pf->depth = depth16;
pf++;
pf->flags = flags;
pf->color = color24;
pf->alpha = alpha8;
pf->color = color24a8;
pf->depth = depth16;
pf++;
@ -171,8 +162,8 @@ stw_pixelformat_describe(
ppfd->cGreenShift = pf->color.greenshift;
ppfd->cBlueBits = pf->color.bluebits;
ppfd->cBlueShift = pf->color.blueshift;
ppfd->cAlphaBits = pf->alpha.alphabits;
ppfd->cAlphaShift = pf->alpha.alphashift;
ppfd->cAlphaBits = pf->color.alphabits;
ppfd->cAlphaShift = pf->color.alphashift;
ppfd->cAccumBits = 0;
ppfd->cAccumRedBits = 0;
ppfd->cAccumGreenBits = 0;
@ -225,7 +216,7 @@ int stw_pixelformat_choose( HDC hdc,
if (ppfd->cStencilBits != pf->depth.stencilbits)
delta += 2;
if (ppfd->cAlphaBits != pf->alpha.alphabits)
if (ppfd->cAlphaBits != pf->color.alphabits)
delta++;
if (delta < bestdelta) {

5
src/gallium/state_trackers/wgl/shared/stw_pixelformat.h
View File

@ -42,10 +42,6 @@ struct stw_pixelformat_color_info
uint greenshift;
uint bluebits;
uint blueshift;
};
struct stw_pixelformat_alpha_info
{
uint alphabits;
uint alphashift;
};
@ -60,7 +56,6 @@ struct stw_pixelformat_info
{
uint flags;
struct stw_pixelformat_color_info color;
struct stw_pixelformat_alpha_info alpha;
struct stw_pixelformat_depth_info depth;
};