Added compute shader n-body particle simulation demonstrating the use of shared compute shader memory
This commit is contained in:
parent
7cd95fc8c8
commit
2674c7c404
13 changed files with 1088 additions and 0 deletions
|
|
@ -97,6 +97,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/")
|
||||||
set(EXAMPLES
|
set(EXAMPLES
|
||||||
bloom
|
bloom
|
||||||
computecullandlod
|
computecullandlod
|
||||||
|
computenbody
|
||||||
computeparticles
|
computeparticles
|
||||||
computeshader
|
computeshader
|
||||||
debugmarker
|
debugmarker
|
||||||
|
|
|
||||||
760
computenbody/computenbody.cpp
Normal file
760
computenbody/computenbody.cpp
Normal file
|
|
@ -0,0 +1,760 @@
|
||||||
|
/*
|
||||||
|
* Vulkan Example - Compute shader N-body simulation using two passes and shared compute shader memory
|
||||||
|
*
|
||||||
|
* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de
|
||||||
|
*
|
||||||
|
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <assert.h>
|
||||||
|
#include <vector>
|
||||||
|
#include <random>
|
||||||
|
|
||||||
|
#define GLM_FORCE_RADIANS
|
||||||
|
#define GLM_FORCE_DEPTH_ZERO_TO_ONE
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
#include <glm/gtc/matrix_transform.hpp>
|
||||||
|
|
||||||
|
#include <vulkan/vulkan.h>
|
||||||
|
#include "vulkanexamplebase.h"
|
||||||
|
|
||||||
|
#define VERTEX_BUFFER_BIND_ID 0
|
||||||
|
#define ENABLE_VALIDATION false
|
||||||
|
#if defined(__ANDROID__)
|
||||||
|
// Lower particle count on Android for performance reasons
|
||||||
|
#define PARTICLES_PER_ATTRACTOR 2 * 1024
|
||||||
|
#else
|
||||||
|
#define PARTICLES_PER_ATTRACTOR 8 * 1024
|
||||||
|
#endif
|
||||||
|
|
||||||
|
class VulkanExample : public VulkanExampleBase
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
uint32_t numParticles;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
vkTools::VulkanTexture particle;
|
||||||
|
vkTools::VulkanTexture gradient;
|
||||||
|
} textures;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
VkPipelineVertexInputStateCreateInfo inputState;
|
||||||
|
std::vector<VkVertexInputBindingDescription> bindingDescriptions;
|
||||||
|
std::vector<VkVertexInputAttributeDescription> attributeDescriptions;
|
||||||
|
} vertices;
|
||||||
|
|
||||||
|
// Resources for the graphics part of the example
|
||||||
|
struct {
|
||||||
|
vk::Buffer uniformBuffer; // Contains scene matrices
|
||||||
|
VkDescriptorSetLayout descriptorSetLayout; // Particle system rendering shader binding layout
|
||||||
|
VkDescriptorSet descriptorSet; // Particle system rendering shader bindings
|
||||||
|
VkPipelineLayout pipelineLayout; // Layout of the graphics pipeline
|
||||||
|
VkPipeline pipeline; // Particle rendering pipeline
|
||||||
|
struct {
|
||||||
|
glm::mat4 projection;
|
||||||
|
glm::mat4 view;
|
||||||
|
} ubo;
|
||||||
|
} graphics;
|
||||||
|
|
||||||
|
// Resources for the compute part of the example
|
||||||
|
struct {
|
||||||
|
vk::Buffer storageBuffer; // (Shader) storage buffer object containing the particles
|
||||||
|
vk::Buffer uniformBuffer; // Uniform buffer object containing particle system parameters
|
||||||
|
VkQueue queue; // Separate queue for compute commands (queue family may differ from the one used for graphics)
|
||||||
|
VkCommandPool commandPool; // Use a separate command pool (queue family may differ from the one used for graphics)
|
||||||
|
VkCommandBuffer commandBuffer; // Command buffer storing the dispatch commands and barriers
|
||||||
|
VkFence fence; // Synchronization fence to avoid rewriting compute CB if still in use
|
||||||
|
VkDescriptorSetLayout descriptorSetLayout; // Compute shader binding layout
|
||||||
|
VkDescriptorSet descriptorSet; // Compute shader bindings
|
||||||
|
VkPipelineLayout pipelineLayout; // Layout of the compute pipeline
|
||||||
|
VkPipeline pipelineCalculate; // Compute pipeline for N-Body velocity calculation (1st pass)
|
||||||
|
VkPipeline pipelineIntegrate; // Compute pipeline for euler integration (2nd pass)
|
||||||
|
VkPipeline blur;
|
||||||
|
VkPipelineLayout pipelineLayoutBlur;
|
||||||
|
VkDescriptorSetLayout descriptorSetLayoutBlur;
|
||||||
|
VkDescriptorSet descriptorSetBlur;
|
||||||
|
struct computeUBO { // Compute shader uniform block object
|
||||||
|
float deltaT; // Frame delta time
|
||||||
|
float destX; // x position of the attractor
|
||||||
|
float destY; // y position of the attractor
|
||||||
|
int32_t particleCount;
|
||||||
|
} ubo;
|
||||||
|
} compute;
|
||||||
|
|
||||||
|
// SSBO particle declaration
|
||||||
|
struct Particle {
|
||||||
|
glm::vec4 pos; // xyz = position, w = mass
|
||||||
|
glm::vec4 vel; // xyz = velocity, w = gradient texture position
|
||||||
|
};
|
||||||
|
|
||||||
|
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||||
|
{
|
||||||
|
enableTextOverlay = true;
|
||||||
|
title = "Vulkan Example - Compute shader N-body system";
|
||||||
|
|
||||||
|
camera.type = Camera::CameraType::lookat;
|
||||||
|
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||||
|
camera.setRotation(glm::vec3(-26.0f, 75.0f, 0.0f));
|
||||||
|
camera.setTranslation(glm::vec3(0.0f, 0.0f, -14.0f));
|
||||||
|
camera.movementSpeed = 2.5f;
|
||||||
|
}
|
||||||
|
|
||||||
|
~VulkanExample()
|
||||||
|
{
|
||||||
|
// Graphics
|
||||||
|
vkDestroyPipeline(device, graphics.pipeline, nullptr);
|
||||||
|
vkDestroyPipelineLayout(device, graphics.pipelineLayout, nullptr);
|
||||||
|
vkDestroyDescriptorSetLayout(device, graphics.descriptorSetLayout, nullptr);
|
||||||
|
|
||||||
|
// Compute
|
||||||
|
compute.storageBuffer.destroy();
|
||||||
|
compute.uniformBuffer.destroy();
|
||||||
|
vkDestroyPipelineLayout(device, compute.pipelineLayout, nullptr);
|
||||||
|
vkDestroyDescriptorSetLayout(device, compute.descriptorSetLayout, nullptr);
|
||||||
|
vkDestroyPipeline(device, compute.pipelineCalculate, nullptr);
|
||||||
|
vkDestroyPipeline(device, compute.pipelineIntegrate, nullptr);
|
||||||
|
vkDestroyFence(device, compute.fence, nullptr);
|
||||||
|
vkDestroyCommandPool(device, compute.commandPool, nullptr);
|
||||||
|
|
||||||
|
textureLoader->destroyTexture(textures.particle);
|
||||||
|
textureLoader->destroyTexture(textures.gradient);
|
||||||
|
}
|
||||||
|
|
||||||
|
void loadTextures()
|
||||||
|
{
|
||||||
|
textureLoader->loadTexture(getAssetPath() + "textures/particle01_rgba.ktx", VK_FORMAT_R8G8B8A8_UNORM, &textures.particle, false);
|
||||||
|
textureLoader->loadTexture(getAssetPath() + "textures/particle_gradient_rgba.ktx", VK_FORMAT_R8G8B8A8_UNORM, &textures.gradient, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void buildCommandBuffers()
|
||||||
|
{
|
||||||
|
// Destroy command buffers if already present
|
||||||
|
if (!checkCommandBuffers())
|
||||||
|
{
|
||||||
|
destroyCommandBuffers();
|
||||||
|
createCommandBuffers();
|
||||||
|
}
|
||||||
|
|
||||||
|
VkCommandBufferBeginInfo cmdBufInfo = vkTools::initializers::commandBufferBeginInfo();
|
||||||
|
|
||||||
|
VkClearValue clearValues[2];
|
||||||
|
clearValues[0].color = { {0.0f, 0.0f, 0.0f, 1.0f} };
|
||||||
|
clearValues[1].depthStencil = { 1.0f, 0 };
|
||||||
|
|
||||||
|
VkRenderPassBeginInfo renderPassBeginInfo = vkTools::initializers::renderPassBeginInfo();
|
||||||
|
renderPassBeginInfo.renderPass = renderPass;
|
||||||
|
renderPassBeginInfo.renderArea.offset.x = 0;
|
||||||
|
renderPassBeginInfo.renderArea.offset.y = 0;
|
||||||
|
renderPassBeginInfo.renderArea.extent.width = width;
|
||||||
|
renderPassBeginInfo.renderArea.extent.height = height;
|
||||||
|
renderPassBeginInfo.clearValueCount = 2;
|
||||||
|
renderPassBeginInfo.pClearValues = clearValues;
|
||||||
|
|
||||||
|
for (int32_t i = 0; i < drawCmdBuffers.size(); ++i)
|
||||||
|
{
|
||||||
|
// Set target frame buffer
|
||||||
|
renderPassBeginInfo.framebuffer = frameBuffers[i];
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkBeginCommandBuffer(drawCmdBuffers[i], &cmdBufInfo));
|
||||||
|
|
||||||
|
// Draw the particle system using the update vertex buffer
|
||||||
|
|
||||||
|
vkCmdBeginRenderPass(drawCmdBuffers[i], &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE);
|
||||||
|
|
||||||
|
VkViewport viewport = vkTools::initializers::viewport((float)width, (float)height, 0.0f, 1.0f);
|
||||||
|
vkCmdSetViewport(drawCmdBuffers[i], 0, 1, &viewport);
|
||||||
|
|
||||||
|
VkRect2D scissor = vkTools::initializers::rect2D(width, height, 0, 0);
|
||||||
|
vkCmdSetScissor(drawCmdBuffers[i], 0, 1, &scissor);
|
||||||
|
|
||||||
|
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, graphics.pipeline);
|
||||||
|
vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, graphics.pipelineLayout, 0, 1, &graphics.descriptorSet, 0, NULL);
|
||||||
|
|
||||||
|
VkDeviceSize offsets[1] = { 0 };
|
||||||
|
vkCmdBindVertexBuffers(drawCmdBuffers[i], VERTEX_BUFFER_BIND_ID, 1, &compute.storageBuffer.buffer, offsets);
|
||||||
|
vkCmdDraw(drawCmdBuffers[i], numParticles, 1, 0, 0);
|
||||||
|
|
||||||
|
vkCmdEndRenderPass(drawCmdBuffers[i]);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i]));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void buildComputeCommandBuffer()
|
||||||
|
{
|
||||||
|
VkCommandBufferBeginInfo cmdBufInfo = vkTools::initializers::commandBufferBeginInfo();
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkBeginCommandBuffer(compute.commandBuffer, &cmdBufInfo));
|
||||||
|
|
||||||
|
// Compute particle movement
|
||||||
|
|
||||||
|
// Add memory barrier to ensure that the (graphics) vertex shader has fetched attributes before compute starts to write to the buffer
|
||||||
|
VkBufferMemoryBarrier bufferBarrier = vkTools::initializers::bufferMemoryBarrier();
|
||||||
|
bufferBarrier.buffer = compute.storageBuffer.buffer;
|
||||||
|
bufferBarrier.size = compute.storageBuffer.descriptor.range;
|
||||||
|
bufferBarrier.srcAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT; // Vertex shader invocations have finished reading from the buffer
|
||||||
|
bufferBarrier.dstAccessMask = VK_ACCESS_SHADER_WRITE_BIT; // Compute shader wants to write to the buffer
|
||||||
|
// Transfer ownership if compute and graphics queue familiy indices differ
|
||||||
|
bufferBarrier.srcQueueFamilyIndex = vulkanDevice->queueFamilyIndices.graphics;
|
||||||
|
bufferBarrier.dstQueueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||||
|
|
||||||
|
vkCmdPipelineBarrier(
|
||||||
|
compute.commandBuffer,
|
||||||
|
VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
|
||||||
|
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
|
||||||
|
VK_FLAGS_NONE,
|
||||||
|
0, nullptr,
|
||||||
|
1, &bufferBarrier,
|
||||||
|
0, nullptr);
|
||||||
|
|
||||||
|
vkCmdBindPipeline(compute.commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, compute.pipelineCalculate);
|
||||||
|
vkCmdBindDescriptorSets(compute.commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, compute.pipelineLayout, 0, 1, &compute.descriptorSet, 0, 0);
|
||||||
|
|
||||||
|
// First pass: Calculate particle movement
|
||||||
|
// -------------------------------------------------------------------------------------------------------
|
||||||
|
vkCmdDispatch(compute.commandBuffer, numParticles / 256, 1, 1);
|
||||||
|
|
||||||
|
// Add memory barrier to ensure that compute shader has finished writing to the buffer
|
||||||
|
bufferBarrier.srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT; // Compute shader has finished writes to the buffer
|
||||||
|
bufferBarrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
|
||||||
|
bufferBarrier.buffer = compute.storageBuffer.buffer;
|
||||||
|
bufferBarrier.size = compute.storageBuffer.descriptor.range;
|
||||||
|
// No ownership transfer necessary
|
||||||
|
bufferBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
|
||||||
|
bufferBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
|
||||||
|
|
||||||
|
vkCmdPipelineBarrier(
|
||||||
|
compute.commandBuffer,
|
||||||
|
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
|
||||||
|
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
|
||||||
|
VK_FLAGS_NONE,
|
||||||
|
0, nullptr,
|
||||||
|
1, &bufferBarrier,
|
||||||
|
0, nullptr);
|
||||||
|
|
||||||
|
// Second pass: Integrate particles
|
||||||
|
// -------------------------------------------------------------------------------------------------------
|
||||||
|
vkCmdBindPipeline(compute.commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, compute.pipelineIntegrate);
|
||||||
|
vkCmdDispatch(compute.commandBuffer, numParticles / 256, 1, 1);
|
||||||
|
|
||||||
|
// Add memory barrier to ensure that compute shader has finished writing to the buffer
|
||||||
|
// Without this the (rendering) vertex shader may display incomplete results (partial data from last frame)
|
||||||
|
bufferBarrier.srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT; // Compute shader has finished writes to the buffer
|
||||||
|
bufferBarrier.dstAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT; // Vertex shader invocations want to read from the buffer
|
||||||
|
bufferBarrier.buffer = compute.storageBuffer.buffer;
|
||||||
|
bufferBarrier.size = compute.storageBuffer.descriptor.range;
|
||||||
|
// Transfer ownership if compute and graphics queue familiy indices differ
|
||||||
|
bufferBarrier.srcQueueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||||
|
bufferBarrier.dstQueueFamilyIndex = vulkanDevice->queueFamilyIndices.graphics;
|
||||||
|
|
||||||
|
vkCmdPipelineBarrier(
|
||||||
|
compute.commandBuffer,
|
||||||
|
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
|
||||||
|
VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
|
||||||
|
VK_FLAGS_NONE,
|
||||||
|
0, nullptr,
|
||||||
|
1, &bufferBarrier,
|
||||||
|
0, nullptr);
|
||||||
|
|
||||||
|
vkEndCommandBuffer(compute.commandBuffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Setup and fill the compute shader storage buffers containing the particles
|
||||||
|
void prepareStorageBuffers()
|
||||||
|
{
|
||||||
|
#if 0
|
||||||
|
std::vector<glm::vec3> attractors = {
|
||||||
|
glm::vec3(2.5f, 1.5f, 0.0f),
|
||||||
|
glm::vec3(-2.5f, -1.5f, 0.0f),
|
||||||
|
};
|
||||||
|
#else
|
||||||
|
std::vector<glm::vec3> attractors = {
|
||||||
|
glm::vec3(5.0f, 0.0f, 0.0f),
|
||||||
|
glm::vec3(-5.0f, 0.0f, 0.0f),
|
||||||
|
glm::vec3(0.0f, 0.0f, 5.0f),
|
||||||
|
glm::vec3(0.0f, 0.0f, -5.0f),
|
||||||
|
glm::vec3(0.0f, 4.0f, 0.0f),
|
||||||
|
glm::vec3(0.0f, -8.0f, 0.0f),
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
numParticles = static_cast<uint32_t>(attractors.size()) * PARTICLES_PER_ATTRACTOR;
|
||||||
|
|
||||||
|
// Initial particle positions
|
||||||
|
std::vector<Particle> particleBuffer(numParticles);
|
||||||
|
|
||||||
|
std::mt19937 rndGen(static_cast<uint32_t>(time(0)));
|
||||||
|
std::normal_distribution<float> rndDist(0.0f, 1.0f);
|
||||||
|
|
||||||
|
for (uint32_t i = 0; i < static_cast<uint32_t>(attractors.size()); i++)
|
||||||
|
{
|
||||||
|
for (uint32_t j = 0; j < PARTICLES_PER_ATTRACTOR; j++)
|
||||||
|
{
|
||||||
|
Particle &particle = particleBuffer[i * PARTICLES_PER_ATTRACTOR + j];
|
||||||
|
|
||||||
|
// First particle in group as heavy center of gravity
|
||||||
|
if (j == 0)
|
||||||
|
{
|
||||||
|
particle.pos = glm::vec4(attractors[i] * 1.5f, 90000.0f);
|
||||||
|
particle.vel = glm::vec4(glm::vec4(0.0f));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Position
|
||||||
|
glm::vec3 position(attractors[i] + glm::vec3(rndDist(rndGen), rndDist(rndGen), rndDist(rndGen)) * 0.75f);
|
||||||
|
float len = glm::length(glm::normalize(position - attractors[i]));
|
||||||
|
position.y *= 2.0f - (len * len);
|
||||||
|
|
||||||
|
// Velocity
|
||||||
|
glm::vec3 angular = glm::vec3(0.5f, 1.5f, 0.5f) * (((i % 2) == 0) ? 1.0f : -1.0f);
|
||||||
|
glm::vec3 velocity = glm::cross((position - attractors[i]), angular) + glm::vec3(rndDist(rndGen), rndDist(rndGen), rndDist(rndGen) * 0.025f);
|
||||||
|
|
||||||
|
float mass = (rndDist(rndGen) * 0.5f + 0.5f) * 75.0f;
|
||||||
|
particle.pos = glm::vec4(position, mass);
|
||||||
|
particle.vel = glm::vec4(velocity, 0.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Color gradient offset
|
||||||
|
particle.vel.w = (float)i * 1.0f / static_cast<uint32_t>(attractors.size());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
compute.ubo.particleCount = numParticles;
|
||||||
|
|
||||||
|
VkDeviceSize storageBufferSize = particleBuffer.size() * sizeof(Particle);
|
||||||
|
|
||||||
|
// Staging
|
||||||
|
// SSBO won't be changed on the host after upload so copy to device local memory
|
||||||
|
|
||||||
|
vk::Buffer stagingBuffer;
|
||||||
|
|
||||||
|
vulkanDevice->createBuffer(
|
||||||
|
VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
|
||||||
|
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
|
||||||
|
&stagingBuffer,
|
||||||
|
storageBufferSize,
|
||||||
|
particleBuffer.data());
|
||||||
|
|
||||||
|
vulkanDevice->createBuffer(
|
||||||
|
// The SSBO will be used as a storage buffer for the compute pipeline and as a vertex buffer in the graphics pipeline
|
||||||
|
VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT,
|
||||||
|
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
|
||||||
|
&compute.storageBuffer,
|
||||||
|
storageBufferSize);
|
||||||
|
|
||||||
|
// Copy to staging buffer
|
||||||
|
VkCommandBuffer copyCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
|
||||||
|
VkBufferCopy copyRegion = {};
|
||||||
|
copyRegion.size = storageBufferSize;
|
||||||
|
vkCmdCopyBuffer(copyCmd, stagingBuffer.buffer, compute.storageBuffer.buffer, 1, ©Region);
|
||||||
|
VulkanExampleBase::flushCommandBuffer(copyCmd, queue, true);
|
||||||
|
|
||||||
|
stagingBuffer.destroy();
|
||||||
|
|
||||||
|
// Binding description
|
||||||
|
vertices.bindingDescriptions.resize(1);
|
||||||
|
vertices.bindingDescriptions[0] =
|
||||||
|
vkTools::initializers::vertexInputBindingDescription(
|
||||||
|
VERTEX_BUFFER_BIND_ID,
|
||||||
|
sizeof(Particle),
|
||||||
|
VK_VERTEX_INPUT_RATE_VERTEX);
|
||||||
|
|
||||||
|
// Attribute descriptions
|
||||||
|
// Describes memory layout and shader positions
|
||||||
|
vertices.attributeDescriptions.resize(2);
|
||||||
|
// Location 0 : Position
|
||||||
|
vertices.attributeDescriptions[0] =
|
||||||
|
vkTools::initializers::vertexInputAttributeDescription(
|
||||||
|
VERTEX_BUFFER_BIND_ID,
|
||||||
|
0,
|
||||||
|
VK_FORMAT_R32G32B32_SFLOAT,
|
||||||
|
offsetof(Particle, pos));
|
||||||
|
// Location 1 : Velocity (used for gradient lookup)
|
||||||
|
vertices.attributeDescriptions[1] =
|
||||||
|
vkTools::initializers::vertexInputAttributeDescription(
|
||||||
|
VERTEX_BUFFER_BIND_ID,
|
||||||
|
1,
|
||||||
|
VK_FORMAT_R32G32B32A32_SFLOAT,
|
||||||
|
offsetof(Particle, vel));
|
||||||
|
|
||||||
|
// Assign to vertex buffer
|
||||||
|
vertices.inputState = vkTools::initializers::pipelineVertexInputStateCreateInfo();
|
||||||
|
vertices.inputState.vertexBindingDescriptionCount = static_cast<uint32_t>(vertices.bindingDescriptions.size());
|
||||||
|
vertices.inputState.pVertexBindingDescriptions = vertices.bindingDescriptions.data();
|
||||||
|
vertices.inputState.vertexAttributeDescriptionCount = static_cast<uint32_t>(vertices.attributeDescriptions.size());
|
||||||
|
vertices.inputState.pVertexAttributeDescriptions = vertices.attributeDescriptions.data();
|
||||||
|
}
|
||||||
|
|
||||||
|
void setupDescriptorPool()
|
||||||
|
{
|
||||||
|
std::vector<VkDescriptorPoolSize> poolSizes =
|
||||||
|
{
|
||||||
|
vkTools::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 2),
|
||||||
|
vkTools::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1),
|
||||||
|
vkTools::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2)
|
||||||
|
};
|
||||||
|
|
||||||
|
VkDescriptorPoolCreateInfo descriptorPoolInfo =
|
||||||
|
vkTools::initializers::descriptorPoolCreateInfo(
|
||||||
|
static_cast<uint32_t>(poolSizes.size()),
|
||||||
|
poolSizes.data(),
|
||||||
|
2);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool));
|
||||||
|
}
|
||||||
|
|
||||||
|
void setupDescriptorSetLayout()
|
||||||
|
{
|
||||||
|
std::vector<VkDescriptorSetLayoutBinding> setLayoutBindings;
|
||||||
|
setLayoutBindings = {
|
||||||
|
vkTools::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, 0),
|
||||||
|
vkTools::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, 1),
|
||||||
|
vkTools::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_VERTEX_BIT, 2),
|
||||||
|
};
|
||||||
|
|
||||||
|
VkDescriptorSetLayoutCreateInfo descriptorLayout =
|
||||||
|
vkTools::initializers::descriptorSetLayoutCreateInfo(
|
||||||
|
setLayoutBindings.data(),
|
||||||
|
static_cast<uint32_t>(setLayoutBindings.size()));
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &graphics.descriptorSetLayout));
|
||||||
|
|
||||||
|
VkPipelineLayoutCreateInfo pipelineLayoutCreateInfo =
|
||||||
|
vkTools::initializers::pipelineLayoutCreateInfo(
|
||||||
|
&graphics.descriptorSetLayout,
|
||||||
|
1);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pipelineLayoutCreateInfo, nullptr, &graphics.pipelineLayout));
|
||||||
|
}
|
||||||
|
|
||||||
|
void setupDescriptorSet()
|
||||||
|
{
|
||||||
|
VkDescriptorSetAllocateInfo allocInfo =
|
||||||
|
vkTools::initializers::descriptorSetAllocateInfo(
|
||||||
|
descriptorPool,
|
||||||
|
&graphics.descriptorSetLayout,
|
||||||
|
1);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &graphics.descriptorSet));
|
||||||
|
|
||||||
|
std::vector<VkWriteDescriptorSet> writeDescriptorSets;
|
||||||
|
writeDescriptorSets = {
|
||||||
|
vkTools::initializers::writeDescriptorSet(graphics.descriptorSet, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 0, &textures.particle.descriptor),
|
||||||
|
vkTools::initializers::writeDescriptorSet(graphics.descriptorSet, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, &textures.gradient.descriptor),
|
||||||
|
vkTools::initializers::writeDescriptorSet(graphics.descriptorSet, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 2, &graphics.uniformBuffer.descriptor),
|
||||||
|
};
|
||||||
|
vkUpdateDescriptorSets(device, static_cast<uint32_t>(writeDescriptorSets.size()), writeDescriptorSets.data(), 0, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
void preparePipelines()
|
||||||
|
{
|
||||||
|
VkPipelineInputAssemblyStateCreateInfo inputAssemblyState =
|
||||||
|
vkTools::initializers::pipelineInputAssemblyStateCreateInfo(
|
||||||
|
VK_PRIMITIVE_TOPOLOGY_POINT_LIST,
|
||||||
|
0,
|
||||||
|
VK_FALSE);
|
||||||
|
|
||||||
|
VkPipelineRasterizationStateCreateInfo rasterizationState =
|
||||||
|
vkTools::initializers::pipelineRasterizationStateCreateInfo(
|
||||||
|
VK_POLYGON_MODE_FILL,
|
||||||
|
VK_CULL_MODE_NONE,
|
||||||
|
VK_FRONT_FACE_COUNTER_CLOCKWISE,
|
||||||
|
0);
|
||||||
|
|
||||||
|
VkPipelineColorBlendAttachmentState blendAttachmentState =
|
||||||
|
vkTools::initializers::pipelineColorBlendAttachmentState(
|
||||||
|
0xf,
|
||||||
|
VK_FALSE);
|
||||||
|
|
||||||
|
VkPipelineColorBlendStateCreateInfo colorBlendState =
|
||||||
|
vkTools::initializers::pipelineColorBlendStateCreateInfo(
|
||||||
|
1,
|
||||||
|
&blendAttachmentState);
|
||||||
|
|
||||||
|
VkPipelineDepthStencilStateCreateInfo depthStencilState =
|
||||||
|
vkTools::initializers::pipelineDepthStencilStateCreateInfo(
|
||||||
|
VK_FALSE,
|
||||||
|
VK_FALSE,
|
||||||
|
VK_COMPARE_OP_ALWAYS);
|
||||||
|
|
||||||
|
VkPipelineViewportStateCreateInfo viewportState =
|
||||||
|
vkTools::initializers::pipelineViewportStateCreateInfo(1, 1, 0);
|
||||||
|
|
||||||
|
VkPipelineMultisampleStateCreateInfo multisampleState =
|
||||||
|
vkTools::initializers::pipelineMultisampleStateCreateInfo(
|
||||||
|
VK_SAMPLE_COUNT_1_BIT,
|
||||||
|
0);
|
||||||
|
|
||||||
|
std::vector<VkDynamicState> dynamicStateEnables = {
|
||||||
|
VK_DYNAMIC_STATE_VIEWPORT,
|
||||||
|
VK_DYNAMIC_STATE_SCISSOR
|
||||||
|
};
|
||||||
|
VkPipelineDynamicStateCreateInfo dynamicState =
|
||||||
|
vkTools::initializers::pipelineDynamicStateCreateInfo(
|
||||||
|
dynamicStateEnables.data(),
|
||||||
|
static_cast<uint32_t>(dynamicStateEnables.size()),
|
||||||
|
0);
|
||||||
|
|
||||||
|
// Rendering pipeline
|
||||||
|
// Load shaders
|
||||||
|
std::array<VkPipelineShaderStageCreateInfo,2> shaderStages;
|
||||||
|
|
||||||
|
shaderStages[0] = loadShader(getAssetPath() + "shaders/computenbody/particle.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
|
||||||
|
shaderStages[1] = loadShader(getAssetPath() + "shaders/computenbody/particle.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
|
||||||
|
|
||||||
|
VkGraphicsPipelineCreateInfo pipelineCreateInfo =
|
||||||
|
vkTools::initializers::pipelineCreateInfo(
|
||||||
|
graphics.pipelineLayout,
|
||||||
|
renderPass,
|
||||||
|
0);
|
||||||
|
|
||||||
|
pipelineCreateInfo.pVertexInputState = &vertices.inputState;
|
||||||
|
pipelineCreateInfo.pInputAssemblyState = &inputAssemblyState;
|
||||||
|
pipelineCreateInfo.pRasterizationState = &rasterizationState;
|
||||||
|
pipelineCreateInfo.pColorBlendState = &colorBlendState;
|
||||||
|
pipelineCreateInfo.pMultisampleState = &multisampleState;
|
||||||
|
pipelineCreateInfo.pViewportState = &viewportState;
|
||||||
|
pipelineCreateInfo.pDepthStencilState = &depthStencilState;
|
||||||
|
pipelineCreateInfo.pDynamicState = &dynamicState;
|
||||||
|
pipelineCreateInfo.stageCount = static_cast<uint32_t>(shaderStages.size());
|
||||||
|
pipelineCreateInfo.pStages = shaderStages.data();
|
||||||
|
pipelineCreateInfo.renderPass = renderPass;
|
||||||
|
|
||||||
|
// Additive blending
|
||||||
|
blendAttachmentState.colorWriteMask = 0xF;
|
||||||
|
blendAttachmentState.blendEnable = VK_TRUE;
|
||||||
|
blendAttachmentState.colorBlendOp = VK_BLEND_OP_ADD;
|
||||||
|
blendAttachmentState.srcColorBlendFactor = VK_BLEND_FACTOR_ONE;
|
||||||
|
blendAttachmentState.dstColorBlendFactor = VK_BLEND_FACTOR_ONE;
|
||||||
|
blendAttachmentState.alphaBlendOp = VK_BLEND_OP_ADD;
|
||||||
|
blendAttachmentState.srcAlphaBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA;
|
||||||
|
blendAttachmentState.dstAlphaBlendFactor = VK_BLEND_FACTOR_DST_ALPHA;
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &graphics.pipeline));
|
||||||
|
}
|
||||||
|
|
||||||
|
void prepareCompute()
|
||||||
|
{
|
||||||
|
// Create a compute capable device queue
|
||||||
|
// The VulkanDevice::createLogicalDevice functions finds a compute capable queue and prefers queue families that only support compute
|
||||||
|
// Depending on the implementation this may result in different queue family indices for graphics and computes,
|
||||||
|
// requiring proper synchronization (see the memory barriers in buildComputeCommandBuffer)
|
||||||
|
VkDeviceQueueCreateInfo queueCreateInfo = {};
|
||||||
|
queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
|
||||||
|
queueCreateInfo.pNext = NULL;
|
||||||
|
queueCreateInfo.queueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||||
|
queueCreateInfo.queueCount = 1;
|
||||||
|
vkGetDeviceQueue(device, vulkanDevice->queueFamilyIndices.compute, 0, &compute.queue);
|
||||||
|
|
||||||
|
// Create compute pipeline
|
||||||
|
// Compute pipelines are created separate from graphics pipelines even if they use the same queue (family index)
|
||||||
|
|
||||||
|
std::vector<VkDescriptorSetLayoutBinding> setLayoutBindings = {
|
||||||
|
// Binding 0 : Particle position storage buffer
|
||||||
|
vkTools::initializers::descriptorSetLayoutBinding(
|
||||||
|
VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
|
||||||
|
VK_SHADER_STAGE_COMPUTE_BIT,
|
||||||
|
0),
|
||||||
|
// Binding 1 : Uniform buffer
|
||||||
|
vkTools::initializers::descriptorSetLayoutBinding(
|
||||||
|
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||||
|
VK_SHADER_STAGE_COMPUTE_BIT,
|
||||||
|
1),
|
||||||
|
};
|
||||||
|
|
||||||
|
VkDescriptorSetLayoutCreateInfo descriptorLayout =
|
||||||
|
vkTools::initializers::descriptorSetLayoutCreateInfo(
|
||||||
|
setLayoutBindings.data(),
|
||||||
|
static_cast<uint32_t>(setLayoutBindings.size()));
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &compute.descriptorSetLayout));
|
||||||
|
|
||||||
|
VkPipelineLayoutCreateInfo pPipelineLayoutCreateInfo =
|
||||||
|
vkTools::initializers::pipelineLayoutCreateInfo(
|
||||||
|
&compute.descriptorSetLayout,
|
||||||
|
1);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pPipelineLayoutCreateInfo, nullptr, &compute.pipelineLayout));
|
||||||
|
|
||||||
|
VkDescriptorSetAllocateInfo allocInfo =
|
||||||
|
vkTools::initializers::descriptorSetAllocateInfo(
|
||||||
|
descriptorPool,
|
||||||
|
&compute.descriptorSetLayout,
|
||||||
|
1);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &compute.descriptorSet));
|
||||||
|
|
||||||
|
std::vector<VkWriteDescriptorSet> computeWriteDescriptorSets =
|
||||||
|
{
|
||||||
|
// Binding 0 : Particle position storage buffer
|
||||||
|
vkTools::initializers::writeDescriptorSet(
|
||||||
|
compute.descriptorSet,
|
||||||
|
VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
|
||||||
|
0,
|
||||||
|
&compute.storageBuffer.descriptor),
|
||||||
|
// Binding 1 : Uniform buffer
|
||||||
|
vkTools::initializers::writeDescriptorSet(
|
||||||
|
compute.descriptorSet,
|
||||||
|
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||||
|
1,
|
||||||
|
&compute.uniformBuffer.descriptor)
|
||||||
|
};
|
||||||
|
|
||||||
|
vkUpdateDescriptorSets(device, static_cast<uint32_t>(computeWriteDescriptorSets.size()), computeWriteDescriptorSets.data(), 0, NULL);
|
||||||
|
|
||||||
|
// Create pipelines
|
||||||
|
VkComputePipelineCreateInfo computePipelineCreateInfo = vkTools::initializers::computePipelineCreateInfo(compute.pipelineLayout, 0);
|
||||||
|
|
||||||
|
// 1st pass
|
||||||
|
computePipelineCreateInfo.stage = loadShader(getAssetPath() + "shaders/computenbody/particle_calculate.comp.spv", VK_SHADER_STAGE_COMPUTE_BIT);
|
||||||
|
|
||||||
|
// Set shader parameters via specialization constants
|
||||||
|
struct SpecializationData {
|
||||||
|
uint32_t sharedDataSize;
|
||||||
|
float gravity;
|
||||||
|
float power;
|
||||||
|
float soften;
|
||||||
|
} specializationData;
|
||||||
|
|
||||||
|
std::vector<VkSpecializationMapEntry> specializationMapEntries;
|
||||||
|
specializationMapEntries.push_back(vkTools::initializers::specializationMapEntry(0, offsetof(SpecializationData, sharedDataSize), sizeof(uint32_t)));
|
||||||
|
specializationMapEntries.push_back(vkTools::initializers::specializationMapEntry(1, offsetof(SpecializationData, gravity), sizeof(float)));
|
||||||
|
specializationMapEntries.push_back(vkTools::initializers::specializationMapEntry(2, offsetof(SpecializationData, power), sizeof(float)));
|
||||||
|
specializationMapEntries.push_back(vkTools::initializers::specializationMapEntry(3, offsetof(SpecializationData, soften), sizeof(float)));
|
||||||
|
|
||||||
|
specializationData.sharedDataSize = std::min((uint32_t)1024, vulkanDevice->properties.limits.maxComputeSharedMemorySize);
|
||||||
|
specializationData.gravity = 0.0025f;
|
||||||
|
specializationData.power = 0.85f;
|
||||||
|
specializationData.soften = 0.15f;
|
||||||
|
|
||||||
|
VkSpecializationInfo specializationInfo =
|
||||||
|
vkTools::initializers::specializationInfo(static_cast<uint32_t>(specializationMapEntries.size()), specializationMapEntries.data(), sizeof(specializationData), &specializationData);
|
||||||
|
computePipelineCreateInfo.stage.pSpecializationInfo = &specializationInfo;
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkCreateComputePipelines(device, pipelineCache, 1, &computePipelineCreateInfo, nullptr, &compute.pipelineCalculate));
|
||||||
|
|
||||||
|
// 2nd pass
|
||||||
|
computePipelineCreateInfo.stage = loadShader(getAssetPath() + "shaders/computenbody/particle_integrate.comp.spv", VK_SHADER_STAGE_COMPUTE_BIT);
|
||||||
|
VK_CHECK_RESULT(vkCreateComputePipelines(device, pipelineCache, 1, &computePipelineCreateInfo, nullptr, &compute.pipelineIntegrate));
|
||||||
|
|
||||||
|
// Separate command pool as queue family for compute may be different than graphics
|
||||||
|
VkCommandPoolCreateInfo cmdPoolInfo = {};
|
||||||
|
cmdPoolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
|
||||||
|
cmdPoolInfo.queueFamilyIndex = vulkanDevice->queueFamilyIndices.compute;
|
||||||
|
cmdPoolInfo.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
|
||||||
|
VK_CHECK_RESULT(vkCreateCommandPool(device, &cmdPoolInfo, nullptr, &compute.commandPool));
|
||||||
|
|
||||||
|
// Create a command buffer for compute operations
|
||||||
|
VkCommandBufferAllocateInfo cmdBufAllocateInfo =
|
||||||
|
vkTools::initializers::commandBufferAllocateInfo(
|
||||||
|
compute.commandPool,
|
||||||
|
VK_COMMAND_BUFFER_LEVEL_PRIMARY,
|
||||||
|
1);
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkAllocateCommandBuffers(device, &cmdBufAllocateInfo, &compute.commandBuffer));
|
||||||
|
|
||||||
|
// Fence for compute CB sync
|
||||||
|
VkFenceCreateInfo fenceCreateInfo = vkTools::initializers::fenceCreateInfo(VK_FENCE_CREATE_SIGNALED_BIT);
|
||||||
|
VK_CHECK_RESULT(vkCreateFence(device, &fenceCreateInfo, nullptr, &compute.fence));
|
||||||
|
|
||||||
|
// Build a single command buffer containing the compute dispatch commands
|
||||||
|
buildComputeCommandBuffer();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prepare and initialize uniform buffer containing shader uniforms
|
||||||
|
void prepareUniformBuffers()
|
||||||
|
{
|
||||||
|
// Compute shader uniform buffer block
|
||||||
|
vulkanDevice->createBuffer(
|
||||||
|
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
|
||||||
|
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
|
||||||
|
&compute.uniformBuffer,
|
||||||
|
sizeof(compute.ubo));
|
||||||
|
|
||||||
|
// Map for host access
|
||||||
|
VK_CHECK_RESULT(compute.uniformBuffer.map());
|
||||||
|
|
||||||
|
// Vertex shader uniform buffer block
|
||||||
|
vulkanDevice->createBuffer(
|
||||||
|
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
|
||||||
|
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
|
||||||
|
&graphics.uniformBuffer,
|
||||||
|
sizeof(graphics.ubo));
|
||||||
|
|
||||||
|
// Map for host access
|
||||||
|
VK_CHECK_RESULT(graphics.uniformBuffer.map());
|
||||||
|
|
||||||
|
updateGraphicsUniformBuffers();
|
||||||
|
}
|
||||||
|
|
||||||
|
void updateUniformBuffers()
|
||||||
|
{
|
||||||
|
compute.ubo.deltaT = paused ? 0.0f : frameTimer * 0.05f;
|
||||||
|
compute.ubo.destX = sin(glm::radians(timer * 360.0f)) * 0.75f;
|
||||||
|
compute.ubo.destY = 0.0f;
|
||||||
|
memcpy(compute.uniformBuffer.mapped, &compute.ubo, sizeof(compute.ubo));
|
||||||
|
}
|
||||||
|
|
||||||
|
void updateGraphicsUniformBuffers()
|
||||||
|
{
|
||||||
|
graphics.ubo.projection = camera.matrices.perspective;
|
||||||
|
graphics.ubo.view = camera.matrices.view;
|
||||||
|
memcpy(graphics.uniformBuffer.mapped, &graphics.ubo, sizeof(graphics.ubo));
|
||||||
|
}
|
||||||
|
|
||||||
|
void draw()
|
||||||
|
{
|
||||||
|
// Submit graphics commands
|
||||||
|
VulkanExampleBase::prepareFrame();
|
||||||
|
|
||||||
|
submitInfo.commandBufferCount = 1;
|
||||||
|
submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer];
|
||||||
|
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE));
|
||||||
|
|
||||||
|
VulkanExampleBase::submitFrame();
|
||||||
|
|
||||||
|
// Submit compute commands
|
||||||
|
vkWaitForFences(device, 1, &compute.fence, VK_TRUE, UINT64_MAX);
|
||||||
|
vkResetFences(device, 1, &compute.fence);
|
||||||
|
|
||||||
|
VkSubmitInfo computeSubmitInfo = vkTools::initializers::submitInfo();
|
||||||
|
computeSubmitInfo.commandBufferCount = 1;
|
||||||
|
computeSubmitInfo.pCommandBuffers = &compute.commandBuffer;
|
||||||
|
|
||||||
|
VK_CHECK_RESULT(vkQueueSubmit(compute.queue, 1, &computeSubmitInfo, compute.fence));
|
||||||
|
}
|
||||||
|
|
||||||
|
void prepare()
|
||||||
|
{
|
||||||
|
VulkanExampleBase::prepare();
|
||||||
|
loadTextures();
|
||||||
|
prepareStorageBuffers();
|
||||||
|
prepareUniformBuffers();
|
||||||
|
setupDescriptorSetLayout();
|
||||||
|
preparePipelines();
|
||||||
|
setupDescriptorPool();
|
||||||
|
setupDescriptorSet();
|
||||||
|
prepareCompute();
|
||||||
|
buildCommandBuffers();
|
||||||
|
prepared = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void render()
|
||||||
|
{
|
||||||
|
if (!prepared)
|
||||||
|
return;
|
||||||
|
draw();
|
||||||
|
updateUniformBuffers();
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void viewChanged()
|
||||||
|
{
|
||||||
|
updateGraphicsUniformBuffers();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
VULKAN_EXAMPLE_MAIN()
|
||||||
101
computenbody/computenbody.vcxproj
Normal file
101
computenbody/computenbody.vcxproj
Normal file
|
|
@ -0,0 +1,101 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{6B4BC372-5897-40FB-91D4-421C2817F656}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\bin\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\bin\intermediate\$(ProjectName)\$(ConfigurationName)</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\bin\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\bin\intermediate\$(ProjectName)\$(ConfigurationName)</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;VK_USE_PLATFORM_WIN32_KHR;_USE_MATH_DEFINES;NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<AdditionalIncludeDirectories>..\base;..\external\glm;..\external\gli;..\external\assimp;..\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<AdditionalDependencies>..\libs\vulkan\vulkan-1.lib;..\libs\assimp\assimp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;VK_USE_PLATFORM_WIN32_KHR;_USE_MATH_DEFINES;NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<AdditionalIncludeDirectories>..\base;..\external\glm;..\external\gli;..\external\assimp;..\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<AdditionalDependencies>..\libs\vulkan\vulkan-1.lib;..\libs\assimp\assimp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\base\vulkandebug.cpp" />
|
||||||
|
<ClCompile Include="..\base\vulkanexamplebase.cpp" />
|
||||||
|
<ClCompile Include="..\base\vulkantools.cpp" />
|
||||||
|
<ClCompile Include="computenbody.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\base\vulkandebug.h" />
|
||||||
|
<ClInclude Include="..\base\vulkanexamplebase.h" />
|
||||||
|
<ClInclude Include="..\base\vulkantools.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\data\shaders\computenbody\particle.frag" />
|
||||||
|
<None Include="..\data\shaders\computenbody\particle.vert" />
|
||||||
|
<None Include="..\data\shaders\computenbody\particle_calculate.comp" />
|
||||||
|
<None Include="..\data\shaders\computenbody\particle_integrate.comp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
59
computenbody/computenbody.vcxproj.filters
Normal file
59
computenbody/computenbody.vcxproj.filters
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||||
|
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Header Files">
|
||||||
|
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||||
|
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Resource Files">
|
||||||
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Shaders">
|
||||||
|
<UniqueIdentifier>{e28680da-cc95-413d-b6f0-0e1f9967ee88}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\base\vulkandebug.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\base\vulkanexamplebase.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\base\vulkantools.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="computenbody.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\base\vulkandebug.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\base\vulkanexamplebase.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\base\vulkantools.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\data\shaders\computenbody\particle.frag">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\data\shaders\computenbody\particle.vert">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\data\shaders\computenbody\particle_integrate.comp">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="..\data\shaders\computenbody\particle_calculate.comp">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
17
data/shaders/computenbody/particle.frag
Normal file
17
data/shaders/computenbody/particle.frag
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
#version 450
|
||||||
|
|
||||||
|
#extension GL_ARB_separate_shader_objects : enable
|
||||||
|
#extension GL_ARB_shading_language_420pack : enable
|
||||||
|
|
||||||
|
layout (binding = 0) uniform sampler2D samplerColorMap;
|
||||||
|
layout (binding = 1) uniform sampler2D samplerGradientRamp;
|
||||||
|
|
||||||
|
layout (location = 0) in float inGradientPos;
|
||||||
|
|
||||||
|
layout (location = 0) out vec4 outFragColor;
|
||||||
|
|
||||||
|
void main ()
|
||||||
|
{
|
||||||
|
vec3 color = texture(samplerGradientRamp, vec2(inGradientPos, 0.0)).rgb;
|
||||||
|
outFragColor.rgb = texture(samplerColorMap, gl_PointCoord).rgb * color;
|
||||||
|
}
|
||||||
BIN
data/shaders/computenbody/particle.frag.spv
Normal file
BIN
data/shaders/computenbody/particle.frag.spv
Normal file
Binary file not shown.
28
data/shaders/computenbody/particle.vert
Normal file
28
data/shaders/computenbody/particle.vert
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
#version 450
|
||||||
|
|
||||||
|
#extension GL_ARB_separate_shader_objects : enable
|
||||||
|
#extension GL_ARB_shading_language_420pack : enable
|
||||||
|
|
||||||
|
layout (location = 0) in vec3 inPos;
|
||||||
|
layout (location = 1) in vec4 inVel;
|
||||||
|
|
||||||
|
layout (location = 0) out float outGradientPos;
|
||||||
|
|
||||||
|
layout (binding = 2) uniform UBO
|
||||||
|
{
|
||||||
|
mat4 projection;
|
||||||
|
mat4 modelview;
|
||||||
|
} ubo;
|
||||||
|
|
||||||
|
out gl_PerVertex
|
||||||
|
{
|
||||||
|
vec4 gl_Position;
|
||||||
|
float gl_PointSize;
|
||||||
|
};
|
||||||
|
|
||||||
|
void main ()
|
||||||
|
{
|
||||||
|
gl_PointSize = 8.0;
|
||||||
|
outGradientPos = inVel.w;
|
||||||
|
gl_Position = ubo.projection * ubo.modelview * vec4(inPos, 1.0);
|
||||||
|
}
|
||||||
BIN
data/shaders/computenbody/particle.vert.spv
Normal file
BIN
data/shaders/computenbody/particle.vert.spv
Normal file
Binary file not shown.
75
data/shaders/computenbody/particle_calculate.comp
Normal file
75
data/shaders/computenbody/particle_calculate.comp
Normal file
|
|
@ -0,0 +1,75 @@
|
||||||
|
|
||||||
|
#version 450
|
||||||
|
|
||||||
|
#extension GL_ARB_separate_shader_objects : enable
|
||||||
|
#extension GL_ARB_shading_language_420pack : enable
|
||||||
|
|
||||||
|
struct Particle
|
||||||
|
{
|
||||||
|
vec4 pos;
|
||||||
|
vec4 vel;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Binding 0 : Position storage buffer
|
||||||
|
layout(std140, binding = 0) buffer Pos
|
||||||
|
{
|
||||||
|
Particle particles[ ];
|
||||||
|
};
|
||||||
|
|
||||||
|
layout (local_size_x = 256) in;
|
||||||
|
|
||||||
|
layout (binding = 1) uniform UBO
|
||||||
|
{
|
||||||
|
float deltaT;
|
||||||
|
float destX;
|
||||||
|
float destY;
|
||||||
|
int particleCount;
|
||||||
|
} ubo;
|
||||||
|
|
||||||
|
layout (constant_id = 0) const int SHARED_DATA_SIZE = 512;
|
||||||
|
layout (constant_id = 1) const float GRAVITY = 0.002;
|
||||||
|
layout (constant_id = 2) const float POWER = 0.75;
|
||||||
|
layout (constant_id = 3) const float SOFTEN = 0.0075;
|
||||||
|
|
||||||
|
// Share data between computer shader invocations to speed up caluclations
|
||||||
|
shared vec4 sharedData[SHARED_DATA_SIZE];
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
// Current SSBO index
|
||||||
|
uint index = gl_GlobalInvocationID.x;
|
||||||
|
if (index >= ubo.particleCount)
|
||||||
|
return;
|
||||||
|
|
||||||
|
vec4 position = particles[index].pos;
|
||||||
|
vec4 velocity = particles[index].vel;
|
||||||
|
vec4 acceleration = vec4(0.0);
|
||||||
|
|
||||||
|
for (int i = 0; i < ubo.particleCount; i += SHARED_DATA_SIZE)
|
||||||
|
{
|
||||||
|
if (i + gl_LocalInvocationID.x < ubo.particleCount)
|
||||||
|
{
|
||||||
|
sharedData[gl_LocalInvocationID.x] = particles[i + gl_LocalInvocationID.x].pos;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sharedData[gl_LocalInvocationID.x] = vec4(0.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
memoryBarrierShared();
|
||||||
|
|
||||||
|
for (int j = 0; j < gl_WorkGroupSize.x; j++)
|
||||||
|
{
|
||||||
|
vec4 other = sharedData[j];
|
||||||
|
vec3 len = other.xyz - position.xyz;
|
||||||
|
acceleration.xyz += GRAVITY * len * other.w / pow(dot(len, len) + SOFTEN, POWER);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
particles[index].vel.xyz += ubo.deltaT * acceleration.xyz;
|
||||||
|
|
||||||
|
// Gradient texture position
|
||||||
|
particles[index].vel.w += 0.1 * ubo.deltaT;
|
||||||
|
if (particles[index].vel.w > 1.0)
|
||||||
|
particles[index].vel.w -= 1.0;
|
||||||
|
}
|
||||||
BIN
data/shaders/computenbody/particle_calculate.comp.spv
Normal file
BIN
data/shaders/computenbody/particle_calculate.comp.spv
Normal file
Binary file not shown.
35
data/shaders/computenbody/particle_integrate.comp
Normal file
35
data/shaders/computenbody/particle_integrate.comp
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
#version 450
|
||||||
|
|
||||||
|
#extension GL_ARB_separate_shader_objects : enable
|
||||||
|
#extension GL_ARB_shading_language_420pack : enable
|
||||||
|
|
||||||
|
struct Particle
|
||||||
|
{
|
||||||
|
vec4 pos;
|
||||||
|
vec4 vel;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Binding 0 : Position storage buffer
|
||||||
|
layout(std140, binding = 0) buffer Pos
|
||||||
|
{
|
||||||
|
Particle particles[ ];
|
||||||
|
};
|
||||||
|
|
||||||
|
layout (local_size_x = 256) in;
|
||||||
|
|
||||||
|
layout (binding = 1) uniform UBO
|
||||||
|
{
|
||||||
|
float deltaT;
|
||||||
|
float destX;
|
||||||
|
float destY;
|
||||||
|
int particleCount;
|
||||||
|
} ubo;
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
int index = int(gl_GlobalInvocationID);
|
||||||
|
vec4 position = particles[index].pos;
|
||||||
|
vec4 velocity = particles[index].vel;
|
||||||
|
position += ubo.deltaT * velocity;
|
||||||
|
particles[index].pos = position;
|
||||||
|
}
|
||||||
BIN
data/shaders/computenbody/particle_integrate.comp.spv
Normal file
BIN
data/shaders/computenbody/particle_integrate.comp.spv
Normal file
Binary file not shown.
|
|
@ -121,6 +121,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subpasses", "subpasses\subp
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssao", "ssao\ssao.vcxproj", "{43FCECF5-F5E1-45DB-972A-73942D459C0A}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssao", "ssao\ssao.vcxproj", "{43FCECF5-F5E1-45DB-972A-73942D459C0A}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "computenbody", "computenbody\computenbody.vcxproj", "{6B4BC372-5897-40FB-91D4-421C2817F656}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9E815C67-731B-4559-938E-23CD771F0860}"
|
||||||
|
ProjectSection(SolutionItems) = preProject
|
||||||
|
CMakeLists.txt = CMakeLists.txt
|
||||||
|
EndProjectSection
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
|
|
@ -299,6 +306,10 @@ Global
|
||||||
{43FCECF5-F5E1-45DB-972A-73942D459C0A}.Debug|x64.Build.0 = Debug|x64
|
{43FCECF5-F5E1-45DB-972A-73942D459C0A}.Debug|x64.Build.0 = Debug|x64
|
||||||
{43FCECF5-F5E1-45DB-972A-73942D459C0A}.Release|x64.ActiveCfg = Release|x64
|
{43FCECF5-F5E1-45DB-972A-73942D459C0A}.Release|x64.ActiveCfg = Release|x64
|
||||||
{43FCECF5-F5E1-45DB-972A-73942D459C0A}.Release|x64.Build.0 = Release|x64
|
{43FCECF5-F5E1-45DB-972A-73942D459C0A}.Release|x64.Build.0 = Release|x64
|
||||||
|
{6B4BC372-5897-40FB-91D4-421C2817F656}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{6B4BC372-5897-40FB-91D4-421C2817F656}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{6B4BC372-5897-40FB-91D4-421C2817F656}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{6B4BC372-5897-40FB-91D4-421C2817F656}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
@ -320,5 +331,6 @@ Global
|
||||||
{1FA0178C-F5E9-4B2E-A488-14F310F8DBD9} = {A8492D6D-5243-456E-8173-39B99F1FEA9C}
|
{1FA0178C-F5E9-4B2E-A488-14F310F8DBD9} = {A8492D6D-5243-456E-8173-39B99F1FEA9C}
|
||||||
{0CB44B34-A81F-4002-9AC7-E0EEA55D8A60} = {460EE42F-4178-49EF-9AC0-415599B80303}
|
{0CB44B34-A81F-4002-9AC7-E0EEA55D8A60} = {460EE42F-4178-49EF-9AC0-415599B80303}
|
||||||
{8418A364-3D1C-4938-A2CC-C1D1433039F2} = {6B47BC47-0394-429E-9441-867EC23DFCD4}
|
{8418A364-3D1C-4938-A2CC-C1D1433039F2} = {6B47BC47-0394-429E-9441-867EC23DFCD4}
|
||||||
|
{6B4BC372-5897-40FB-91D4-421C2817F656} = {6B47BC47-0394-429E-9441-867EC23DFCD4}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue