[Vulkan] Point sprite geometry shader

Srivats728 · Jul 26, 2022 · 9fa41c2 · 9fa41c2
1 parent f248e23
commit 9fa41c2
Show file tree

Hide file tree

Showing 6 changed files with 591 additions and 94 deletions.
diff --git a/src/xenia/gpu/d3d12/d3d12_command_processor.cc b/src/xenia/gpu/d3d12/d3d12_command_processor.cc
@@ -3160,8 +3160,6 @@ void D3D12CommandProcessor::UpdateSystemConstantValues(
   const RegisterFile& regs = *register_file_;
   auto pa_cl_clip_cntl = regs.Get<reg::PA_CL_CLIP_CNTL>();
   auto pa_cl_vte_cntl = regs.Get<reg::PA_CL_VTE_CNTL>();
-  auto pa_su_point_minmax = regs.Get<reg::PA_SU_POINT_MINMAX>();
-  auto pa_su_point_size = regs.Get<reg::PA_SU_POINT_SIZE>();
   auto pa_su_sc_mode_cntl = regs.Get<reg::PA_SU_SC_MODE_CNTL>();
   float rb_alpha_ref = regs[XE_GPU_REG_RB_ALPHA_REF].f32;
   auto rb_colorcontrol = regs.Get<reg::RB_COLORCONTROL>();
@@ -3365,43 +3363,47 @@ void D3D12CommandProcessor::UpdateSystemConstantValues(
   }
 
   // Point size.
-  float point_vertex_diameter_min =
-      float(pa_su_point_minmax.min_size) * (2.0f / 16.0f);
-  float point_vertex_diameter_max =
-      float(pa_su_point_minmax.max_size) * (2.0f / 16.0f);
-  float point_constant_diameter_x =
-      float(pa_su_point_size.width) * (2.0f / 16.0f);
-  float point_constant_diameter_y =
-      float(pa_su_point_size.height) * (2.0f / 16.0f);
-  dirty |=
-      system_constants_.point_vertex_diameter_min != point_vertex_diameter_min;
-  dirty |=
-      system_constants_.point_vertex_diameter_max != point_vertex_diameter_max;
-  dirty |=
-      system_constants_.point_constant_diameter[0] != point_constant_diameter_x;
-  dirty |=
-      system_constants_.point_constant_diameter[1] != point_constant_diameter_y;
-  system_constants_.point_vertex_diameter_min = point_vertex_diameter_min;
-  system_constants_.point_vertex_diameter_max = point_vertex_diameter_max;
-  system_constants_.point_constant_diameter[0] = point_constant_diameter_x;
-  system_constants_.point_constant_diameter[1] = point_constant_diameter_y;
-  // 2 because 1 in the NDC is half of the viewport's axis, 0.5 for diameter to
-  // radius conversion to avoid multiplying the per-vertex diameter by an
-  // additional constant in the shader.
-  float point_screen_diameter_to_ndc_radius_x =
-      (/* 0.5f * 2.0f * */ float(draw_resolution_scale_x)) /
-      std::max(viewport_info.xy_extent[0], uint32_t(1));
-  float point_screen_diameter_to_ndc_radius_y =
-      (/* 0.5f * 2.0f * */ float(draw_resolution_scale_y)) /
-      std::max(viewport_info.xy_extent[1], uint32_t(1));
-  dirty |= system_constants_.point_screen_diameter_to_ndc_radius[0] !=
-           point_screen_diameter_to_ndc_radius_x;
-  dirty |= system_constants_.point_screen_diameter_to_ndc_radius[1] !=
-           point_screen_diameter_to_ndc_radius_y;
-  system_constants_.point_screen_diameter_to_ndc_radius[0] =
-      point_screen_diameter_to_ndc_radius_x;
-  system_constants_.point_screen_diameter_to_ndc_radius[1] =
-      point_screen_diameter_to_ndc_radius_y;
+  if (vgt_draw_initiator.prim_type == xenos::PrimitiveType::kPointList) {
+    auto pa_su_point_minmax = regs.Get<reg::PA_SU_POINT_MINMAX>();
+    auto pa_su_point_size = regs.Get<reg::PA_SU_POINT_SIZE>();
+    float point_vertex_diameter_min =
+        float(pa_su_point_minmax.min_size) * (2.0f / 16.0f);
+    float point_vertex_diameter_max =
+        float(pa_su_point_minmax.max_size) * (2.0f / 16.0f);
+    float point_constant_diameter_x =
+        float(pa_su_point_size.width) * (2.0f / 16.0f);
+    float point_constant_diameter_y =
+        float(pa_su_point_size.height) * (2.0f / 16.0f);
+    dirty |= system_constants_.point_vertex_diameter_min !=
+             point_vertex_diameter_min;
+    dirty |= system_constants_.point_vertex_diameter_max !=
+             point_vertex_diameter_max;
+    dirty |= system_constants_.point_constant_diameter[0] !=
+             point_constant_diameter_x;
+    dirty |= system_constants_.point_constant_diameter[1] !=
+             point_constant_diameter_y;
+    system_constants_.point_vertex_diameter_min = point_vertex_diameter_min;
+    system_constants_.point_vertex_diameter_max = point_vertex_diameter_max;
+    system_constants_.point_constant_diameter[0] = point_constant_diameter_x;
+    system_constants_.point_constant_diameter[1] = point_constant_diameter_y;
+    // 2 because 1 in the NDC is half of the viewport's axis, 0.5 for diameter
+    // to radius conversion to avoid multiplying the per-vertex diameter by an
+    // additional constant in the shader.
+    float point_screen_diameter_to_ndc_radius_x =
+        (/* 0.5f * 2.0f * */ float(draw_resolution_scale_x)) /
+        std::max(viewport_info.xy_extent[0], uint32_t(1));
+    float point_screen_diameter_to_ndc_radius_y =
+        (/* 0.5f * 2.0f * */ float(draw_resolution_scale_y)) /
+        std::max(viewport_info.xy_extent[1], uint32_t(1));
+    dirty |= system_constants_.point_screen_diameter_to_ndc_radius[0] !=
+             point_screen_diameter_to_ndc_radius_x;
+    dirty |= system_constants_.point_screen_diameter_to_ndc_radius[1] !=
+             point_screen_diameter_to_ndc_radius_y;
+    system_constants_.point_screen_diameter_to_ndc_radius[0] =
+        point_screen_diameter_to_ndc_radius_x;
+    system_constants_.point_screen_diameter_to_ndc_radius[1] =
+        point_screen_diameter_to_ndc_radius_y;
+  }
 
   // Texture signedness / gamma.
   bool gamma_render_target_as_srgb =