From 04fdadd9d5f9588055fb54571410febfa710b86d Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Fri, 22 Apr 2022 12:50:44 -0700 Subject: VideoCommon: Rename norm0/norm1/norm2 to normal/tangent/binormal --- Source/Core/VideoBackends/Software/SWVertexLoader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWVertexLoader.cpp') diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index 287fcf4a4b..7d9b64f01d 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp @@ -89,10 +89,10 @@ void SWVertexLoader::DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_ OutputVertexData* outVertex = m_setup_unit.GetVertex(); TransformUnit::TransformPosition(&m_vertex, outVertex); outVertex->normal = {}; - if (VertexLoaderManager::g_current_components & VB_HAS_NRM0) + if (VertexLoaderManager::g_current_components & VB_HAS_NORMAL) { TransformUnit::TransformNormal( - &m_vertex, (VertexLoaderManager::g_current_components & VB_HAS_NRM2) != 0, outVertex); + &m_vertex, (VertexLoaderManager::g_current_components & VB_HAS_BINORMAL) != 0, outVertex); } TransformUnit::TransformColor(&m_vertex, outVertex); TransformUnit::TransformTexCoord(&m_vertex, outVertex); -- cgit v1.2.3 From 2a5c77f43ff1d69e78f12f13435a38c5eb2ed854 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Wed, 13 Apr 2022 22:03:34 -0700 Subject: VideoCommon: Handle emboss texgen with only a single normal Fixes a large number of effects in Rogue Squadron 2 and 3. --- Source/Core/VideoBackends/Software/SWVertexLoader.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWVertexLoader.cpp') diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index 7d9b64f01d..4b9825132e 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp @@ -25,6 +25,7 @@ #include "VideoCommon/Statistics.h" #include "VideoCommon/VertexLoaderBase.h" #include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" #include "VideoCommon/XFMemory.h" @@ -90,10 +91,7 @@ void SWVertexLoader::DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_ TransformUnit::TransformPosition(&m_vertex, outVertex); outVertex->normal = {}; if (VertexLoaderManager::g_current_components & VB_HAS_NORMAL) - { - TransformUnit::TransformNormal( - &m_vertex, (VertexLoaderManager::g_current_components & VB_HAS_BINORMAL) != 0, outVertex); - } + TransformUnit::TransformNormal(&m_vertex, outVertex); TransformUnit::TransformColor(&m_vertex, outVertex); TransformUnit::TransformTexCoord(&m_vertex, outVertex); @@ -230,6 +228,18 @@ void SWVertexLoader::ParseVertex(const PortableVertexDeclaration& vdec, int inde { ReadVertexAttribute(&m_vertex.normal[i][0], src, vdec.normals[i], 0, 3, false); } + if (!vdec.normals[1].enable) + { + m_vertex.normal[1][0] = VertexShaderManager::constants.cached_tangent[0]; + m_vertex.normal[1][1] = VertexShaderManager::constants.cached_tangent[1]; + m_vertex.normal[1][2] = VertexShaderManager::constants.cached_tangent[2]; + } + if (!vdec.normals[2].enable) + { + m_vertex.normal[2][0] = VertexShaderManager::constants.cached_binormal[0]; + m_vertex.normal[2][1] = VertexShaderManager::constants.cached_binormal[1]; + m_vertex.normal[2][2] = VertexShaderManager::constants.cached_binormal[2]; + } ParseColorAttributes(&m_vertex, src, vdec); -- cgit v1.2.3