Changeset 81576 in vbox for trunk

Timestamp:

Oct 29, 2019 10:34:03 PM (5 years ago)

Author:

vboxsync

Message:

Additions/3D/mesa: Deal with the coordinate system differences between the D3D state tracker and the SVGA driver. bugref:8893

File:

• trunk/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/gallium/state_trackers/nine/nine_state.c (modified) (4 diffs)

trunk/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/gallium/state_trackers/nine/nine_state.c

@@ -1351 +1351 @@
     blit.scissor_enable = FALSE;
 
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+    /* Flip Y because the state tracker uses the D3D texture coords:
+     * top,left=0,0; bottom,right = 1,1.
+     * While the blit draws a quad using the source as texture and sets
+     * the texcoords for destination vertices using the OpenGL coordinates:
+     * bottom,left = 0,0; top,right = 1,1.
+     */
+    {
+        struct pipe_blit_info b = blit;
+
+        b.dst.box.y = b.dst.resource->height0 - b.dst.box.y - b.dst.box.height;
+
+        b.src.box.y = b.src.resource->height0 - b.src.box.y;
+        b.src.box.height = -b.src.box.height;
+
+        context->pipe->blit(context->pipe, &b);
+    }
+#else
     context->pipe->blit(context->pipe, &blit);
+#endif
 }
 
@@ -2499 +2518 @@
 
             DBG("Clearing (%u..%u)x(%u..%u)\n", x1, x2, y1, y2);
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+            /* Flip Y because the nine state tracker uses the D3D coords:
+             * top,left=0,0; bottom,right = 1,1.
+             * While the clear_render_target draws a quad and sets the texcoords
+             * for the destination vertices using the OpenGL coordinates:
+             * bottom,left = 0,0; top,right = 1,1.
+             */
+            unsigned const height = y2 - y1;
+            y1 = cbuf->height - y1 - height;
+            pipe->clear_render_target(pipe, cbuf, &rgba,
+                                      x1, y1, x2 - x1, height, false);
+#else
             pipe->clear_render_target(pipe, cbuf, &rgba,
                                       x1, y1, x2 - x1, y2 - y1, false);
+#endif
         }
     }
@@ -2526 +2558 @@
         zsbuf = NineSurface9_GetSurface(zsbuf_surf, 0);
         assert(zsbuf);
+
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+        /* Flip Y because the nine state tracker uses the D3D coords:
+         * top,left=0,0; bottom,right = 1,1.
+         * While the clear_depth_stencil draws a quad and sets the texcoords
+         * for the destination vertices using the OpenGL coordinates:
+         * bottom,left = 0,0; top,right = 1,1.
+         */
+        unsigned const height = y2 - y1;
+        y1 = zsbuf->height - y1 - height;
+        pipe->clear_depth_stencil(pipe, zsbuf, bufs, Z, Stencil,
+                                  x1, y1, x2 - x1, height, false);
+#else
         pipe->clear_depth_stencil(pipe, zsbuf, bufs, Z, Stencil,
                                   x1, y1, x2 - x1, y2 - y1, false);
+#endif
     }
     return;
@@ -2667 +2713 @@
     (void) src;
 
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+    /* This seems to work correctly and does not require Y flip. */
+#endif
     context->pipe->resource_copy_region(context->pipe,
             dst_res, dst_level,