mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-09-11 22:32:29 +00:00
fix build errors 2026-05-20
This commit is contained in:
@@ -145,7 +145,7 @@ VkRect2D GetScissorState(const Tegra::Engines::Maxwell3D::Regs& regs, size_t ind
|
|||||||
return scissor;
|
return scissor;
|
||||||
}
|
}
|
||||||
|
|
||||||
DrawParams MakeDrawParams(const Tegra::Engines::DrawManager::State& draw_state, u32 num_instances, bool is_indexed) {
|
DrawParams MakeDrawParams(const Tegra::Engines::Maxwell3D::DrawManager::State& draw_state, u32 num_instances, bool is_indexed) {
|
||||||
DrawParams params{
|
DrawParams params{
|
||||||
.base_instance = draw_state.base_instance,
|
.base_instance = draw_state.base_instance,
|
||||||
.num_instances = num_instances,
|
.num_instances = num_instances,
|
||||||
@@ -1885,10 +1885,10 @@ void RasterizerVulkan::UpdateVertexInput(Tegra::Engines::Maxwell3D::Regs& regs)
|
|||||||
boost::container::static_vector<VkVertexInputBindingDescription2EXT, 32> bindings;
|
boost::container::static_vector<VkVertexInputBindingDescription2EXT, 32> bindings;
|
||||||
boost::container::static_vector<VkVertexInputAttributeDescription2EXT, 32> attributes;
|
boost::container::static_vector<VkVertexInputAttributeDescription2EXT, 32> attributes;
|
||||||
|
|
||||||
const u32 max_attributes = u32(std::min<size_t>(Tegra::Engines::Maxwell3D::NumVertexAttributes, device.GetMaxVertexInputAttributes()));
|
const u32 max_attributes = u32(std::min<size_t>(Tegra::Engines::Maxwell3D::Regs::NumVertexAttributes, device.GetMaxVertexInputAttributes()));
|
||||||
const u32 max_bindings = u32(std::min<size_t>(Tegra::Engines::Maxwell3D::NumVertexArrays, device.GetMaxVertexInputBindings()));
|
const u32 max_bindings = u32(std::min<size_t>(Tegra::Engines::Maxwell3D::Regs::NumVertexArrays, device.GetMaxVertexInputBindings()));
|
||||||
for (u32 index = 0; index < max_attributes; ++index) {
|
for (u32 index = 0; index < max_attributes; ++index) {
|
||||||
const Tegra::Engines::Maxwell3D::VertexAttribute attribute{regs.vertex_attrib_format[index]};
|
const Tegra::Engines::Maxwell3D::Regs::VertexAttribute attribute{regs.vertex_attrib_format[index]};
|
||||||
const u32 binding{attribute.buffer};
|
const u32 binding{attribute.buffer};
|
||||||
if (attribute.constant || binding >= max_bindings) {
|
if (attribute.constant || binding >= max_bindings) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -15,26 +15,6 @@
|
|||||||
#if FMT_VERSION >= 120100
|
#if FMT_VERSION >= 120100
|
||||||
#include <fmt/base.h>
|
#include <fmt/base.h>
|
||||||
#else
|
#else
|
||||||
template <>
|
|
||||||
struct fmt::formatter<VideoCommon::ImageType> : fmt::formatter<fmt::string_view> {
|
|
||||||
template <typename FormatContext>
|
|
||||||
auto format(VideoCommon::ImageType type, FormatContext& ctx) const {
|
|
||||||
const string_view name = [type] {
|
|
||||||
using VideoCommon::ImageType;
|
|
||||||
switch (type) {
|
|
||||||
case ImageType::e1D: return "1D";
|
|
||||||
case ImageType::e2D: return "2D";
|
|
||||||
case ImageType::e3D: return "3D";
|
|
||||||
case ImageType::Linear: return "Linear";
|
|
||||||
case ImageType::Buffer: return "Buffer";
|
|
||||||
}
|
|
||||||
return "Invalid";
|
|
||||||
}();
|
|
||||||
return formatter<string_view>::format(name, ctx);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::string_view> {
|
struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::string_view> {
|
||||||
template <typename FormatContext>
|
template <typename FormatContext>
|
||||||
@@ -78,6 +58,7 @@ struct fmt::formatter<VideoCommon::ImageType> : fmt::formatter<fmt::string_view>
|
|||||||
return formatter<string_view>::format(name, ctx);
|
return formatter<string_view>::format(name, ctx);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
struct fmt::formatter<VideoCommon::Extent3D> {
|
struct fmt::formatter<VideoCommon::Extent3D> {
|
||||||
|
|||||||
Reference in New Issue
Block a user