Changeset 98906 in vbox for trunk/src

Timestamp:

Mar 10, 2023 4:18:56 PM (22 months ago)

Author:

vboxsync

Message:

Additions/3D/mesa: D3D9 fixes

Location:

trunk/src/VBox/Additions/3D/mesa

Files:

trunk/src/VBox/Additions/3D/mesa/Makefile.kmk

-              r98416
+              r98906
         $(VBOX_MESA)/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
+VBoxMesaSVGALib_SOURCES.debug  += \
+        $(VBOX_MESA)/src/gallium/drivers/svga/svgadump/svga_dump.c \
+        $(VBOX_MESA)/src/gallium/drivers/svga/svgadump/svga_shader_dump.c \
+        $(VBOX_MESA)/src/gallium/drivers/svga/svgadump/svga_shader_op.c
 # 32 bit lib for 64 bit build
 VBoxMesaSVGALib-x86_EXTENDS      = VBoxMesaSVGALib

-              r96488
+              r98906
    [ PIPE_FORMAT_B5G6R5_UNORM ] =          { SVGA3D_FORMAT_INVALID,      SVGA3D_B5G6R5_UNORM,         SVGA3D_B5G6R5_UNORM,         TF_GEN_MIPS },
    [ PIPE_FORMAT_R10G10B10A2_UNORM ] =     { SVGA3D_R10G10B10A2_UNORM,   SVGA3D_R10G10B10A2_UNORM,    SVGA3D_R10G10B10A2_UNORM,    TF_GEN_MIPS },
+#ifndef VBOX_WITH_MESA3D_NINE_SVGA
    [ PIPE_FORMAT_L8_UNORM ] =              { SVGA3D_FORMAT_INVALID,      SVGA3D_FORMAT_INVALID,       SVGA3D_R8_UNORM,             TF_XXX1 },
+#else
+   [ PIPE_FORMAT_L8_UNORM ] =              { SVGA3D_FORMAT_INVALID,      SVGA3D_R8_UNORM,             SVGA3D_R8_UNORM,             TF_XXX1 },
+#endif
    [ PIPE_FORMAT_A8_UNORM ] =              { SVGA3D_FORMAT_INVALID,      SVGA3D_A8_UNORM,             SVGA3D_R8_UNORM,             TF_GEN_MIPS | TF_000X},
    [ PIPE_FORMAT_I8_UNORM ] =              { SVGA3D_FORMAT_INVALID,      SVGA3D_FORMAT_INVALID,       SVGA3D_R8_UNORM,             TF_XXXX },

-              r96488
+              r98906
       int aa_point_coord_index;
       float alpha_ref;
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+      /* Make sure that this FS corresponds to a particular VS. Fixes a case when the FS was paired
+       * with one of two VSs where generics had different order. */
+      unsigned prev_shader_id;
+#endif
    } fs;

-              r96488
+              r98906
       range_max = viewport->scale[2] *  1.0f + viewport->translate[2];
       assert(range_min >= 0.0f);
+      /* 'clip_halfz' means that the svga gallium driver is a part of our D3D9 ('nine' based) user mode driver.
+       * Therefore take into account that:
+       * "In Direct3D 9, texel centers and pixel centers were a half unit apart."
+       */
+      if (svga_have_vgpu10(svga))
+      {
+          prescale->translate[0] += 0.5f;
+          prescale->translate[1] += 0.5f;
+      }
+   }
    else

-              r96488
+              r98906
       key->fs.gs_generic_outputs = svga->curr.gs->generic_outputs;
       key->fs.layer_to_zero = !svga->curr.gs->base.info.writes_layer;
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+      key->fs.prev_shader_id = svga->curr.gs->base.id;
+#endif
    } else {
       key->fs.vs_generic_outputs = svga->curr.vs->generic_outputs;
       key->fs.layer_to_zero = 1;
+#ifdef VBOX_WITH_MESA3D_NINE_SVGA
+      key->fs.prev_shader_id = svga->curr.vs->base.id;
+#endif
+   }

Note: See TracChangeset for help on using the changeset viewer.