Changeset 86307 in vbox for trunk/src/VBox/Additions/3D/win/VBoxSVGA/winsys

Timestamp:

Sep 26, 2020 3:26:55 PM (4 years ago)

Author:

vboxsync

Message:

WDDM: cleanup. bugref:9830

Location:

trunk/src/VBox/Additions/3D/win/VBoxSVGA/winsys

Files:

• vmw_screen_ioctl.c (modified) (14 diffs)
• vmw_screen_wddm.c (modified) (2 diffs)

trunk/src/VBox/Additions/3D/win/VBoxSVGA/winsys/vmw_screen_ioctl.c

@@ -127 +127 @@
     createParms.usage = (uint32_t) usage;
 
-    assert(numFaces * numMipLevels < GA_MAX_SURFACE_FACES*
-           GA_MAX_MIP_LEVELS);
+    if (numFaces * numMipLevels >= GA_MAX_SURFACE_FACES*GA_MAX_MIP_LEVELS) {
+        return (uint32_t)-1;
+    }
     cur_size = sizes;
     for (iFace = 0; iFace < numFaces; ++iFace) {
@@ -170 +171 @@
 {
     RT_NOREF10(vws, flags, format, usage, size, numFaces, numMipLevels, sampleCount, buffer_handle, p_region);
-    ASMBreakpoint();
     // guest-backed surface
     // DeviceCallbacks.pfnAllocateCb(pDevice->hDevice, pDdiAllocate);
-    return 0;
+    return (uint32_t)-1;
 }
 
@@ -196 +196 @@
 {
     RT_NOREF4(vws, whandle, req, needs_unref);
-    ASMBreakpoint();
     // ???
     return -1;
@@ -225 +224 @@
 {
     RT_NOREF7(vws, whandle, flags, format, numMipLevels, handle, p_region);
-    ASMBreakpoint();
     // ??? DeviceCallbacks.pfnLockCb(pDevice->hDevice, );
     return -1;
@@ -301 +299 @@
 
     if (ret) {
-       ASMBreakpoint();
        vmw_error("IOCTL failed %d: %s\n", ret, strerror(-ret));
        goto out_err1;
@@ -347 +344 @@
     if (region->data == NULL)
     {
-       ASMBreakpoint(); /* Should not get here. */
+       /* Should not get here. */
        return NULL;
     }
@@ -385 +382 @@
 {
     RT_NOREF4(region, dont_block, readonly, allow_cs);
-    ASMBreakpoint();
     // ???
     return -1;
@@ -403 +399 @@
 {
     RT_NOREF3(region, readonly, allow_cs);
-    ASMBreakpoint();
     // ???
     return;
@@ -477 +472 @@
 {
     RT_NOREF3(vws, type, code_len);
-    ASMBreakpoint();
     // DeviceCallbacks.pfnAllocateCb(pDevice->hDevice, pDdiAllocate);
     return 0;
@@ -486 +480 @@
 {
     RT_NOREF2(vws, shid);
-    ASMBreakpoint();
     // ??? DeviceCallbacks.pfnDeallocateCb(pDevice->hDevice, pDdiAllocate);
     return;
@@ -516 +509 @@
       for (offset = 0; capsBlock[offset] != 0; offset += capsBlock[offset]) {
          const SVGA3dCapsRecord *record;
-         assert(offset < SVGA_FIFO_3D_CAPS_SIZE);
+         if (offset >= SVGA_FIFO_3D_CAPS_SIZE)
+            break;
          record = (const SVGA3dCapsRecord *) (capsBlock + offset);
          if ((record->header.type >= SVGA3DCAPS_RECORD_DEVCAPS_MIN) &&
@@ -602 +596 @@
             break;
         case DRM_VMW_PARAM_VGPU10:
-            gp_arg->value = 1;
+            gp_arg->value = 0;
             break;
         default: return -1;
@@ -613 +607 @@
 {
     /* DRM_VMW_GET_3D_CAP */
-    /// @todo HwInfo.au32Caps if SVGA_CAP_GBOBJECTS is set.
     memcpy(pvCap, &vws_wddm->HwInfo.au32Fifo[SVGA_FIFO_3D_CAPS], cbCap);
     return 0;
@@ -659 +652 @@
    vws->ioctl.hwversion = gp_arg.value;
 
-   memset(&gp_arg, 0, sizeof(gp_arg));
-   gp_arg.param = DRM_VMW_PARAM_HW_CAPS;
-   ret = vboxGetParam(vws_wddm, &gp_arg);
-   if (ret)
-      vws->base.have_gb_objects = FALSE;
-   else
-      vws->base.have_gb_objects =
-         !!(gp_arg.value & (uint64_t) SVGA_CAP_GBOBJECTS);
+   //memset(&gp_arg, 0, sizeof(gp_arg));
+   //gp_arg.param = DRM_VMW_PARAM_HW_CAPS;
+   //ret = vboxGetParam(vws_wddm, &gp_arg);
+   //if (ret)
+   //   vws->base.have_gb_objects = FALSE;
+   //else
+   //   vws->base.have_gb_objects =
+   //      !!(gp_arg.value & (uint64_t) SVGA_CAP_GBOBJECTS);
+   /* The driver does not support this feature. */
+   vws->base.have_gb_objects = FALSE;
    
    if (vws->base.have_gb_objects && !drm_gb_capable)

trunk/src/VBox/Additions/3D/win/VBoxSVGA/winsys/vmw_screen_wddm.c

@@ -107 +107 @@
 {
     RT_NOREF3(sws, whandle, format);
-    ASMBreakpoint();
     return 0;
 }
@@ -117 +116 @@
 {
     RT_NOREF3(sws, whandle, format);
-    ASMBreakpoint();
     return 0;
 }