Forcing tabs
This commit is contained in:
Brad Davis
parent
19f80fe423
commit
e0b557606c
1 changed files with 118 additions and 118 deletions
|
|
@ -32,7 +32,7 @@ public:
|
|||
uint32_t readSet = 0;
|
||||
uint32_t indexCount;
|
||||
bool simulateWind = false;
|
||||
bool specializedComputeQueue = false;
|
||||
bool specializedComputeQueue = false;
|
||||
|
||||
vks::Texture2D textureCloth;
|
||||
|
||||
|
|
@ -67,10 +67,10 @@ public:
|
|||
vks::Buffer input;
|
||||
vks::Buffer output;
|
||||
} storageBuffers;
|
||||
struct Semaphores {
|
||||
VkSemaphore ready{ nullptr };
|
||||
VkSemaphore complete{ nullptr };
|
||||
} semaphores;
|
||||
struct Semaphores {
|
||||
VkSemaphore ready{ nullptr };
|
||||
VkSemaphore complete{ nullptr };
|
||||
} semaphores;
|
||||
vks::Buffer uniformBuffer;
|
||||
VkQueue queue;
|
||||
VkCommandPool commandPool;
|
||||
|
|
@ -137,8 +137,8 @@ public:
|
|||
vkDestroyPipelineLayout(device, compute.pipelineLayout, nullptr);
|
||||
vkDestroyDescriptorSetLayout(device, compute.descriptorSetLayout, nullptr);
|
||||
vkDestroyPipeline(device, compute.pipeline, nullptr);
|
||||
vkDestroySemaphore(device, compute.semaphores.ready, nullptr);
|
||||
vkDestroySemaphore(device, compute.semaphores.complete, nullptr);
|
||||
vkDestroySemaphore(device, compute.semaphores.ready, nullptr);
|
||||
vkDestroySemaphore(device, compute.semaphores.complete, nullptr);
|
||||
vkDestroyCommandPool(device, compute.commandPool, nullptr);
|
||||
}
|
||||
|
||||
|
|
@ -156,41 +156,41 @@ public:
|
|||
modelSphere.loadFromFile(getAssetPath() + "models/geosphere.obj", vertexLayout, compute.ubo.sphereRadius * 0.05f, vulkanDevice, queue);
|
||||
}
|
||||
|
||||
void addGraphicsToComputeBarriers(VkCommandBuffer commandBuffer)
|
||||
{
|
||||
if (specializedComputeQueue) {
|
||||
VkBufferMemoryBarrier bufferBarrier = vks::initializers::bufferMemoryBarrier();
|
||||
bufferBarrier.srcAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
|
||||
bufferBarrier.dstAccessMask = VK_ACCESS_SHADER_WRITE_BIT;
|
||||
bufferBarrier.srcQueueFamilyIndex = vulkanDevice->queueFamilyIndices.graphics;
|
||||
bufferBarrier.dstQueueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||
bufferBarrier.size = VK_WHOLE_SIZE;
|
||||
void addGraphicsToComputeBarriers(VkCommandBuffer commandBuffer)
|
||||
{
|
||||
if (specializedComputeQueue) {
|
||||
VkBufferMemoryBarrier bufferBarrier = vks::initializers::bufferMemoryBarrier();
|
||||
bufferBarrier.srcAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
|
||||
bufferBarrier.dstAccessMask = VK_ACCESS_SHADER_WRITE_BIT;
|
||||
bufferBarrier.srcQueueFamilyIndex = vulkanDevice->queueFamilyIndices.graphics;
|
||||
bufferBarrier.dstQueueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||
bufferBarrier.size = VK_WHOLE_SIZE;
|
||||
|
||||
std::vector<VkBufferMemoryBarrier> bufferBarriers;
|
||||
bufferBarrier.buffer = compute.storageBuffers.input.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
bufferBarrier.buffer = compute.storageBuffers.output.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
vkCmdPipelineBarrier(commandBuffer,
|
||||
VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
|
||||
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
|
||||
VK_FLAGS_NONE,
|
||||
0, nullptr,
|
||||
static_cast<uint32_t>(bufferBarriers.size()), bufferBarriers.data(),
|
||||
0, nullptr);
|
||||
}
|
||||
}
|
||||
std::vector<VkBufferMemoryBarrier> bufferBarriers;
|
||||
bufferBarrier.buffer = compute.storageBuffers.input.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
bufferBarrier.buffer = compute.storageBuffers.output.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
vkCmdPipelineBarrier(commandBuffer,
|
||||
VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
|
||||
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
|
||||
VK_FLAGS_NONE,
|
||||
0, nullptr,
|
||||
static_cast<uint32_t>(bufferBarriers.size()), bufferBarriers.data(),
|
||||
0, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
void addComputeToComputeBarriers(VkCommandBuffer commandBuffer)
|
||||
{
|
||||
VkBufferMemoryBarrier bufferBarrier = vks::initializers::bufferMemoryBarrier();
|
||||
void addComputeToComputeBarriers(VkCommandBuffer commandBuffer)
|
||||
{
|
||||
VkBufferMemoryBarrier bufferBarrier = vks::initializers::bufferMemoryBarrier();
|
||||
bufferBarrier.srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT;
|
||||
bufferBarrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
|
||||
bufferBarrier.srcQueueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||
bufferBarrier.dstQueueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||
bufferBarrier.size = VK_WHOLE_SIZE;
|
||||
std::vector<VkBufferMemoryBarrier> bufferBarriers;
|
||||
bufferBarrier.buffer = compute.storageBuffers.input.buffer;
|
||||
std::vector<VkBufferMemoryBarrier> bufferBarriers;
|
||||
bufferBarrier.buffer = compute.storageBuffers.input.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
bufferBarrier.buffer = compute.storageBuffers.output.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
|
|
@ -202,34 +202,34 @@ public:
|
|||
0, nullptr,
|
||||
static_cast<uint32_t>(bufferBarriers.size()), bufferBarriers.data(),
|
||||
0, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
void addComputeToGraphicsBarriers(VkCommandBuffer commandBuffer)
|
||||
{
|
||||
if (specializedComputeQueue) {
|
||||
VkBufferMemoryBarrier bufferBarrier = vks::initializers::bufferMemoryBarrier();
|
||||
bufferBarrier.srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT;
|
||||
bufferBarrier.dstAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
|
||||
bufferBarrier.srcQueueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||
bufferBarrier.dstQueueFamilyIndex = vulkanDevice->queueFamilyIndices.graphics;
|
||||
bufferBarrier.size = VK_WHOLE_SIZE;
|
||||
std::vector<VkBufferMemoryBarrier> bufferBarriers;
|
||||
bufferBarrier.buffer = compute.storageBuffers.input.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
bufferBarrier.buffer = compute.storageBuffers.output.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
vkCmdPipelineBarrier(
|
||||
commandBuffer,
|
||||
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
|
||||
VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
|
||||
VK_FLAGS_NONE,
|
||||
0, nullptr,
|
||||
static_cast<uint32_t>(bufferBarriers.size()), bufferBarriers.data(),
|
||||
0, nullptr);
|
||||
}
|
||||
}
|
||||
void addComputeToGraphicsBarriers(VkCommandBuffer commandBuffer)
|
||||
{
|
||||
if (specializedComputeQueue) {
|
||||
VkBufferMemoryBarrier bufferBarrier = vks::initializers::bufferMemoryBarrier();
|
||||
bufferBarrier.srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT;
|
||||
bufferBarrier.dstAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
|
||||
bufferBarrier.srcQueueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||
bufferBarrier.dstQueueFamilyIndex = vulkanDevice->queueFamilyIndices.graphics;
|
||||
bufferBarrier.size = VK_WHOLE_SIZE;
|
||||
std::vector<VkBufferMemoryBarrier> bufferBarriers;
|
||||
bufferBarrier.buffer = compute.storageBuffers.input.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
bufferBarrier.buffer = compute.storageBuffers.output.buffer;
|
||||
bufferBarriers.push_back(bufferBarrier);
|
||||
vkCmdPipelineBarrier(
|
||||
commandBuffer,
|
||||
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
|
||||
VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
|
||||
VK_FLAGS_NONE,
|
||||
0, nullptr,
|
||||
static_cast<uint32_t>(bufferBarriers.size()), bufferBarriers.data(),
|
||||
0, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
void buildCommandBuffers()
|
||||
void buildCommandBuffers()
|
||||
{
|
||||
// Destroy command buffers if already present
|
||||
if (!checkCommandBuffers())
|
||||
|
|
@ -260,8 +260,8 @@ public:
|
|||
|
||||
VK_CHECK_RESULT(vkBeginCommandBuffer(drawCmdBuffers[i], &cmdBufInfo));
|
||||
|
||||
// Acquire storage buffers from compute queue
|
||||
addComputeToGraphicsBarriers(drawCmdBuffers[i]);
|
||||
// Acquire storage buffers from compute queue
|
||||
addComputeToGraphicsBarriers(drawCmdBuffers[i]);
|
||||
|
||||
// Draw the particle system using the update vertex buffer
|
||||
|
||||
|
|
@ -295,8 +295,8 @@ public:
|
|||
|
||||
vkCmdEndRenderPass(drawCmdBuffers[i]);
|
||||
|
||||
// release the storage buffers to the compute queue
|
||||
addGraphicsToComputeBarriers(drawCmdBuffers[i]);
|
||||
// release the storage buffers to the compute queue
|
||||
addGraphicsToComputeBarriers(drawCmdBuffers[i]);
|
||||
|
||||
VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i]));
|
||||
}
|
||||
|
|
@ -307,16 +307,16 @@ public:
|
|||
void buildComputeCommandBuffer()
|
||||
{
|
||||
VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo();
|
||||
cmdBufInfo.flags = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
|
||||
cmdBufInfo.flags = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
|
||||
|
||||
for (uint32_t i = 0; i < 2; i++) {
|
||||
|
||||
VK_CHECK_RESULT(vkBeginCommandBuffer(compute.commandBuffers[i], &cmdBufInfo));
|
||||
|
||||
// Acquire the storage buffers from the graphics queue
|
||||
addGraphicsToComputeBarriers(compute.commandBuffers[i]);
|
||||
// Acquire the storage buffers from the graphics queue
|
||||
addGraphicsToComputeBarriers(compute.commandBuffers[i]);
|
||||
|
||||
vkCmdBindPipeline(compute.commandBuffers[i], VK_PIPELINE_BIND_POINT_COMPUTE, compute.pipeline);
|
||||
vkCmdBindPipeline(compute.commandBuffers[i], VK_PIPELINE_BIND_POINT_COMPUTE, compute.pipeline);
|
||||
|
||||
uint32_t calculateNormals = 0;
|
||||
vkCmdPushConstants(compute.commandBuffers[i], compute.pipelineLayout, VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(uint32_t), &calculateNormals);
|
||||
|
|
@ -334,15 +334,15 @@ public:
|
|||
|
||||
vkCmdDispatch(compute.commandBuffers[i], cloth.gridsize.x / 10, cloth.gridsize.y / 10, 1);
|
||||
|
||||
// Don't add a barrier on the last iteration of the loop, since we'll have an explicit release to the graphics queue
|
||||
if (j != iterations - 1) {
|
||||
addComputeToComputeBarriers(compute.commandBuffers[i]);
|
||||
}
|
||||
// Don't add a barrier on the last iteration of the loop, since we'll have an explicit release to the graphics queue
|
||||
if (j != iterations - 1) {
|
||||
addComputeToComputeBarriers(compute.commandBuffers[i]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// release the storage buffers back to the graphics queue
|
||||
addComputeToGraphicsBarriers(compute.commandBuffers[i]);
|
||||
// release the storage buffers back to the graphics queue
|
||||
addComputeToGraphicsBarriers(compute.commandBuffers[i]);
|
||||
vkEndCommandBuffer(compute.commandBuffers[i]);
|
||||
}
|
||||
}
|
||||
|
|
@ -422,10 +422,10 @@ public:
|
|||
copyRegion.size = storageBufferSize;
|
||||
vkCmdCopyBuffer(copyCmd, stagingBuffer.buffer, compute.storageBuffers.input.buffer, 1, ©Region);
|
||||
vkCmdCopyBuffer(copyCmd, stagingBuffer.buffer, compute.storageBuffers.output.buffer, 1, ©Region);
|
||||
// Add an initial release barrier to the graphics queue,
|
||||
// so that when the compute command buffer executes for the first time
|
||||
// it doesn't complain about a lack of a corresponding "release" to it's "acquire"
|
||||
addGraphicsToComputeBarriers(copyCmd);
|
||||
// Add an initial release barrier to the graphics queue,
|
||||
// so that when the compute command buffer executes for the first time
|
||||
// it doesn't complain about a lack of a corresponding "release" to it's "acquire"
|
||||
addGraphicsToComputeBarriers(copyCmd);
|
||||
VulkanExampleBase::flushCommandBuffer(copyCmd, queue, true);
|
||||
|
||||
stagingBuffer.destroy();
|
||||
|
|
@ -595,7 +595,7 @@ public:
|
|||
};
|
||||
inputState.vertexAttributeDescriptionCount = static_cast<uint32_t>(inputAttributes.size());
|
||||
inputAssemblyState.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
|
||||
inputAssemblyState.primitiveRestartEnable = VK_FALSE;
|
||||
inputAssemblyState.primitiveRestartEnable = VK_FALSE;
|
||||
rasterizationState.polygonMode = VK_POLYGON_MODE_FILL;
|
||||
shaderStages[0] = loadShader(getAssetPath() + "shaders/computecloth/sphere.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
|
||||
shaderStages[1] = loadShader(getAssetPath() + "shaders/computecloth/sphere.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
|
||||
|
|
@ -667,10 +667,10 @@ public:
|
|||
|
||||
VK_CHECK_RESULT(vkAllocateCommandBuffers(device, &cmdBufAllocateInfo, &compute.commandBuffers[0]));
|
||||
|
||||
// Semaphores for graphics / compute synchronization
|
||||
VkSemaphoreCreateInfo semaphoreCreateInfo = vks::initializers::semaphoreCreateInfo();
|
||||
VK_CHECK_RESULT(vkCreateSemaphore(device, &semaphoreCreateInfo, nullptr, &compute.semaphores.ready));
|
||||
VK_CHECK_RESULT(vkCreateSemaphore(device, &semaphoreCreateInfo, nullptr, &compute.semaphores.complete));
|
||||
// Semaphores for graphics / compute synchronization
|
||||
VkSemaphoreCreateInfo semaphoreCreateInfo = vks::initializers::semaphoreCreateInfo();
|
||||
VK_CHECK_RESULT(vkCreateSemaphore(device, &semaphoreCreateInfo, nullptr, &compute.semaphores.ready));
|
||||
VK_CHECK_RESULT(vkCreateSemaphore(device, &semaphoreCreateInfo, nullptr, &compute.semaphores.complete));
|
||||
|
||||
// Build a single command buffer containing the compute dispatch commands
|
||||
buildComputeCommandBuffer();
|
||||
|
|
@ -742,42 +742,42 @@ public:
|
|||
|
||||
void draw()
|
||||
{
|
||||
static bool firstDraw = true;
|
||||
VkSubmitInfo computeSubmitInfo = vks::initializers::submitInfo();
|
||||
// FIXME find a better way to do this (without using fences, which is much slower)
|
||||
VkPipelineStageFlags computeWaitDstStageMask = VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
|
||||
if (!firstDraw) {
|
||||
computeSubmitInfo.waitSemaphoreCount = 1;
|
||||
computeSubmitInfo.pWaitSemaphores = &compute.semaphores.ready;
|
||||
computeSubmitInfo.pWaitDstStageMask = &computeWaitDstStageMask;
|
||||
} else {
|
||||
firstDraw = false;
|
||||
}
|
||||
computeSubmitInfo.signalSemaphoreCount = 1;
|
||||
computeSubmitInfo.pSignalSemaphores = &compute.semaphores.complete;
|
||||
computeSubmitInfo.commandBufferCount = 1;
|
||||
computeSubmitInfo.pCommandBuffers = &compute.commandBuffers[readSet];
|
||||
static bool firstDraw = true;
|
||||
VkSubmitInfo computeSubmitInfo = vks::initializers::submitInfo();
|
||||
// FIXME find a better way to do this (without using fences, which is much slower)
|
||||
VkPipelineStageFlags computeWaitDstStageMask = VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
|
||||
if (!firstDraw) {
|
||||
computeSubmitInfo.waitSemaphoreCount = 1;
|
||||
computeSubmitInfo.pWaitSemaphores = &compute.semaphores.ready;
|
||||
computeSubmitInfo.pWaitDstStageMask = &computeWaitDstStageMask;
|
||||
} else {
|
||||
firstDraw = false;
|
||||
}
|
||||
computeSubmitInfo.signalSemaphoreCount = 1;
|
||||
computeSubmitInfo.pSignalSemaphores = &compute.semaphores.complete;
|
||||
computeSubmitInfo.commandBufferCount = 1;
|
||||
computeSubmitInfo.pCommandBuffers = &compute.commandBuffers[readSet];
|
||||
|
||||
VK_CHECK_RESULT( vkQueueSubmit( compute.queue, 1, &computeSubmitInfo, VK_NULL_HANDLE) );
|
||||
VK_CHECK_RESULT( vkQueueSubmit( compute.queue, 1, &computeSubmitInfo, VK_NULL_HANDLE) );
|
||||
|
||||
// Submit graphics commands
|
||||
VulkanExampleBase::prepareFrame();
|
||||
|
||||
VkPipelineStageFlags waitDstStageMask[2] = {
|
||||
submitPipelineStages, VK_PIPELINE_STAGE_VERTEX_INPUT_BIT
|
||||
};
|
||||
VkSemaphore waitSemaphores[2] = {
|
||||
semaphores.presentComplete, compute.semaphores.complete
|
||||
};
|
||||
VkSemaphore signalSemaphores[2] = {
|
||||
semaphores.renderComplete, compute.semaphores.ready
|
||||
};
|
||||
VkPipelineStageFlags waitDstStageMask[2] = {
|
||||
submitPipelineStages, VK_PIPELINE_STAGE_VERTEX_INPUT_BIT
|
||||
};
|
||||
VkSemaphore waitSemaphores[2] = {
|
||||
semaphores.presentComplete, compute.semaphores.complete
|
||||
};
|
||||
VkSemaphore signalSemaphores[2] = {
|
||||
semaphores.renderComplete, compute.semaphores.ready
|
||||
};
|
||||
|
||||
submitInfo.waitSemaphoreCount = 2;
|
||||
submitInfo.pWaitDstStageMask = waitDstStageMask;
|
||||
submitInfo.pWaitSemaphores = waitSemaphores;
|
||||
submitInfo.signalSemaphoreCount = 2;
|
||||
submitInfo.pSignalSemaphores = signalSemaphores;
|
||||
submitInfo.waitSemaphoreCount = 2;
|
||||
submitInfo.pWaitDstStageMask = waitDstStageMask;
|
||||
submitInfo.pWaitSemaphores = waitSemaphores;
|
||||
submitInfo.signalSemaphoreCount = 2;
|
||||
submitInfo.pSignalSemaphores = signalSemaphores;
|
||||
submitInfo.commandBufferCount = 1;
|
||||
submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer];
|
||||
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE));
|
||||
|
|
@ -788,12 +788,12 @@ public:
|
|||
void prepare()
|
||||
{
|
||||
VulkanExampleBase::prepare();
|
||||
// Make sure the code works properly both with different queues families for graphics and compute and the same queue family
|
||||
// Make sure the code works properly both with different queues families for graphics and compute and the same queue family
|
||||
#ifdef DEBUG_FORCE_SHARED_GRAPHICS_COMPUTE_QUEUE
|
||||
vulkanDevice->queueFamilyIndices.compute = vulkanDevice->queueFamilyIndices.graphics;
|
||||
vulkanDevice->queueFamilyIndices.compute = vulkanDevice->queueFamilyIndices.graphics;
|
||||
#endif
|
||||
// Check whether the compute queue family is distinct from the graphics queue family
|
||||
specializedComputeQueue = vulkanDevice->queueFamilyIndices.graphics != vulkanDevice->queueFamilyIndices.compute;
|
||||
// Check whether the compute queue family is distinct from the graphics queue family
|
||||
specializedComputeQueue = vulkanDevice->queueFamilyIndices.graphics != vulkanDevice->queueFamilyIndices.compute;
|
||||
loadAssets();
|
||||
prepareStorageBuffers();
|
||||
prepareUniformBuffers();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue