Module: wine Branch: master Commit: 4ddfcc2cf15aeb5ba466c4727c8edc5529797ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ddfcc2cf15aeb5ba466c4727c...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 26 11:28:32 2012 +0200
wined3d: Avoid TRUE-FALSE conditional expressions.
---
dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6dfee32..744b6af 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -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);
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 38795c7..07b3d3a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -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)