eden-emu
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Releases Wiki Activity
Browse Source

fix polygon lut name issue

lizzie/unity-build
lizzie 4 months ago
parent
f7c40ac8db
commit
cd0b66ecc5
2 changed files with 48 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 61
      src/video_core/renderer_vulkan/fixed_pipeline_state.cpp
  2. 36
      src/video_core/renderer_vulkan/vk_rasterizer.cpp

61
src/video_core/renderer_vulkan/fixed_pipeline_state.cpp
View File

@ -18,27 +18,6 @@
namespace Vulkan { namespace Vulkan {
namespace { namespace {
constexpr size_t POINT = 0;
constexpr size_t LINE = 1;
constexpr size_t POLYGON = 2;
constexpr std::array POLYGON_OFFSET_ENABLE_LUT = {
POINT, // Points
LINE, // Lines
LINE, // LineLoop
LINE, // LineStrip
POLYGON, // Triangles
POLYGON, // TriangleStrip
POLYGON, // TriangleFan
POLYGON, // Quads
POLYGON, // QuadStrip
POLYGON, // Polygon
LINE, // LinesAdjacency
LINE, // LineStripAdjacency
POLYGON, // TrianglesAdjacency
POLYGON, // TriangleStripAdjacency
POLYGON, // Patches
};
constexpr std::array TOPOLOGY_CLASS_REPRESENTATIVE_LUT = { constexpr std::array TOPOLOGY_CLASS_REPRESENTATIVE_LUT = {
Maxwell::PrimitiveTopology::Points, // Points Maxwell::PrimitiveTopology::Points, // Points
Maxwell::PrimitiveTopology::Lines, // Lines Maxwell::PrimitiveTopology::Lines, // Lines
@ -57,17 +36,16 @@ constexpr std::array TOPOLOGY_CLASS_REPRESENTATIVE_LUT = {
Maxwell::PrimitiveTopology::Patches, // Patches Maxwell::PrimitiveTopology::Patches, // Patches
}; };
bool IsDualSourceBlendFactor(Maxwell::Blend::Factor factor) {
using F = Maxwell::Blend::Factor;
bool IsDualSourceBlendFactor(Tegra::Engines::Maxwell3D::Regs::Blend::Factor factor) {
switch (factor) { switch (factor) {
case F::Source1Color_D3D:
case F::OneMinusSource1Color_D3D:
case F::Source1Alpha_D3D:
case F::OneMinusSource1Alpha_D3D:
case F::Source1Color_GL:
case F::OneMinusSource1Color_GL:
case F::Source1Alpha_GL:
case F::OneMinusSource1Alpha_GL:
case Tegra::Engines::Maxwell3D::Regs::Blend::Factor::Source1Color_D3D:
case Tegra::Engines::Maxwell3D::Regs::Blend::Factor::OneMinusSource1Color_D3D:
case Tegra::Engines::Maxwell3D::Regs::Blend::Factor::Source1Alpha_D3D:
case Tegra::Engines::Maxwell3D::Regs::Blend::Factor::OneMinusSource1Alpha_D3D:
case Tegra::Engines::Maxwell3D::Regs::Blend::Factor::Source1Color_GL:
case Tegra::Engines::Maxwell3D::Regs::Blend::Factor::OneMinusSource1Color_GL:
case Tegra::Engines::Maxwell3D::Regs::Blend::Factor::Source1Alpha_GL:
case Tegra::Engines::Maxwell3D::Regs::Blend::Factor::OneMinusSource1Alpha_GL:
return true; return true;
default: default:
return false; return false;
@ -357,6 +335,27 @@ void FixedPipelineState::DynamicState::Refresh2(const Maxwell& regs,
rasterize_enable.Assign(regs.rasterize_enable != 0 ? 1 : 0); rasterize_enable.Assign(regs.rasterize_enable != 0 ? 1 : 0);
primitive_restart_enable.Assign(regs.primitive_restart.enabled != 0 ? 1 : 0); primitive_restart_enable.Assign(regs.primitive_restart.enabled != 0 ? 1 : 0);
constexpr size_t ENABLE_POINT = 0;
constexpr size_t ENABLE_LINE = 1;
constexpr size_t ENABLE_POLYGON = 2;
constexpr std::array POLYGON_OFFSET_ENABLE_LUT = {
ENABLE_POINT, // Points
ENABLE_LINE, // Lines
ENABLE_LINE, // LineLoop
ENABLE_LINE, // LineStrip
ENABLE_POLYGON, // Triangles
ENABLE_POLYGON, // TriangleStrip
ENABLE_POLYGON, // TriangleFan
ENABLE_POLYGON, // Quads
ENABLE_POLYGON, // QuadStrip
ENABLE_POLYGON, // Polygon
ENABLE_LINE, // LinesAdjacency
ENABLE_LINE, // LineStripAdjacency
ENABLE_POLYGON, // TrianglesAdjacency
ENABLE_POLYGON, // TriangleStripAdjacency
ENABLE_POLYGON, // Patches
};
depth_bias_enable.Assign(enabled_lut[POLYGON_OFFSET_ENABLE_LUT[topology_index]] != 0 ? 1 : 0); depth_bias_enable.Assign(enabled_lut[POLYGON_OFFSET_ENABLE_LUT[topology_index]] != 0 ? 1 : 0);
} }

36
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@ -1531,25 +1531,25 @@ void RasterizerVulkan::UpdateDepthBiasEnable(Tegra::Engines::Maxwell3D::Regs& re
if (!state_tracker.TouchDepthBiasEnable()) { if (!state_tracker.TouchDepthBiasEnable()) {
return; return;
} }
constexpr size_t POINT = 0;
constexpr size_t LINE = 1;
constexpr size_t POLYGON = 2;
constexpr size_t ENABLE_POINT = 0;
constexpr size_t ENABLE_LINE = 1;
constexpr size_t ENABLE_POLYGON = 2;
static constexpr std::array POLYGON_OFFSET_ENABLE_LUT = { static constexpr std::array POLYGON_OFFSET_ENABLE_LUT = {
POINT, // Points
LINE, // Lines
LINE, // LineLoop
LINE, // LineStrip
POLYGON, // Triangles
POLYGON, // TriangleStrip
POLYGON, // TriangleFan
POLYGON, // Quads
POLYGON, // QuadStrip
POLYGON, // Polygon
LINE, // LinesAdjacency
LINE, // LineStripAdjacency
POLYGON, // TrianglesAdjacency
POLYGON, // TriangleStripAdjacency
POLYGON, // Patches
ENABLE_POINT, // Points
ENABLE_LINE, // Lines
ENABLE_LINE, // LineLoop
ENABLE_LINE, // LineStrip
ENABLE_POLYGON, // Triangles
ENABLE_POLYGON, // TriangleStrip
ENABLE_POLYGON, // TriangleFan
ENABLE_POLYGON, // Quads
ENABLE_POLYGON, // QuadStrip
ENABLE_POLYGON, // Polygon
ENABLE_LINE, // LinesAdjacency
ENABLE_LINE, // LineStripAdjacency
ENABLE_POLYGON, // TrianglesAdjacency
ENABLE_POLYGON, // TriangleStripAdjacency
ENABLE_POLYGON, // Patches
}; };
const std::array enabled_lut{ const std::array enabled_lut{
regs.polygon_offset_point_enable, regs.polygon_offset_point_enable,

Write Preview
Loading…
Cancel
Save