ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Set alpha to index even when there is no palette. 

Fixes a failure in p8_primary_test when running with opengl ddraw renderer.
This commit is contained in:
Alexander Dorofeyev 2008-05-09 01:12:39 +03:00 committed by Alexandre Julliard
parent ebf1f4e6bb
commit b8a5742358
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/wined3d/surface.c
View File

@ -2088,17 +2088,21 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4]
/* In DirectDraw the palette is a property of the surface, there are no such things as device palettes. */ /* In DirectDraw the palette is a property of the surface, there are no such things as device palettes. */
if(dxVersion <= 7) { if(dxVersion <= 7) {
ERR("This code should never get entered for DirectDraw!, expect problems\n"); ERR("This code should never get entered for DirectDraw!, expect problems\n");
return; if(index_in_alpha) {
} /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if
there's no palette at this time. */
/* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, for (i = 0; i < 256; i++) table[i][3] = i;
alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device }
capability flag is present (wine does advertise this capability) */ } else {
for (i = 0; i < 256; i++) { /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8,
table[i][0] = device->palettes[device->currentPalette][i].peRed; alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device
table[i][1] = device->palettes[device->currentPalette][i].peGreen; capability flag is present (wine does advertise this capability) */
table[i][2] = device->palettes[device->currentPalette][i].peBlue; for (i = 0; i < 256; i++) {
table[i][3] = device->palettes[device->currentPalette][i].peFlags; table[i][0] = device->palettes[device->currentPalette][i].peRed;
table[i][1] = device->palettes[device->currentPalette][i].peGreen;
table[i][2] = device->palettes[device->currentPalette][i].peBlue;
table[i][3] = device->palettes[device->currentPalette][i].peFlags;
}
} }
} else { } else {
TRACE("Using surface palette %p\n", pal); TRACE("Using surface palette %p\n", pal);