Commit 0b15963b authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Get rid of redundant comparisons against FALSE.

parent b68d2577
...@@ -5313,7 +5313,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio ...@@ -5313,7 +5313,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio
bool_const = get_bool_const(ins, This, ins->src[0].reg.idx); bool_const = get_bool_const(ins, This, ins->src[0].reg.idx);
if(ins->src[0].modifiers == WINED3DSPSM_NOT) bool_const = !bool_const; if(ins->src[0].modifiers == WINED3DSPSM_NOT) bool_const = !bool_const;
if(!priv->muted && bool_const == FALSE) if (!priv->muted && !bool_const)
{ {
shader_addline(buffer, "#if(FALSE){\n"); shader_addline(buffer, "#if(FALSE){\n");
priv->muted = TRUE; priv->muted = TRUE;
......
...@@ -81,7 +81,8 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) ...@@ -81,7 +81,8 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface)
* this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution
* before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params
*/ */
if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { if (!This->presentParms.Windowed && This->presentParms.AutoRestoreDisplayMode)
{
mode.Width = This->orig_width; mode.Width = This->orig_width;
mode.Height = This->orig_height; mode.Height = This->orig_height;
mode.RefreshRate = 0; mode.RefreshRate = 0;
......
...@@ -65,7 +65,8 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface) ...@@ -65,7 +65,8 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface)
* this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution
* before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params
*/ */
if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { if (!This->presentParms.Windowed && This->presentParms.AutoRestoreDisplayMode)
{
mode.Width = This->orig_width; mode.Width = This->orig_width;
mode.Height = This->orig_height; mode.Height = This->orig_height;
mode.RefreshRate = 0; mode.RefreshRate = 0;
......
...@@ -2880,7 +2880,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting ...@@ -2880,7 +2880,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
memset(&settings->op[i], 0xff, sizeof(settings->op[i])); memset(&settings->op[i], 0xff, sizeof(settings->op[i]));
} }
if(stateblock->renderState[WINED3DRS_FOGENABLE] == FALSE) { if (!stateblock->renderState[WINED3DRS_FOGENABLE])
{
settings->fog = FOG_OFF; settings->fog = FOG_OFF;
} else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { } else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) {
if(use_vs(stateblock) || ((IWineD3DVertexDeclarationImpl *) stateblock->vertexDecl)->position_transformed) { if(use_vs(stateblock) || ((IWineD3DVertexDeclarationImpl *) stateblock->vertexDecl)->position_transformed) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment