Changeset 62933 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Aug 3, 2016 5:01:03 PM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-internal.h (modified) (2 diffs)
• DevVGA-SVGA3d-ogl.cpp (modified) (35 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -864 +864 @@
 
 #ifdef VMSVGA3D_OPENGL
-    float                   fGLVersion;
+    float                   rsGLVersion;
     /* Current active context. */
     uint32_t                idActiveContext;
@@ -951 +951 @@
     R3PTRTYPE(char *)       pszOtherExtensions;
     /** The version of the other GL profile. */
-    float                   fOtherGLVersion;
+    float                   rsOtherGLVersion;
 
     /** Shader talk back interface. */

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

@@ -174 +174 @@
  * @param   pState              The VMSVGA3d state.
  * @param   fActualGLVersion    The actual OpenGL version we're working against.
- * @param   fMinGLVersion       The OpenGL version that introduced this feature
+ * @param   rsMinGLVersion      The OpenGL version that introduced this feature
  *                              into the core.
  * @param   pszWantedExtension  The name of the OpenGL extension we want padded
@@ -180 +180 @@
  * @remarks Init time only.
  */
-static bool vmsvga3dCheckGLExtension(PVMSVGA3DSTATE pState, float fMinGLVersion, const char *pszWantedExtension)
-{
+static bool vmsvga3dCheckGLExtension(PVMSVGA3DSTATE pState, float rsMinGLVersion, const char *pszWantedExtension)
+{
+    RT_NOREF(rsMinGLVersion);
     /* check padding. */
     Assert(pszWantedExtension[0] == ' ');
@@ -192 +193 @@
         fRet = true;
 
-    /* Temporarily.  Later start if (fMinGLVersion != 0.0 && fActualGLVersion >= fMinGLVersion) return true; */
+    /* Temporarily.  Later start if (rsMinGLVersion != 0.0 && fActualGLVersion >= rsMinGLVersion) return true; */
 #ifdef RT_OS_DARWIN
-    AssertMsg(   fMinGLVersion == 0.0
-              || fRet == (pState->fGLVersion >= fMinGLVersion)
+    AssertMsg(   rsMinGLVersion == 0.0
+              || fRet == (pState->rsGLVersion >= rsMinGLVersion)
               || VBOX_VMSVGA3D_DEFAULT_OGL_PROFILE == 2.1,
               ("%s actual:%d min:%d fRet=%d\n",
-               pszWantedExtension, (int)(pState->fGLVersion * 10), (int)(fMinGLVersion * 10), fRet));
+               pszWantedExtension, (int)(pState->rsGLVersion * 10), (int)(rsMinGLVersion * 10), fRet));
 #else
-    AssertMsg(fMinGLVersion == 0.0 || fRet == (pState->fGLVersion >= fMinGLVersion),
+    AssertMsg(rsMinGLVersion == 0.0 || fRet == (pState->rsGLVersion >= rsMinGLVersion),
               ("%s actual:%d min:%d fRet=%d\n",
-               pszWantedExtension, (int)(pState->fGLVersion * 10), (int)(fMinGLVersion * 10), fRet));
+               pszWantedExtension, (int)(pState->rsGLVersion * 10), (int)(rsMinGLVersion * 10), fRet));
 #endif
     return fRet;
@@ -484 +485 @@
         while (*pszExt)
         {
+# ifdef VBOX_STRICT
             size_t cchExt = strlen(pszExt);
             Assert(cchExt > 3);
@@ -490 +492 @@
             Assert(pszExt[cchExt - 2] != ' ');
             Assert(pszExt[cchExt - 1] == ' ');
+# endif
 
             if (strstr(*ppszExtensions, pszExt) == NULL)
@@ -633 +636 @@
     int              rc;
 
-    if (pState->fGLVersion != 0.0)
+    if (pState->rsGLVersion != 0.0)
         return VINF_SUCCESS;    /* already initialized (load state) */
 
@@ -656 +659 @@
     vmsvga3dLogRelExtensions("", pState->pszExtensions);
 
-    pState->fGLVersion = atof((const char *)glGetString(GL_VERSION));
+    pState->rsGLVersion = atof((const char *)glGetString(GL_VERSION));
 
 
@@ -682 +685 @@
     vmsvga3dLogRelExtensions("Alternative ", pState->pszOtherExtensions);
 
-    pState->fOtherGLVersion = atof((const char *)glGetString(GL_VERSION));
+    pState->rsOtherGLVersion = atof((const char *)glGetString(GL_VERSION));
 
     VMSVGA3D_SET_CURRENT_CONTEXT(pState, pContext);
 #else
     pState->pszOtherExtensions = (char *)"";
-    pState->fOtherGLVersion = pState->fGLVersion;
+    pState->rsOtherGLVersion = pState->rsGLVersion;
 #endif
 
@@ -978 +981 @@
 #endif
 
-    if (   pState->fGLVersion < 3.0
-        && pState->fOtherGLVersion < 3.0 /* darwin: legacy profile hack */)
+    if (   pState->rsGLVersion < 3.0
+        && pState->rsOtherGLVersion < 3.0 /* darwin: legacy profile hack */)
     {
         LogRel(("VMSVGA3d: unsupported OpenGL version; minimum is 3.0\n"));
@@ -1095 +1098 @@
     }
 #else
-    NOREF(pThis); NOREF(idScreen);
+    RT_NOREF(pThis, idScreen, pOldViewport);
 #endif
 }
@@ -1105 +1108 @@
  *
  * @returns Supported/indented operations (SVGA3DFORMAT_OP_XXX).
- * @param   pState3D        The 3D state.
  * @param   idx3dCaps       The SVGA3D_CAPS_XXX value of the surface format.
  *
@@ -1112 +1114 @@
  *              http://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/drivers/svga/svga_format.c
  */
-static uint32_t vmsvga3dGetSurfaceFormatSupport(PVMSVGA3DSTATE pState3D, uint32_t idx3dCaps)
+static uint32_t vmsvga3dGetSurfaceFormatSupport(uint32_t idx3dCaps)
 {
     uint32_t result = 0;
@@ -1218 +1220 @@
 static uint32_t vmsvga3dGetDepthFormatSupport(PVMSVGA3DSTATE pState3D, uint32_t idx3dCaps)
 {
-    uint32_t result = 0;
+    RT_NOREF(pState3D, idx3dCaps);
 
     /** @todo test this somehow */
-    result = SVGA3DFORMAT_OP_ZSTENCIL | SVGA3DFORMAT_OP_ZSTENCIL_WITH_ARBITRARY_COLOR_DEPTH;
+    uint32_t result = SVGA3DFORMAT_OP_ZSTENCIL | SVGA3DFORMAT_OP_ZSTENCIL_WITH_ARBITRARY_COLOR_DEPTH;
 
     Log(("CAPS: %s =\n%s\n", vmsvga3dGetCapString(idx3dCaps), vmsvga3dGet3dFormatString(result)));
@@ -1447 +1449 @@
     case SVGA3D_DEVCAP_SURFACEFMT_Z_D24S8_INT:
     case SVGA3D_DEVCAP_SURFACEFMT_DXT1:
-        *pu32Val = vmsvga3dGetSurfaceFormatSupport(pState, idx3dCaps);
+        *pu32Val = vmsvga3dGetSurfaceFormatSupport(idx3dCaps);
         break;
 
@@ -1475 +1477 @@
     case SVGA3D_DEVCAP_SURFACEFMT_NV12:
     case SVGA3D_DEVCAP_SURFACEFMT_AYUV:
-        *pu32Val = vmsvga3dGetSurfaceFormatSupport(pState, idx3dCaps);
+        *pu32Val = vmsvga3dGetSurfaceFormatSupport(idx3dCaps);
         break;
 
@@ -1928 +1930 @@
                                 PVMSVGAPACKPARAMS pSave)
 {
+    RT_NOREF(pState);
+
     /*
      * Save (ignore errors, setting the defaults we want and avoids restore).
@@ -2003 +2007 @@
                                     PCVMSVGAPACKPARAMS pSave)
 {
-    NOREF(pSurface);
+    RT_NOREF(pState, pSurface);
+
     if (pSave->iAlignment != 1)
         VMSVGA3D_ASSERT_GL_CALL(glPixelStorei(GL_UNPACK_ALIGNMENT, pSave->iAlignment), pState, pContext);
@@ -2038 +2043 @@
                               PVMSVGA3DSURFACE pSurface)
 {
+    RT_NOREF(idAssociatedContext);
     GLint activeTexture = 0;
     uint32_t idPrevCtx = pState->idActiveContext;
@@ -2127 +2133 @@
                                   SVGA3dStretchBltMode enmMode, PVMSVGA3DCONTEXT pContext)
 {
+    RT_NOREF(pThis);
+
     /* Activate the read and draw framebuffer objects. */
     pState->ext.glBindFramebuffer(GL_READ_FRAMEBUFFER, pContext->idReadFramebuffer);
@@ -2192 +2200 @@
                               PVMSVGAPACKPARAMS pSave)
 {
+    RT_NOREF(pState);
     /*
      * Save (ignore errors, setting the defaults we want and avoids restore).
@@ -2267 +2276 @@
                                   PCVMSVGAPACKPARAMS pSave)
 {
-    NOREF(pSurface);
+    RT_NOREF(pState, pSurface);
     if (pSave->iAlignment != 1)
         VMSVGA3D_ASSERT_GL_CALL(glPixelStorei(GL_PACK_ALIGNMENT, pSave->iAlignment), pState, pContext);
@@ -2309 +2318 @@
                                   SVGA3dCopyBox const *pBox, PVMSVGA3DCONTEXT pContext, int rc, int iBox)
 {
+    RT_NOREF(iBox);
     PVMSVGA3DMIPMAPLEVEL pMipLevel = &pSurface->pMipmapLevels[uHostMipmap];
 
@@ -2649 +2659 @@
     PVMSVGA3DSTATE      pState = pThis->svga.p3dState;
     PVMSVGA3DSURFACE    pSurface;
-    int                 rc = VINF_SUCCESS;
     PVMSVGA3DCONTEXT    pContext;
     uint32_t            cid;
@@ -3125 +3134 @@
      */
 #ifdef RT_OS_WINDOWS
-    BOOL ret = SwapBuffers(pContext->hdc);
-    AssertMsg(ret, ("SwapBuffers failed with %d\n", GetLastError()));
+    BOOL fRef = SwapBuffers(pContext->hdc);
+    AssertMsg(fRef, ("SwapBuffers failed with %d\n", GetLastError())); NOREF(fRef);
 #elif defined(RT_OS_DARWIN)
     vmsvga3dCocoaSwapBuffers(pContext->cocoaView, pContext->cocoaContext);
@@ -3871 +3880 @@
 int vmsvga3dSetRenderState(PVGASTATE pThis, uint32_t cid, uint32_t cRenderStates, SVGA3dRenderState *pRenderState)
 {
-    uint32_t                    val;
+    uint32_t                    val = UINT32_MAX; /* Shut up MSC. */
     PVMSVGA3DCONTEXT            pContext;
     PVMSVGA3DSTATE              pState = pThis->svga.p3dState;
@@ -3889 +3898 @@
     for (unsigned i = 0; i < cRenderStates; i++)
     {
-        GLenum enableCap = ~0U;
+        GLenum enableCap = ~(GLenum)0;
         Log(("vmsvga3dSetRenderState: cid=%x state=%s (%d) val=%x\n", cid, vmsvga3dGetRenderStateName(pRenderState[i].state), pRenderState[i].state, pRenderState[i].uintValue));
         /* Save the render state for vm state saving. */
@@ -4688 +4697 @@
         }
 
-        if (enableCap != ~0U)
+        if (enableCap != ~(GLenum)0)
         {
             if (val)
@@ -5016 +5025 @@
 int vmsvga3dSetTextureState(PVGASTATE pThis, uint32_t cid, uint32_t cTextureStates, SVGA3dTextureState *pTextureState)
 {
-    GLenum                      val;
-    GLenum                      currentStage = ~0L;
+    GLenum                      val = ~(GLenum)0; /* Shut up MSC. */
+    GLenum                      currentStage = ~(GLenum)0;
     PVMSVGA3DCONTEXT            pContext;
     PVMSVGA3DSTATE              pState = pThis->svga.p3dState;
@@ -5035 +5044 @@
     for (unsigned i = 0; i < cTextureStates; i++)
     {
-        GLenum textureType = ~0U;
-        GLenum samplerType = ~0U;
+        GLenum textureType = ~(GLenum)0;
+#if 0
+        GLenum samplerType = ~(GLenum)0;
+#endif
 
         Log(("vmsvga3dSetTextureState: cid=%x stage=%d type=%s (%x) val=%x\n", cid, pTextureState[i].stage, vmsvga3dTextureStateToString(pTextureState[i].name), pTextureState[i].name, pTextureState[i].value));
@@ -5257 +5268 @@
         }
 
-        if (textureType != ~0U)
+        if (textureType != ~(GLenum)0)
         {
             glTexParameteri(GL_TEXTURE_2D /** @todo flexible type */, textureType, val);
@@ -6139 +6150 @@
 }
 
-int vmsvga3dDrawPrimitives(PVGASTATE pThis, uint32_t cid, uint32_t numVertexDecls, SVGA3dVertexDecl *pVertexDecl, uint32_t numRanges, SVGA3dPrimitiveRange *pRange, uint32_t cVertexDivisor, SVGA3dVertexDivisor *pVertexDivisor)
-{
+int vmsvga3dDrawPrimitives(PVGASTATE pThis, uint32_t cid, uint32_t numVertexDecls, SVGA3dVertexDecl *pVertexDecl,
+                           uint32_t numRanges, SVGA3dPrimitiveRange *pRange, uint32_t cVertexDivisor,
+                           SVGA3dVertexDivisor *pVertexDivisor)
+{
+    RT_NOREF(pVertexDivisor);
     PVMSVGA3DSTATE               pState = pThis->svga.p3dState;
+    AssertReturn(pState, VERR_INTERNAL_ERROR);
     PVMSVGA3DCONTEXT             pContext;
-    AssertReturn(pState, VERR_INTERNAL_ERROR);
     int                          rc = VERR_NOT_IMPLEMENTED;
     uint32_t                     iCurrentVertex;
@@ -6169 +6183 @@
         switch (pVertexDecl[iVertex].identity.usage)
         {
-        case SVGA3D_DECLUSAGE_POSITIONT:
-            Log(("ShaderSetPositionTransformed: (%d,%d)\n", pContext->state.RectViewPort.w, pContext->state.RectViewPort.h));
-        case SVGA3D_DECLUSAGE_POSITION:
-            ShaderSetPositionTransformed(pContext->pShaderContext, pContext->state.RectViewPort.w, pContext->state.RectViewPort.h,
-                                         pVertexDecl[iVertex].identity.usage == SVGA3D_DECLUSAGE_POSITIONT);
-            break;
+            case SVGA3D_DECLUSAGE_POSITIONT:
+                Log(("ShaderSetPositionTransformed: (%d,%d)\n", pContext->state.RectViewPort.w, pContext->state.RectViewPort.h));
+            case SVGA3D_DECLUSAGE_POSITION:
+                ShaderSetPositionTransformed(pContext->pShaderContext, pContext->state.RectViewPort.w,
+                                             pContext->state.RectViewPort.h,
+                                             pVertexDecl[iVertex].identity.usage == SVGA3D_DECLUSAGE_POSITIONT);
+                break;
+            default:  /* Shut up MSC. */ break;
         }
     }
@@ -6732 +6748 @@
 int vmsvga3dQueryBegin(PVGASTATE pThis, uint32_t cid, SVGA3dQueryType type)
 {
+    RT_NOREF(pThis, cid, type);
     AssertFailed();
     return VERR_NOT_IMPLEMENTED;
@@ -6738 +6755 @@
 int vmsvga3dQueryEnd(PVGASTATE pThis, uint32_t cid, SVGA3dQueryType type, SVGAGuestPtr guestResult)
 {
+    RT_NOREF(pThis, cid, type, guestResult);
     AssertFailed();
     return VERR_NOT_IMPLEMENTED;
@@ -6744 +6762 @@
 int vmsvga3dQueryWait(PVGASTATE pThis, uint32_t cid, SVGA3dQueryType type, SVGAGuestPtr guestResult)
 {
+    RT_NOREF(pThis, cid, type, guestResult);
     AssertFailed();
     return VERR_NOT_IMPLEMENTED;