Changeset 68994 in vbox

Timestamp:

Oct 5, 2017 2:20:22 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

118263

Message:

Fix switch statement fall-through warnings with gcc 7.2.
bugref:8192: gcc warnings

gcc 7.1 and later add a switch statement fall-through warning level, which
-Wall sets to level 3. At this level, fall-throughs have to have at least
a comment following particular requirements (see gcc manual). This change
fixes a few places in the code to meet these requirements. Currently this
warning prevents building with kObjCache enabled, as the compiler checks
the comments in the source, which are stripped out by the object cache.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-info.cpp (modified) (1 diff)
• DevVGA-SVGA3d-ogl.cpp (modified) (5 diffs)
• DevVGA-SVGA3d-savedstate.cpp (modified) (1 diff)
• shaderlib/glsl_shader.c (modified) (4 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp

@@ -1270 +1270 @@
                     break;
                 default:
-                    AssertFailed();
+                    AssertFailed();  /* Fall through */
                 case 'b': //SVGA3dBlendOp
                 case 'e': //SVGA3dBlendEquation

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -4202 +4202 @@
             if (pContext->state.aRenderState[SVGA3D_RS_BLENDENABLE].uintValue != 0)
                 continue;   /* ignore if blend is already enabled */
-            /* no break */
-        }
+        }  /* Fall through */
 
         case SVGA3D_RS_BLENDENABLE:            /* SVGA3dBool */
@@ -5797 +5796 @@
     case SVGA3D_DECLTYPE_UBYTE4N:
         normalized = GL_TRUE;
-        /* no break */
+        /* Fall through */
     case SVGA3D_DECLTYPE_UBYTE4:
         size = 4;
@@ -5805 +5804 @@
     case SVGA3D_DECLTYPE_SHORT2N:
         normalized = GL_TRUE;
-        /* no break */
+        /* Fall through */
     case SVGA3D_DECLTYPE_SHORT2:
         size = 2;
@@ -5813 +5812 @@
     case SVGA3D_DECLTYPE_SHORT4N:
         normalized = GL_TRUE;
-        /* no break */
+        /* Fall through */
     case SVGA3D_DECLTYPE_SHORT4:
         size = 4;
@@ -6208 +6207 @@
             case SVGA3D_DECLUSAGE_POSITIONT:
                 Log(("ShaderSetPositionTransformed: (%d,%d)\n", pContext->state.RectViewPort.w, pContext->state.RectViewPort.h));
+                /* Fall through */
             case SVGA3D_DECLUSAGE_POSITION:
                 ShaderSetPositionTransformed(pContext->pShaderContext, pContext->state.RectViewPort.w,

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-savedstate.cpp

@@ -756 +756 @@
                         default:
                             AssertFailed();
-                            /* no break */
+                            /* Fall through */
                         case SVGA3D_SURFACE_HINT_DEPTHSTENCIL:
                         case SVGA3D_SURFACE_HINT_DEPTHSTENCIL | SVGA3D_SURFACE_HINT_TEXTURE:

trunk/src/VBox/Devices/Graphics/shaderlib/glsl_shader.c

@@ -519 +519 @@
                     break;
                 }
-            }
+            }  /* Fall through */
 
             case HEAP_NODE_TRAVERSE_RIGHT:
@@ -535 +535 @@
                     break;
                 }
-            }
+            }  /* Fall through */
 
             case HEAP_NODE_POP:
@@ -595 +595 @@
                     break;
                 }
-            }
+            }  /* Fall through */
 
             case HEAP_NODE_TRAVERSE_RIGHT:
@@ -610 +610 @@
                     break;
                 }
-            }
+            }  /* Fall through */
 
             case HEAP_NODE_POP: