Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
02b9988f
Commit
02b9988f
authored
Apr 08, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 09, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Simplify updating palette entries in d3d_texture2_Load().
parent
cd0c18f5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
surface.c
dlls/ddraw/surface.c
+4
-10
No files found.
dlls/ddraw/surface.c
View file @
02b9988f
...
...
@@ -5071,7 +5071,6 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
for
(;;)
{
struct
wined3d_palette
*
wined3d_dst_pal
,
*
wined3d_src_pal
;
IDirectDrawPalette
*
dst_pal
=
NULL
,
*
src_pal
=
NULL
;
DDSURFACEDESC
*
src_desc
,
*
dst_desc
;
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 */
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
);
if
(
wined3d_src_pal
)
src_pal
=
wined3d_palette_get_parent
(
wined3d_src_pal
);
if
(
src_pal
)
if
(
wined3d_
src_pal
)
{
PALETTEENTRY
palent
[
256
];
if
(
!
dst_pal
)
if
(
!
wined3d_
dst_pal
)
{
wined3d_mutex_unlock
();
return
DDERR_NOPALETTEATTACHED
;
}
IDirectDrawPalette_GetEntries
(
src_pal
,
0
,
0
,
256
,
palent
);
IDirectDrawPalette_SetEntries
(
dst_pal
,
0
,
0
,
256
,
palent
);
wined3d_palette_get_entries
(
wined3d_
src_pal
,
0
,
0
,
256
,
palent
);
wined3d_palette_set_entries
(
wined3d_
dst_pal
,
0
,
0
,
256
,
palent
);
}
/* Copy one surface on the other */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment