wined3d: Fix incorrect indentation of several break statements in in set_tex_op.
Gerald Pfeifer
gerald at pfeifer.com
Sun Jan 10 05:22:46 CST 2016
GCC 6 will have a new warning -Wmisleading-indentation, active by
default, that warns
"when the indentation of the code does not reflect the block
structure."
In case of Wine we have a few dozen warnings which I plan to look
into one by one, since they may be false positives (in which case
I'll look into changing formatting) or real issues with the code.
dlls/wined3d/state.c is the first file I looked into, and here we
get warnings of the following kind:
state.c: In function ‘set_tex_op’:
state.c:2770:17: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]
break;
^~~~~
state.c:2768:15: note: ...this ‘else’ clause, but it is not
} else
^~~~
This appears to be simply odd formatting, addressed by the patch below.
Gerald
Signed-off-by: Gerald Pfeifer <gerald at pfeifer.com>
---
dlls/wined3d/state.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 47afa42..1d80fa0 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -2767,7 +2767,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
- break;
+ break;
case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM:
if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3])
{
@@ -2789,7 +2789,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
- break;
+ break;
case WINED3D_TOP_MODULATE_ALPHA_ADD_COLOR:
if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3])
{
@@ -2817,7 +2817,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
- break;
+ break;
case WINED3D_TOP_MODULATE_COLOR_ADD_ALPHA:
if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3])
{
@@ -2845,7 +2845,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
- break;
+ break;
case WINED3D_TOP_MODULATE_INVALPHA_ADD_COLOR:
if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3])
{
@@ -2873,7 +2873,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
- break;
+ break;
case WINED3D_TOP_MODULATE_INVCOLOR_ADD_ALPHA:
if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3])
{
@@ -2907,7 +2907,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
- break;
+ break;
case WINED3D_TOP_MULTIPLY_ADD:
if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3])
{
@@ -2929,7 +2929,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined
checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
} else
Handled = FALSE;
- break;
+ break;
case WINED3D_TOP_BUMPENVMAP_LUMINANCE:
case WINED3D_TOP_BUMPENVMAP:
if (gl_info->supported[NV_TEXTURE_SHADER2])
--
2.6.4
More information about the wine-patches
mailing list