Skip to content

S
swiftshader
Commit 00ba176c by Chris Forbes
Options

Factor out vertex attribute binding from Draw*::play

I'm about to build some more on top of this; don't want to write it multiple times. Change-Id: I9ca84536f47b886e9f03edcaa6dc5dfe6e34091d Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/26688Tested-by: 's avatarChris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent 5851ef46
Showing with 19 additions and 22 deletions
src/Vulkan/VkCommandBuffer.cpp
...@@ -185,6 +185,21 @@ struct IndexBufferBind : public CommandBuffer::Command ...@@ -185,6 +185,21 @@ struct IndexBufferBind : public CommandBuffer::Command
const VkIndexType indexType; const VkIndexType indexType;
}; };
void CommandBuffer::ExecutionState::bindVertexInputs(sw::Context& context, int firstVertex)
{
for(uint32_t i = 0; i < MAX_VERTEX_INPUT_BINDINGS; i++)
{
auto &attrib = context.input[i];
if (attrib.count)
{
const auto &vertexInput = vertexInputBindings[attrib.binding];
Buffer *buffer = Cast(vertexInput.buffer);
attrib.buffer = buffer ? buffer->getOffsetPointer(
attrib.offset + vertexInput.offset + attrib.stride * firstVertex) : nullptr;
}
}
}
void CommandBuffer::ExecutionState::bindAttachments() void CommandBuffer::ExecutionState::bindAttachments()
{ {
// Binds all the attachments for the current subpass // Binds all the attachments for the current subpass
...@@ -230,17 +245,7 @@ struct Draw : public CommandBuffer::Command ...@@ -230,17 +245,7 @@ struct Draw : public CommandBuffer::Command
executionState.pipelines[VK_PIPELINE_BIND_POINT_GRAPHICS]); executionState.pipelines[VK_PIPELINE_BIND_POINT_GRAPHICS]);
sw::Context context = pipeline->getContext(); sw::Context context = pipeline->getContext();
for(uint32_t i = 0; i < MAX_VERTEX_INPUT_BINDINGS; i++) executionState.bindVertexInputs(context, firstVertex);
{
auto &attrib = context.input[i];
if (attrib.count)
{
const auto &vertexInput = executionState.vertexInputBindings[attrib.binding];
Buffer *buffer = Cast(vertexInput.buffer);
attrib.buffer = buffer ? buffer->getOffsetPointer(
attrib.offset + vertexInput.offset + attrib.stride * firstVertex) : nullptr;
}
}
context.pushConstants = executionState.pushConstants; context.pushConstants = executionState.pushConstants;
...@@ -279,17 +284,7 @@ struct DrawIndexed : public CommandBuffer::Command ...@@ -279,17 +284,7 @@ struct DrawIndexed : public CommandBuffer::Command
executionState.pipelines[VK_PIPELINE_BIND_POINT_GRAPHICS]); executionState.pipelines[VK_PIPELINE_BIND_POINT_GRAPHICS]);
sw::Context context = pipeline->getContext(); sw::Context context = pipeline->getContext();
for(uint32_t i = 0; i < MAX_VERTEX_INPUT_BINDINGS; i++) executionState.bindVertexInputs(context, vertexOffset);
{
auto &attrib = context.input[i];
if (attrib.count)
{
const auto &vertexInput = executionState.vertexInputBindings[attrib.binding];
Buffer *buffer = Cast(vertexInput.buffer);
attrib.buffer = buffer ? buffer->getOffsetPointer(
attrib.offset + vertexInput.offset + attrib.stride * vertexOffset) : nullptr;
}
}
context.pushConstants = executionState.pushConstants; context.pushConstants = executionState.pushConstants;
......
src/Vulkan/VkCommandBuffer.hpp
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
namespace sw namespace sw
{ {
class Context;
class Renderer; class Renderer;
} }
...@@ -139,6 +140,7 @@ public: ...@@ -139,6 +140,7 @@ public:
VkIndexType indexType; VkIndexType indexType;
void bindAttachments(); void bindAttachments();
void bindVertexInputs(sw::Context& context, int firstVertex);
}; };
void submit(CommandBuffer::ExecutionState& executionState); void submit(CommandBuffer::ExecutionState& executionState);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment