Changeset 98051 in vbox

Timestamp:

Jan 11, 2023 5:45:06 AM (2 years ago)

Author:

vboxsync

Message:

Devices/Graphics: use the first subresource if the number of levels is not specified. bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

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

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

@@ -31 +31 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_DEV_VMSVGA
-#include <VBox/AssertGuest.h>
 #include <VBox/vmm/pdmdev.h>
 #include <iprt/errcore.h>

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

@@ -32 +32 @@
 #endif
 
+#include <VBox/AssertGuest.h>
+
 #include "DevVGA-SVGA.h"
 
@@ -196 +198 @@
 DECLINLINE(void) vmsvga3dCalcMipmapAndFace(uint32_t cMipLevels, uint32_t iSubresource, uint32_t *piMipmap, uint32_t *piFace)
 {
-    *piFace = iSubresource / cMipLevels;
-    *piMipmap = iSubresource % cMipLevels;
+    if (RT_LIKELY(cMipLevels))
+    {
+        *piFace = iSubresource / cMipLevels;
+        *piMipmap = iSubresource % cMipLevels;
+    }
+    else
+    {
+        ASSERT_GUEST_FAILED();
+        *piFace = 0;
+        *piMipmap = 0;
+    }
 }