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
4ddfcc2c
Commit
4ddfcc2c
authored
Jul 26, 2012
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jul 26, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Avoid TRUE-FALSE conditional expressions.
parent
f631780d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-1
surface.c
dlls/wined3d/surface.c
+2
-2
No files found.
dlls/wined3d/arb_program_shader.c
View file @
4ddfcc2c
...
...
@@ -6999,7 +6999,7 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d
struct
wined3d_device
*
device
=
surface
->
resource
.
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
struct
arbfp_blit_priv
*
priv
=
device
->
blit_priv
;
BOOL
colorkey
=
(
surface
->
CKeyFlags
&
WINEDDSD_CKSRCBLT
)
?
TRUE
:
FALSE
;
BOOL
colorkey
=
(
surface
->
CKeyFlags
&
WINEDDSD_CKSRCBLT
)
!=
0
;
d3dfmt_p8_init_palette
(
surface
,
table
,
colorkey
);
...
...
dlls/wined3d/surface.c
View file @
4ddfcc2c
...
...
@@ -4146,7 +4146,7 @@ void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB
/* TODO: Use already acquired context when possible. */
context
=
context_acquire
(
device
,
NULL
);
surface_load
(
surface
,
srgb
==
SRGB_SRGB
?
TRUE
:
FALSE
);
surface_load
(
surface
,
srgb
==
SRGB_SRGB
);
if
(
surface
->
resource
.
pool
==
WINED3D_POOL_DEFAULT
)
{
...
...
@@ -6352,7 +6352,7 @@ static void ffp_blit_free(struct wined3d_device *device) { }
static
void
ffp_blit_p8_upload_palette
(
const
struct
wined3d_surface
*
surface
,
const
struct
wined3d_gl_info
*
gl_info
)
{
BYTE
table
[
256
][
4
];
BOOL
colorkey_active
=
(
surface
->
CKeyFlags
&
WINEDDSD_CKSRCBLT
)
?
TRUE
:
FALSE
;
BOOL
colorkey_active
=
(
surface
->
CKeyFlags
&
WINEDDSD_CKSRCBLT
)
!=
0
;
GLenum
target
;
if
(
surface
->
container
.
type
==
WINED3D_CONTAINER_TEXTURE
)
...
...
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