Changeset 81618 in vbox

Timestamp:

Nov 1, 2019 12:54:34 AM (5 years ago)

Author:

vboxsync

Message:

Additions/3D/mesa: Deal with the coordinate system differences between the SVGA device and gallium utils. bugref:8893

Location:

trunk/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/gallium

Files:

• drivers/svga/svga_pipe_blit.c (modified) (1 diff)
• drivers/svga/svga_pipe_clear.c (modified) (6 diffs)
• state_trackers/nine/nine_state.c (modified) (6 diffs)

trunk/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/gallium/drivers/svga/svga_pipe_blit.c

@@ -609 +609 @@
    svga_toggle_render_condition(svga, blit.render_condition_enable, FALSE);
 
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+   /* Flip Y.
+    *
+    * util_blitter draws a textured quad using the source as the texture and sets
+    * the texcoords for the destination quad vertices using OpenGL texture coordinates:
+    * bottom,left = 0,0; top,right = 1,1.
+    *
+    * But the VMSVGA device uses the uses D3D texture coords:
+    * top,left=0,0; bottom,right = 1,1.
+    */
+   blit.dst.box.y = u_minify(dst->height0, blit.dst.level) - blit.dst.box.y - blit.dst.box.height;
+
+   blit.src.box.y = u_minify(src->height0, blit.src.level) - blit.src.box.y;
+   blit.src.box.height = -blit.src.box.height;
+#endif
    util_blitter_blit(svga->blitter, &blit);
 

trunk/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/gallium/drivers/svga/svga_pipe_clear.c

@@ -352 +352 @@
                                        &svga->curr.framebuffer);
          begin_blit(svga);
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+         /* Flip Y.
+          *
+          * util_blitter draws a quad using OpenGL coordinates: y up.
+          *
+          * But the VMSVGA device uses the D3D coords: y down.
+          */
+         unsigned dsty = dsv->height - box->y - box->height;
+         util_blitter_clear_depth_stencil(svga->blitter,
+                                          dsv, clear_flags,
+                                          depth,stencil,
+                                          box->x, dsty,
+                                          box->width, box->height);
+#else
          util_blitter_clear_depth_stencil(svga->blitter,
                                           dsv, clear_flags,
@@ -357 +371 @@
                                           box->x, box->y,
                                           box->width, box->height);
+#endif
       }
    }
@@ -428 +443 @@
                                           &svga->curr.framebuffer);
             begin_blit(svga);
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+            /* Flip Y. See comment in svga_clear_texture */
+            unsigned dsty = rtv->height - box->y - box->height;
+            util_blitter_clear_render_target(svga->blitter,
+                                             rtv,
+                                             &color,
+                                             box->x, dsty,
+                                             box->width, box->height);
+#else
             util_blitter_clear_render_target(svga->blitter,
                                              rtv,
@@ -433 +457 @@
                                              box->x, box->y,
                                              box->width, box->height);
+#endif
          }
          else {
@@ -501 +526 @@
    util_blitter_save_framebuffer(svga->blitter, &svga->curr.framebuffer);
 
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+   /* Flip Y. See comment in svga_clear_texture */
+   dsty = dst->height - dsty - height;
+#endif
    util_blitter_clear_render_target(svga->blitter, dst, color,
                                     dstx, dsty, width, height);
@@ -566 +595 @@
     begin_blit(svga);
     util_blitter_save_framebuffer(svga->blitter, &svga->curr.framebuffer);
+
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+    /* Flip Y. See comment in svga_clear_texture */
+    dsty = dst->height - dsty - height;
+#endif
     util_blitter_clear_depth_stencil(svga->blitter,
                                      dst, clear_flags,

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
 }
 
@@ -2518 +2499 @@
 
             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
         }
     }
@@ -2559 +2527 @@
         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;
@@ -2713 +2668 @@
     (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,
@@ -2733 +2685 @@
     (void) src;
 
-#ifdef VBOX_WITH_MESA3D_NINE_SVGA
-    /* Flip Y because the state tracker uses D3D texture coords:
-     * top,left=0,0; bottom,right = 1,1.
-     * While the blit draws a quad using the source as texture and sets
-     * texcoords for destination vertices using 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
 }
 
@@ -2769 +2702 @@
     d3dcolor_to_pipe_color_union(&rgba, color);
     surf = NineSurface9_GetSurface(surface, 0);
-#ifdef VBOX_WITH_MESA3D_NINE_SVGA
-    /* Flip Y because the nine state tracker uses D3D coords:
-     * top,left=0,0; bottom,right = 1,1.
-     * While the clear_render_target draws a quad sets texcoords
-     * for destination vertices using OpenGL coordinates:
-     * bottom,left = 0,0; top,right = 1,1.
-     */
-    /** @todo Figure out how to avoid such mismatches in a generic way. */
-    y = surf->height - y - height;
-#endif
     context->pipe->clear_render_target(context->pipe, surf, &rgba, x, y, width, height, false);
 }