ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VideoCommon:VertexShaderManager: Inline SetVertexFormat & UpdateValue/Offset

This commit is contained in:
Robin Kertels 2023-03-19 23:28:25 +01:00
parent 7703fef3a4
commit 408b09da31
No known key found for this signature in database
GPG Key ID: 3824904F14D40757
2 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Core/VideoCommon/VertexShaderManager.cpp
View File

@ -621,44 +621,6 @@ void VertexShaderManager::SetMaterialColorChanged(int index)
m_materials_changed[index] = true; m_materials_changed[index] = true;
} }
static void UpdateValue(bool* dirty, u32* old_value, u32 new_value)
{
if (*old_value == new_value)
return;
*old_value = new_value;
*dirty = true;
}
static void UpdateOffset(bool* dirty, bool include_components, u32* old_value,
const AttributeFormat& attribute)
{
if (!attribute.enable)
return;
u32 new_value = attribute.offset / 4; // GPU uses uint offsets
if (include_components)
new_value |= attribute.components << 16;
UpdateValue(dirty, old_value, new_value);
}
template <size_t N>
static void UpdateOffsets(bool* dirty, bool include_components, std::array<u32, N>* old_value,
const std::array<AttributeFormat, N>& attribute)
{
for (size_t i = 0; i < N; i++)
UpdateOffset(dirty, include_components, &(*old_value)[i], attribute[i]);
}
void VertexShaderManager::SetVertexFormat(u32 components, const PortableVertexDeclaration& format)
{
UpdateValue(&dirty, &constants.components, components);
UpdateValue(&dirty, &constants.vertex_stride, format.stride / 4);
UpdateOffset(&dirty, true, &constants.vertex_offset_position, format.position);
UpdateOffset(&dirty, false, &constants.vertex_offset_posmtx, format.posmtx);
UpdateOffsets(&dirty, true, &constants.vertex_offset_texcoords, format.texcoords);
UpdateOffsets(&dirty, false, &constants.vertex_offset_colors, format.colors);
UpdateOffsets(&dirty, false, &constants.vertex_offset_normals, format.normals);
}
void VertexShaderManager::SetTexMatrixInfoChanged(int index) void VertexShaderManager::SetTexMatrixInfoChanged(int index)
{ {
// TODO: Should we track this with more precision, like which indices changed? // TODO: Should we track this with more precision, like which indices changed?

41
Source/Core/VideoCommon/VertexShaderManager.h
View File

@ -11,6 +11,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Matrix.h" #include "Common/Matrix.h"
#include "VideoCommon/ConstantManager.h" #include "VideoCommon/ConstantManager.h"
#include "VideoCommon/NativeVertexFormat.h"
class PointerWrap; class PointerWrap;
struct PortableVertexDeclaration; struct PortableVertexDeclaration;
@ -34,7 +35,6 @@ public:
void SetProjectionChanged(); void SetProjectionChanged();
void SetMaterialColorChanged(int index); void SetMaterialColorChanged(int index);
void SetVertexFormat(u32 components, const PortableVertexDeclaration& format);
void SetTexMatrixInfoChanged(int index); void SetTexMatrixInfoChanged(int index);
void SetLightingConfigChanged(); void SetLightingConfigChanged();
@ -49,6 +49,45 @@ public:
VertexShaderConstants constants{}; VertexShaderConstants constants{};
bool dirty = false; bool dirty = false;
static DOLPHIN_FORCE_INLINE void UpdateValue(bool* dirty, u32* old_value, u32 new_value)
{
if (*old_value == new_value)
return;
*old_value = new_value;
*dirty = true;
}
static DOLPHIN_FORCE_INLINE void UpdateOffset(bool* dirty, bool include_components,
u32* old_value, const AttributeFormat& attribute)
{
if (!attribute.enable)
return;
u32 new_value = attribute.offset / 4; // GPU uses uint offsets
if (include_components)
new_value |= attribute.components << 16;
UpdateValue(dirty, old_value, new_value);
}
template <size_t N>
static DOLPHIN_FORCE_INLINE void UpdateOffsets(bool* dirty, bool include_components,
std::array<u32, N>* old_value,
const std::array<AttributeFormat, N>& attribute)
{
for (size_t i = 0; i < N; i++)
UpdateOffset(dirty, include_components, &(*old_value)[i], attribute[i]);
}
DOLPHIN_FORCE_INLINE void SetVertexFormat(u32 components, const PortableVertexDeclaration& format)
{
UpdateValue(&dirty, &constants.components, components);
UpdateValue(&dirty, &constants.vertex_stride, format.stride / 4);
UpdateOffset(&dirty, true, &constants.vertex_offset_position, format.position);
UpdateOffset(&dirty, false, &constants.vertex_offset_posmtx, format.posmtx);
UpdateOffsets(&dirty, true, &constants.vertex_offset_texcoords, format.texcoords);
UpdateOffsets(&dirty, false, &constants.vertex_offset_colors, format.colors);
UpdateOffsets(&dirty, false, &constants.vertex_offset_normals, format.normals);
}
private: private:
alignas(16) std::array<float, 16> m_projection_matrix; alignas(16) std::array<float, 16> m_projection_matrix;