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
fb8812db
Commit
fb8812db
authored
Mar 18, 2010
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Mar 19, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of d3dfmt_get_conv in RealizePalette.
parent
27a96e47
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
13 deletions
+4
-13
surface.c
dlls/wined3d/surface.c
+4
-13
No files found.
dlls/wined3d/surface.c
View file @
fb8812db
...
...
@@ -4355,19 +4355,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface)
if
(
This
->
resource
.
format_desc
->
format
==
WINED3DFMT_P8_UINT
||
This
->
resource
.
format_desc
->
format
==
WINED3DFMT_P8_UINT_A8_UNORM
)
{
int
bpp
;
GLenum
format
,
internal
,
type
;
CONVERT_TYPES
convert
;
/* Check if we are using a RTL mode which uses texturing for uploads */
BOOL
use_texture
=
(
wined3d_settings
.
rendertargetlock_mode
==
RTL_READTEX
);
/* Check if we have hardware palette conversion if we have convert is set to NO_CONVERSION */
d3dfmt_get_conv
(
This
,
TRUE
,
use_texture
,
&
format
,
&
internal
,
&
type
,
&
convert
,
&
bpp
,
FALSE
);
if
((
This
->
resource
.
usage
&
WINED3DUSAGE_RENDERTARGET
)
&&
(
convert
==
NO_CONVERSION
))
{
IWineD3DDeviceImpl
*
device
=
This
->
resource
.
device
;
if
((
This
->
resource
.
usage
&
WINED3DUSAGE_RENDERTARGET
)
&&
device
->
blitter
->
color_fixup_supported
(
&
device
->
adapter
->
gl_info
,
This
->
resource
.
format_desc
->
color_fixup
))
{
struct
wined3d_context
*
context
;
/* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */
...
...
@@ -4378,7 +4369,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface)
/* Re-upload the palette */
context
=
context_acquire
(
device
,
NULL
,
CTXUSAGE_RESOURCELOAD
);
d3dfmt_p8_upload_palette
(
iface
,
context
->
gl_info
,
convert
);
d3dfmt_p8_upload_palette
(
iface
,
context
->
gl_info
,
NO_CONVERSION
);
context_release
(
context
);
}
else
{
if
(
!
(
This
->
Flags
&
SFLAG_INSYSMEM
))
{
...
...
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