GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-29 17:05:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use Static Arrays for Vertex Buffer Bindings & Attributes

Browse Source 
We cannot statically construct the vertex buffer/attribute arrays for Vulkan due to inactive attributes or buffers which isn't possible on Vulkan, we also cannot just change the count dynamically as there might be disabled buffers or attributes in the middle. We just have a `static_array` which should dynamically be filled in with buffer binding/attribute Vulkan structures before submission.
This commit is contained in:
PixelyIon 2021-12-07 00:48:33 +05:30
parent 8652edb07b
commit 23faf1370c
1 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
app/src/main/cpp/skyline/gpu/interconnect/graphics_context.h
View File

@ -3,7 +3,9 @@
#pragma once #pragma once
#include <boost/container/static_vector.hpp>
#include <gpu/texture/format.h> #include <gpu/texture/format.h>
#include <gpu/buffer_manager.h>
#include <soc/gm20b/channel.h> #include <soc/gm20b/channel.h>
#include <soc/gm20b/gmmu.h> #include <soc/gm20b/gmmu.h>
#include <soc/gm20b/engines/maxwell/types.h> #include <soc/gm20b/engines/maxwell/types.h>
@ -49,19 +51,17 @@ namespace skyline::gpu::interconnect {
} }
u32 bindingIndex{}; u32 bindingIndex{};
for (auto &vertexBinding : vertexBindings) for (auto &vertexBuffer : vertexBuffers) {
vertexBinding.binding = bindingIndex++; vertexBuffer.bindingDescription.binding = bindingIndex;
if (gpu.quirks.supportsVertexAttributeDivisor) { vertexBuffer.bindingDivisorDescription.binding = bindingIndex;
bindingIndex = 0; bindingIndex++;
for (auto &vertexBindingDivisor : vertexBindingDivisors)
vertexBindingDivisor.binding = bindingIndex++;
} else {
vertexState.unlink<vk::PipelineVertexInputDivisorStateCreateInfoEXT>();
} }
if (!gpu.quirks.supportsVertexAttributeDivisor)
vertexState.unlink<vk::PipelineVertexInputDivisorStateCreateInfoEXT>();
u32 attributeIndex{}; u32 attributeIndex{};
for (auto &vertexAttribute : vertexAttributes) for (auto &vertexAttribute : vertexAttributes)
vertexAttribute.location = attributeIndex++; vertexAttribute.description.location = attributeIndex++;
if (!gpu.quirks.supportsLastProvokingVertex) if (!gpu.quirks.supportsLastProvokingVertex)
rasterizerState.unlink<vk::PipelineRasterizationProvokingVertexStateCreateInfoEXT>(); rasterizerState.unlink<vk::PipelineRasterizationProvokingVertexStateCreateInfoEXT>();
@ -776,47 +776,64 @@ namespace skyline::gpu::interconnect {
/* Vertex Buffers */ /* Vertex Buffers */
private: private:
struct VertexBuffer { struct VertexBuffer {
bool disabled{};
vk::VertexInputBindingDescription bindingDescription{};
vk::VertexInputBindingDivisorDescriptionEXT bindingDivisorDescription{};
IOVA start{}, end{}; //!< IOVAs covering a contiguous region in GPU AS with the vertex buffer IOVA start{}, end{}; //!< IOVAs covering a contiguous region in GPU AS with the vertex buffer
GuestBuffer guest;
std::shared_ptr<BufferView> view;
}; };
std::array<VertexBuffer, maxwell3d::VertexBufferCount> vertexBuffers{}; std::array<VertexBuffer, maxwell3d::VertexBufferCount> vertexBuffers{};
std::array<vk::VertexInputBindingDescription, maxwell3d::VertexBufferCount> vertexBindings{}; boost::container::static_vector<vk::VertexInputBindingDescription, maxwell3d::VertexBufferCount> vertexBindingDescriptions{};
std::array<vk::VertexInputBindingDivisorDescriptionEXT, maxwell3d::VertexBufferCount> vertexBindingDivisors{}; boost::container::static_vector<vk::VertexInputBindingDivisorDescriptionEXT, maxwell3d::VertexBufferCount> vertexBindingDivisorsDescriptions{};
std::array<vk::VertexInputAttributeDescription, maxwell3d::VertexAttributeCount> vertexAttributes{};
struct VertexAttribute {
bool enabled{};
vk::VertexInputAttributeDescription description;
};
std::array<VertexAttribute, maxwell3d::VertexAttributeCount> vertexAttributes{};
boost::container::static_vector<vk::VertexInputAttributeDescription, maxwell3d::VertexAttributeCount> vertexAttributesDescriptions{};
vk::StructureChain<vk::PipelineVertexInputStateCreateInfo, vk::PipelineVertexInputDivisorStateCreateInfoEXT> vertexState{ vk::StructureChain<vk::PipelineVertexInputStateCreateInfo, vk::PipelineVertexInputDivisorStateCreateInfoEXT> vertexState{
vk::PipelineVertexInputStateCreateInfo{ vk::PipelineVertexInputStateCreateInfo{
.pVertexBindingDescriptions = vertexBindings.data(), .pVertexBindingDescriptions = vertexBindingDescriptions.data(),
.vertexBindingDescriptionCount = maxwell3d::VertexBufferCount, .pVertexAttributeDescriptions = vertexAttributesDescriptions.data(),
.pVertexAttributeDescriptions = vertexAttributes.data(),
.vertexAttributeDescriptionCount = maxwell3d::VertexAttributeCount,
}, vk::PipelineVertexInputDivisorStateCreateInfoEXT{ }, vk::PipelineVertexInputDivisorStateCreateInfoEXT{
.pVertexBindingDivisors = vertexBindingDivisors.data(), .pVertexBindingDivisors = vertexBindingDivisorsDescriptions.data(),
.vertexBindingDivisorCount = maxwell3d::VertexBufferCount,
} }
}; };
public: public:
void SetVertexBufferStride(u32 index, u32 stride) { void SetVertexBufferStride(u32 index, u32 stride) {
vertexBindings[index].stride = stride; vertexBuffers[index].bindingDescription.stride = stride;
} }
void SetVertexBufferInputRate(u32 index, bool isPerInstance) { void SetVertexBufferInputRate(u32 index, bool isPerInstance) {
vertexBindings[index].inputRate = isPerInstance ? vk::VertexInputRate::eInstance : vk::VertexInputRate::eVertex; vertexBuffers[index].bindingDescription.inputRate = isPerInstance ? vk::VertexInputRate::eInstance : vk::VertexInputRate::eVertex;
} }
void SetVertexBufferStartIovaHigh(u32 index, u32 high) { void SetVertexBufferStartIovaHigh(u32 index, u32 high) {
vertexBuffers[index].start.high = high; auto &vertexBuffer{vertexBuffers[index]};
vertexBuffer.start.high = high;
vertexBuffer.view.reset();
} }
void SetVertexBufferStartIovaLow(u32 index, u32 low) { void SetVertexBufferStartIovaLow(u32 index, u32 low) {
vertexBuffers[index].start.low = low; auto &vertexBuffer{vertexBuffers[index]};
vertexBuffer.start.low = low;
vertexBuffer.view.reset();
} }
void SetVertexBufferEndIovaHigh(u32 index, u32 high) { void SetVertexBufferEndIovaHigh(u32 index, u32 high) {
vertexBuffers[index].end.high = high; auto &vertexBuffer{vertexBuffers[index]};
vertexBuffer.end.high = high;
vertexBuffer.view.reset();
} }
void SetVertexBufferEndIovaLow(u32 index, u32 low) { void SetVertexBufferEndIovaLow(u32 index, u32 low) {
vertexBuffers[index].end.low = low; auto &vertexBuffer{vertexBuffers[index]};
vertexBuffer.end.low = low;
vertexBuffer.view.reset();
} }
void SetVertexBufferDivisor(u32 index, u32 divisor) { void SetVertexBufferDivisor(u32 index, u32 divisor) {
@ -824,7 +841,7 @@ namespace skyline::gpu::interconnect {
Logger::Warn("Cannot set vertex attribute divisor without host GPU support"); Logger::Warn("Cannot set vertex attribute divisor without host GPU support");
else if (divisor == 0 && !gpu.quirks.supportsVertexAttributeZeroDivisor) else if (divisor == 0 && !gpu.quirks.supportsVertexAttributeZeroDivisor)
Logger::Warn("Cannot set vertex attribute divisor to zero without host GPU support"); Logger::Warn("Cannot set vertex attribute divisor to zero without host GPU support");
vertexBindingDivisors[index].divisor = divisor; vertexBuffers[index].bindingDivisorDescription.divisor = divisor;
} }
vk::Format ConvertVertexBufferFormat(maxwell3d::VertexAttribute::ElementType type, maxwell3d::VertexAttribute::ElementSize size) { vk::Format ConvertVertexBufferFormat(maxwell3d::VertexAttribute::ElementType type, maxwell3d::VertexAttribute::ElementSize size) {
@ -940,10 +957,15 @@ namespace skyline::gpu::interconnect {
} }
void SetVertexAttributeState(u32 index, maxwell3d::VertexAttribute attribute) { void SetVertexAttributeState(u32 index, maxwell3d::VertexAttribute attribute) {
auto &vkAttributes{vertexAttributes[index]}; auto &vertexAttribute{vertexAttributes[index]};
vkAttributes.binding = attribute.bufferId; if (!attribute.isConstant) {
vkAttributes.format = ConvertVertexBufferFormat(attribute.type, attribute.elementSize); vertexAttribute.enabled = true;
vkAttributes.offset = attribute.offset; vertexAttribute.description.binding = attribute.bufferId;
vertexAttribute.description.format = ConvertVertexBufferFormat(attribute.type, attribute.elementSize);
vertexAttribute.description.offset = attribute.offset;
} else {
vertexAttribute.enabled = false;
}
} }
/* Input Assembly */ /* Input Assembly */