Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
f2e03d6c
Commit
f2e03d6c
authored
Mar 25, 2008
by
Alexander Dorofeyev
Committed by
Alexandre Julliard
Mar 25, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Don't store primary surface palette in device palettes.
parent
9b913b3b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
26 deletions
+5
-26
palette.c
dlls/wined3d/palette.c
+0
-11
surface_base.c
dlls/wined3d/surface_base.c
+5
-15
No files found.
dlls/wined3d/palette.c
View file @
f2e03d6c
...
@@ -157,17 +157,6 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DW
...
@@ -157,17 +157,6 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DW
}
}
}
}
/* If the palette is the primary palette, set the entries to the device */
if
(
This
->
Flags
&
WINEDDPCAPS_PRIMARYSURFACE
)
{
unsigned
int
i
;
IWineD3DDeviceImpl
*
device
=
This
->
wineD3DDevice
;
PALETTEENTRY
*
entry
=
PalEnt
;
for
(
i
=
Start
;
i
<
Start
+
Count
;
i
++
)
{
device
->
palettes
[
device
->
currentPalette
][
i
]
=
*
entry
++
;
}
}
return
WINED3D_OK
;
return
WINED3D_OK
;
}
}
...
...
dlls/wined3d/surface_base.c
View file @
f2e03d6c
...
@@ -206,26 +206,16 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD
...
@@ -206,26 +206,16 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD
if
(
This
->
resource
.
usage
&
WINED3DUSAGE_RENDERTARGET
)
if
(
This
->
resource
.
usage
&
WINED3DUSAGE_RENDERTARGET
)
This
->
palette
->
Flags
&=
~
WINEDDPCAPS_PRIMARYSURFACE
;
This
->
palette
->
Flags
&=
~
WINEDDPCAPS_PRIMARYSURFACE
;
This
->
palette
=
PalImpl
;
if
(
PalImpl
!=
NULL
)
{
if
(
PalImpl
!=
NULL
)
{
if
(
This
->
resource
.
usage
&
WINED3DUSAGE_RENDERTARGET
)
{
if
(
This
->
resource
.
usage
&
WINED3DUSAGE_RENDERTARGET
)
{
/* Set the device's main palette if the palette
* wasn't a primary palette before
*/
if
(
!
(
PalImpl
->
Flags
&
WINEDDPCAPS_PRIMARYSURFACE
))
{
IWineD3DDeviceImpl
*
device
=
This
->
resource
.
wineD3DDevice
;
unsigned
int
i
;
for
(
i
=
0
;
i
<
256
;
i
++
)
{
device
->
palettes
[
device
->
currentPalette
][
i
]
=
PalImpl
->
palents
[
i
];
}
}
(
PalImpl
)
->
Flags
|=
WINEDDPCAPS_PRIMARYSURFACE
;
(
PalImpl
)
->
Flags
|=
WINEDDPCAPS_PRIMARYSURFACE
;
}
}
}
This
->
palette
=
PalImpl
;
return
IWineD3DSurface_RealizePalette
(
iface
);
return
IWineD3DSurface_RealizePalette
(
iface
);
}
else
return
WINED3D_OK
;
}
}
HRESULT
WINAPI
IWineD3DBaseSurfaceImpl_SetColorKey
(
IWineD3DSurface
*
iface
,
DWORD
Flags
,
WINEDDCOLORKEY
*
CKey
)
{
HRESULT
WINAPI
IWineD3DBaseSurfaceImpl_SetColorKey
(
IWineD3DSurface
*
iface
,
DWORD
Flags
,
WINEDDCOLORKEY
*
CKey
)
{
...
...
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