piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: add additional data types (int, int2, float, bool, etc) as properties of materials and some helper functions to support sending the data to the GPU

Browse Source
This commit is contained in:
iwubcode
2023-10-15 16:34:06 -05:00
parent 96c256f97a
commit e204b3c8ee
3 changed files with 219 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Core/VideoCommon/Assets/MaterialAsset.h
View File

@ -3,7 +3,7 @@
#pragma once
#include <optional>
#include <array>
#include <string>
#include <variant>
#include <vector>
@ -14,20 +14,20 @@
#include "Common/EnumFormatter.h"
#include "VideoCommon/Assets/CustomAsset.h"
class ShaderCode;
namespace VideoCommon
{
struct MaterialProperty
{
using Value = std::variant<std::string>;
enum class Type
{
Type_Undefined,
Type_TextureAsset,
Type_Max = Type_TextureAsset
};
static void WriteToMemory(u8*& buffer, const MaterialProperty& property);
static std::size_t GetMemorySize(const MaterialProperty& property);
static void WriteAsShaderCode(ShaderCode& shader_source, const MaterialProperty& property);
using Value = std::variant<CustomAssetLibrary::AssetID, s32, std::array<s32, 2>,
std::array<s32, 3>, std::array<s32, 4>, float, std::array<float, 2>,
std::array<float, 3>, std::array<float, 4>, bool>;
std::string m_code_name;
Type m_type = Type::Type_Undefined;
std::optional<Value> m_value;
Value m_value;
};
struct MaterialData
@ -52,10 +52,3 @@ private:
};
} // namespace VideoCommon
template <>
struct fmt::formatter<VideoCommon::MaterialProperty::Type>
: EnumFormatter<VideoCommon::MaterialProperty::Type::Type_Max>
{
constexpr formatter() : EnumFormatter({"Undefined", "Texture"}) {}
};