Changeset 56947 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 15, 2015 7:12:26 PM (10 years ago)

Author:

vboxsync

Message:

vmsvga3dShaderSet: Restore fix, i.e. when pContext is not NULL.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-ogl.cpp (modified) (1 diff)
• DevVGA-SVGA3d-shared.h (modified) (2 diffs)

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

@@ -7661 +7661 @@
     Log(("vmsvga3dShaderSet cid=%x type=%s shid=%d\n", cid, (type == SVGA3D_SHADERTYPE_VS) ? "VERTEX" : "PIXEL", shid));
 
-    if (  !pContext
+    if (   !pContext
         && cid < pState->cContexts
         && pState->papContexts[cid]->id == cid)
         pContext = pState->papContexts[cid];
-    else
-    {
+    else if (!pContext)
+    {
+        AssertMsgFailed(("cid=%#x cContexts=%#x\n", cid, pState->cContexts));
         Log(("vmsvga3dShaderSet invalid context id!\n"));
         return VERR_INVALID_PARAMETER;

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

@@ -14 +14 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-#ifndef __DEVVMWARE3D_STATE_H__
-#define __DEVVMWARE3D_STATE_H__
+
+#ifndef ___DevVGA_SVGA3d_shared_h___
+#define ___DevVGA_SVGA3d_shared_h___
 
 int vmsvga3dLoadExec(PVGASTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
@@ -810 +811 @@
 
 
-#endif  /* __DEVVMWARE3D_STATE_H__ */
+#endif /* !___DevVGA_SVGA3d_shared_h___ */
+