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

ddraw: Simplify updating palette entries in d3d_texture2_Load().

This commit is contained in:
Henri Verbeet 2012-04-08 19:13:23 +02:00 committed by Alexandre Julliard
parent cd0c18f56b
commit 02b9988f48
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/ddraw/surface.c
View File

@ -5071,7 +5071,6 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
for (;;) for (;;)
{ {
struct wined3d_palette *wined3d_dst_pal, *wined3d_src_pal; struct wined3d_palette *wined3d_dst_pal, *wined3d_src_pal;
IDirectDrawPalette *dst_pal = NULL, *src_pal = NULL;
DDSURFACEDESC *src_desc, *dst_desc; DDSURFACEDESC *src_desc, *dst_desc;
TRACE("Copying surface %p to surface %p (mipmap level %d).\n", TRACE("Copying surface %p to surface %p (mipmap level %d).\n",
@ -5082,24 +5081,19 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
/* Get the palettes */ /* Get the palettes */
wined3d_dst_pal = wined3d_surface_get_palette(dst_surface->wined3d_surface); wined3d_dst_pal = wined3d_surface_get_palette(dst_surface->wined3d_surface);
if (wined3d_dst_pal)
dst_pal = wined3d_palette_get_parent(wined3d_dst_pal);
wined3d_src_pal = wined3d_surface_get_palette(src_surface->wined3d_surface); wined3d_src_pal = wined3d_surface_get_palette(src_surface->wined3d_surface);
if (wined3d_src_pal)
src_pal = wined3d_palette_get_parent(wined3d_src_pal);
if (src_pal) if (wined3d_src_pal)
{ {
PALETTEENTRY palent[256]; PALETTEENTRY palent[256];
if (!dst_pal) if (!wined3d_dst_pal)
{ {
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return DDERR_NOPALETTEATTACHED; return DDERR_NOPALETTEATTACHED;
} }
IDirectDrawPalette_GetEntries(src_pal, 0, 0, 256, palent); wined3d_palette_get_entries(wined3d_src_pal, 0, 0, 256, palent);
IDirectDrawPalette_SetEntries(dst_pal, 0, 0, 256, palent); wined3d_palette_set_entries(wined3d_dst_pal, 0, 0, 256, palent);
} }
/* Copy one surface on the other */ /* Copy one surface on the other */