diff --git a/indirectdraw/indirectdraw.cpp b/indirectdraw/indirectdraw.cpp new file mode 100644 index 00000000..1b4fd651 --- /dev/null +++ b/indirectdraw/indirectdraw.cpp @@ -0,0 +1,719 @@ +/* +* Vulkan Example - Indirect drawing +* +* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de +* +* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) +* +* Summary: +* Use a device local buffer that stores draw commands for instanced rendering of different meshes. +* +* Indirect drawing offloads draw command generation and offers the ability to update them on the GPU +* without the CPU having to touch the buffer again, also reducing the number of drawcalls. +* +* The example shows how to setup and fill such a buffer on the CPU side, stages it to the device and +* shows how render it using only one draw command. +* +*/ + +#include +#include +#include +#include +#include +#include +#include + +#define GLM_FORCE_RADIANS +#define GLM_FORCE_DEPTH_ZERO_TO_ONE +#include +#include + +#include +#include "vulkanexamplebase.h" +#include "vulkanbuffer.hpp" + +#define VERTEX_BUFFER_BIND_ID 0 +#define INSTANCE_BUFFER_BIND_ID 1 +#define ENABLE_VALIDATION false + +// Number of instances per object +#define OBJECT_INSTANCE_COUNT 2048 + +// Vertex layout for this example +std::vector vertexLayout = +{ + vkMeshLoader::VERTEX_LAYOUT_POSITION, + vkMeshLoader::VERTEX_LAYOUT_NORMAL, + vkMeshLoader::VERTEX_LAYOUT_UV, + vkMeshLoader::VERTEX_LAYOUT_COLOR +}; + +class VulkanExample : public VulkanExampleBase +{ +public: + struct { + VkPipelineVertexInputStateCreateInfo inputState; + std::vector bindingDescriptions; + std::vector attributeDescriptions; + } vertices; + + struct { + vkMeshLoader::MeshBuffer example; + } meshes; + + struct { + vkTools::VulkanTexture colorMap; + } textures; + + // Per-instance data block + struct InstanceData { + glm::vec3 pos; + glm::vec3 rot; + glm::vec3 color; + float scale; + uint32_t texIndex; + }; + + // Contains the instanced data + vk::Buffer instanceBuffer; + // Contains the indirect drawing commands + vk::Buffer indirectCommandsBuffer; + uint32_t indirectDrawCount; + + struct { + glm::mat4 projection; + glm::mat4 view; + float time = 0.0f; + } uboVS; + + struct { + vk::Buffer scene; + } uniformData; + + struct { + VkPipeline solid; + } pipelines; + + VkPipelineLayout pipelineLayout; + VkDescriptorSet descriptorSet; + VkDescriptorSetLayout descriptorSetLayout; + + uint32_t objectCount = 0; + + // Store the indirect draw commands containing index offsets and instance count per object + std::vector indirectCommands; + + VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION) + { + zoom = -12.0f; + rotationSpeed = 0.25f; + enableTextOverlay = true; + title = "Vulkan Example - Indirect rendering"; + srand(time(NULL)); + } + + ~VulkanExample() + { + vkDestroyPipeline(device, pipelines.solid, nullptr); + vkDestroyPipelineLayout(device, pipelineLayout, nullptr); + vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); + vkMeshLoader::freeMeshBufferResources(device, &meshes.example); + textureLoader->destroyTexture(textures.colorMap); + instanceBuffer.destroy(); + indirectCommandsBuffer.destroy(); + uniformData.scene.destroy(); + } + + void reBuildCommandBuffers() + { + if (!checkCommandBuffers()) + { + destroyCommandBuffers(); + createCommandBuffers(); + } + buildCommandBuffers(); + } + + void buildCommandBuffers() + { + VkCommandBufferBeginInfo cmdBufInfo = vkTools::initializers::commandBufferBeginInfo(); + + VkClearValue clearValues[2]; + clearValues[0].color = { { 0.0f, 0.0f, 0.0f, 0.0f } }; + clearValues[1].depthStencil = { 1.0f, 0 }; + + VkRenderPassBeginInfo renderPassBeginInfo = vkTools::initializers::renderPassBeginInfo(); + renderPassBeginInfo.renderPass = renderPass; + 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)); + + 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); + + vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, NULL); + vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.solid); + + VkDeviceSize offsets[1] = { 0 }; + // Binding point 0 : Mesh vertex buffer + vkCmdBindVertexBuffers(drawCmdBuffers[i], VERTEX_BUFFER_BIND_ID, 1, &meshes.example.vertices.buf, offsets); + // Binding point 1 : Instance data buffer + vkCmdBindVertexBuffers(drawCmdBuffers[i], INSTANCE_BUFFER_BIND_ID, 1, &instanceBuffer.buffer, offsets); + + vkCmdBindIndexBuffer(drawCmdBuffers[i], meshes.example.indices.buf, 0, VK_INDEX_TYPE_UINT32); + + // One draw call for an arbitrary number of ojects + // Index offsets and instance count are taken from the indirect buffer + vkCmdDrawIndexedIndirect(drawCmdBuffers[i], indirectCommandsBuffer.buffer, 0, indirectDrawCount, sizeof(VkDrawIndexedIndirectCommand)); + + vkCmdEndRenderPass(drawCmdBuffers[i]); + + VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i])); + } + } + + void loadMeshes() + { + loadMesh(getAssetPath() + "models/basicmeshes.dae", &meshes.example, vertexLayout, 0.1f); + } + + void loadTextures() + { + textureLoader->loadTextureArray( + getAssetPath() + "textures/texturearray_rocks_bc3.ktx", + VK_FORMAT_BC3_UNORM_BLOCK, + &textures.colorMap); + } + + void setupVertexDescriptions() + { + // Binding description + vertices.bindingDescriptions.resize(2); + + // Mesh vertex buffer (description) at binding point 0 + vertices.bindingDescriptions[0] = + vkTools::initializers::vertexInputBindingDescription( + VERTEX_BUFFER_BIND_ID, + vkMeshLoader::vertexSize(vertexLayout), + // Input rate for the data passed to shader + // Step for each vertex rendered + VK_VERTEX_INPUT_RATE_VERTEX); + + vertices.bindingDescriptions[1] = + vkTools::initializers::vertexInputBindingDescription( + INSTANCE_BUFFER_BIND_ID, + sizeof(InstanceData), + // Input rate for the data passed to shader + // Step for each instance rendered + VK_VERTEX_INPUT_RATE_INSTANCE); + + // Attribute descriptions + // Describes memory layout and shader positions + vertices.attributeDescriptions.clear(); + + // Per-Vertex attributes + // Location 0 : Position + vertices.attributeDescriptions.push_back( + vkTools::initializers::vertexInputAttributeDescription( + VERTEX_BUFFER_BIND_ID, + 0, + VK_FORMAT_R32G32B32_SFLOAT, + 0) + ); + // Location 1 : Normal + vertices.attributeDescriptions.push_back( + vkTools::initializers::vertexInputAttributeDescription( + VERTEX_BUFFER_BIND_ID, + 1, + VK_FORMAT_R32G32B32_SFLOAT, + sizeof(float) * 3) + ); + // Location 2 : Texture coordinates + vertices.attributeDescriptions.push_back( + vkTools::initializers::vertexInputAttributeDescription( + VERTEX_BUFFER_BIND_ID, + 2, + VK_FORMAT_R32G32_SFLOAT, + sizeof(float) * 6) + ); + // Location 3 : Color + vertices.attributeDescriptions.push_back( + vkTools::initializers::vertexInputAttributeDescription( + VERTEX_BUFFER_BIND_ID, + 3, + VK_FORMAT_R32G32B32_SFLOAT, + sizeof(float) * 8) + ); + + // Instanced attributes + // Location 4: Position + vertices.attributeDescriptions.push_back( + vkTools::initializers::vertexInputAttributeDescription( + INSTANCE_BUFFER_BIND_ID, 4, VK_FORMAT_R32G32B32_SFLOAT, offsetof(InstanceData, pos)) + ); + // Location 5: Rotation + vertices.attributeDescriptions.push_back( + vkTools::initializers::vertexInputAttributeDescription( + INSTANCE_BUFFER_BIND_ID, 5, VK_FORMAT_R32G32B32_SFLOAT, offsetof(InstanceData, rot)) + ); + // Location 6: Color + vertices.attributeDescriptions.push_back( + vkTools::initializers::vertexInputAttributeDescription( + INSTANCE_BUFFER_BIND_ID, 6, VK_FORMAT_R32G32B32_SFLOAT, offsetof(InstanceData, color)) + ); + // Location 6: Scale + vertices.attributeDescriptions.push_back( + vkTools::initializers::vertexInputAttributeDescription( + INSTANCE_BUFFER_BIND_ID, 7, VK_FORMAT_R32_SFLOAT, offsetof(InstanceData, scale)) + ); + // Location 7: Texture array layer index + vertices.attributeDescriptions.push_back( + vkTools::initializers::vertexInputAttributeDescription( + INSTANCE_BUFFER_BIND_ID, 8, VK_FORMAT_R32_SINT, offsetof(InstanceData, texIndex)) + ); + + vertices.inputState = vkTools::initializers::pipelineVertexInputStateCreateInfo(); + vertices.inputState.vertexBindingDescriptionCount = vertices.bindingDescriptions.size(); + vertices.inputState.pVertexBindingDescriptions = vertices.bindingDescriptions.data(); + vertices.inputState.vertexAttributeDescriptionCount = vertices.attributeDescriptions.size(); + vertices.inputState.pVertexAttributeDescriptions = vertices.attributeDescriptions.data(); + } + + void setupDescriptorPool() + { + // Example uses one ubo + std::vector poolSizes = + { + vkTools::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1), + vkTools::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1), + }; + + VkDescriptorPoolCreateInfo descriptorPoolInfo = + vkTools::initializers::descriptorPoolCreateInfo( + poolSizes.size(), + poolSizes.data(), + 2); + + VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool)); + } + + void setupDescriptorSetLayout() + { + std::vector setLayoutBindings = + { + // Binding 0 : Vertex shader uniform buffer + vkTools::initializers::descriptorSetLayoutBinding( + VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, + VK_SHADER_STAGE_VERTEX_BIT, + 0), + // Binding 1 : Fragment shader combined sampler + vkTools::initializers::descriptorSetLayoutBinding( + VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, + VK_SHADER_STAGE_FRAGMENT_BIT, + 1), + }; + + VkDescriptorSetLayoutCreateInfo descriptorLayout = + vkTools::initializers::descriptorSetLayoutCreateInfo( + setLayoutBindings.data(), + setLayoutBindings.size()); + + VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &descriptorSetLayout)); + + VkPipelineLayoutCreateInfo pPipelineLayoutCreateInfo = + vkTools::initializers::pipelineLayoutCreateInfo( + &descriptorSetLayout, + 1); + + VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pPipelineLayoutCreateInfo, nullptr, &pipelineLayout)); + } + + void setupDescriptorSet() + { + VkDescriptorSetAllocateInfo allocInfo = + vkTools::initializers::descriptorSetAllocateInfo( + descriptorPool, + &descriptorSetLayout, + 1); + + VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &descriptorSet)); + + VkDescriptorImageInfo texDescriptor = + vkTools::initializers::descriptorImageInfo( + textures.colorMap.sampler, + textures.colorMap.view, + VK_IMAGE_LAYOUT_GENERAL); + + std::vector writeDescriptorSets = + { + // Binding 0 : Vertex shader uniform buffer + vkTools::initializers::writeDescriptorSet( + descriptorSet, + VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, + 0, + &uniformData.scene.descriptor), + // Binding 1 : Color map + vkTools::initializers::writeDescriptorSet( + descriptorSet, + VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, + 1, + &texDescriptor) + }; + + vkUpdateDescriptorSets(device, writeDescriptorSets.size(), writeDescriptorSets.data(), 0, NULL); + } + + void preparePipelines() + { + VkPipelineInputAssemblyStateCreateInfo inputAssemblyState = + vkTools::initializers::pipelineInputAssemblyStateCreateInfo( + VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, + 0, + VK_FALSE); + + VkPipelineRasterizationStateCreateInfo rasterizationState = + vkTools::initializers::pipelineRasterizationStateCreateInfo( + VK_POLYGON_MODE_FILL, + VK_CULL_MODE_BACK_BIT, + VK_FRONT_FACE_CLOCKWISE, + 0); + + VkPipelineColorBlendAttachmentState blendAttachmentState = + vkTools::initializers::pipelineColorBlendAttachmentState( + 0xf, + VK_FALSE); + + VkPipelineColorBlendStateCreateInfo colorBlendState = + vkTools::initializers::pipelineColorBlendStateCreateInfo( + 1, + &blendAttachmentState); + + VkPipelineDepthStencilStateCreateInfo depthStencilState = + vkTools::initializers::pipelineDepthStencilStateCreateInfo( + VK_TRUE, + VK_TRUE, + VK_COMPARE_OP_LESS_OR_EQUAL); + + VkPipelineViewportStateCreateInfo viewportState = + vkTools::initializers::pipelineViewportStateCreateInfo(1, 1, 0); + + VkPipelineMultisampleStateCreateInfo multisampleState = + vkTools::initializers::pipelineMultisampleStateCreateInfo( + VK_SAMPLE_COUNT_1_BIT, + 0); + + std::vector dynamicStateEnables = { + VK_DYNAMIC_STATE_VIEWPORT, + VK_DYNAMIC_STATE_SCISSOR + }; + VkPipelineDynamicStateCreateInfo dynamicState = + vkTools::initializers::pipelineDynamicStateCreateInfo( + dynamicStateEnables.data(), + dynamicStateEnables.size(), + 0); + + // Instacing pipeline + // Load shaders + std::array shaderStages; + + shaderStages[0] = loadShader(getAssetPath() + "shaders/indirectdraw/indirectdraw.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShader(getAssetPath() + "shaders/indirectdraw/indirectdraw.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); + + VkGraphicsPipelineCreateInfo pipelineCreateInfo = + vkTools::initializers::pipelineCreateInfo( + 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 = shaderStages.size(); + pipelineCreateInfo.pStages = shaderStages.data(); + + VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.solid)); + } + + // Prepare (and stage) a buffer containing the indirect draw commands + void prepareIndirectData() + { + VkDrawIndexedIndirectCommand dic{}; + dic.firstInstance = 0; + dic.instanceCount = OBJECT_INSTANCE_COUNT; + + dic.firstIndex = 0; + dic.indexCount = 36; + indirectCommands.push_back(dic); + + dic.firstInstance += OBJECT_INSTANCE_COUNT; + dic.firstIndex = 36; + dic.indexCount = 2880; + indirectCommands.push_back(dic); + + dic.firstInstance += OBJECT_INSTANCE_COUNT; + dic.firstIndex = 2916; + dic.indexCount = 186; + indirectCommands.push_back(dic); + + indirectDrawCount = static_cast(indirectCommands.size()); + + objectCount = 0; + for (auto indirectCmd : indirectCommands) + { + objectCount += indirectCmd.instanceCount; + } + + vk::Buffer stagingBuffer; + VK_CHECK_RESULT(vulkanDevice->createBuffer( + VK_BUFFER_USAGE_TRANSFER_SRC_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, + &stagingBuffer, + indirectCommands.size() * sizeof(VkDrawIndexedIndirectCommand), + indirectCommands.data())); + + VK_CHECK_RESULT(vulkanDevice->createBuffer( + VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, + &indirectCommandsBuffer, + stagingBuffer.size)); + + // Copy to staging buffer + VkCommandBuffer copyCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true); + + VkBufferCopy copyRegion = {}; + copyRegion.size = indirectCommandsBuffer.size; + vkCmdCopyBuffer( + copyCmd, + stagingBuffer.buffer, + indirectCommandsBuffer.buffer, + 1, + ©Region); + + VulkanExampleBase::flushCommandBuffer(copyCmd, queue, true); + + stagingBuffer.destroy(); + } + + float rnd(float range) + { + return range * (rand() / double(RAND_MAX)); + } + + // Prepare (and stage) a buffer containing instanced data for the mesh draws + void prepareInstanceData() + { + std::vector instanceData; + instanceData.resize(objectCount); + + std::mt19937 rndGenerator(time(NULL)); + std::uniform_real_distribution uniformDist(0.0, 1.0); + + for (auto i = 0; i < objectCount; i++) + { + instanceData[i].rot = glm::vec3(M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator)); + float theta = 2 * M_PI * uniformDist(rndGenerator); + float phi = acos(1 - 2 * uniformDist(rndGenerator)); + glm::vec3 pos; + instanceData[i].pos = glm::vec3(sin(phi) * cos(theta), sin(theta) * uniformDist(rndGenerator) / 1500.0f, cos(phi)) * 7.5f; + instanceData[i].color = glm::vec3(rnd(1.0f), rnd(1.0f), rnd(1.0f)); + instanceData[i].scale = 1.0f + uniformDist(rndGenerator) * 2.0f; + instanceData[i].texIndex = rnd(textures.colorMap.layerCount); + } + + vk::Buffer stagingBuffer; + VK_CHECK_RESULT(vulkanDevice->createBuffer( + VK_BUFFER_USAGE_TRANSFER_SRC_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, + &stagingBuffer, + instanceData.size() * sizeof(InstanceData), + instanceData.data())); + + VK_CHECK_RESULT(vulkanDevice->createBuffer( + VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, + &instanceBuffer, + stagingBuffer.size)); + + // Copy to staging buffer + VkCommandBuffer copyCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true); + + VkBufferCopy copyRegion = { }; + copyRegion.size = instanceBuffer.size; + vkCmdCopyBuffer( + copyCmd, + stagingBuffer.buffer, + instanceBuffer.buffer, + 1, + ©Region); + + VulkanExampleBase::flushCommandBuffer(copyCmd, queue, true); + + stagingBuffer.destroy(); + } + + void prepareUniformBuffers() + { + VK_CHECK_RESULT(vulkanDevice->createBuffer( + VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, + &uniformData.scene, + sizeof(uboVS))); + + VK_CHECK_RESULT(uniformData.scene.map()); + + updateUniformBuffer(true); + } + + void updateUniformBuffer(bool viewChanged) + { + if (viewChanged) + { + uboVS.projection = glm::perspective(glm::radians(60.0f), (float)width / (float)height, 0.001f, 256.0f); + uboVS.view = glm::translate(glm::mat4(), cameraPos + glm::vec3(0.0f, 0.0f, zoom)); + uboVS.view = glm::rotate(uboVS.view, glm::radians(rotation.x), glm::vec3(1.0f, 0.0f, 0.0f)); + uboVS.view = glm::rotate(uboVS.view, glm::radians(rotation.y), glm::vec3(0.0f, 1.0f, 0.0f)); + uboVS.view = glm::rotate(uboVS.view, glm::radians(rotation.z), glm::vec3(0.0f, 0.0f, 1.0f)); + } + + if (!paused) + { + uboVS.time += frameTimer * 0.05f; + } + + memcpy(uniformData.scene.mapped, &uboVS, sizeof(uboVS)); + } + + void draw() + { + VulkanExampleBase::prepareFrame(); + + // Command buffer to be sumitted to the queue + submitInfo.commandBufferCount = 1; + submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer]; + + // Submit to queue + VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE)); + + VulkanExampleBase::submitFrame(); + } + + void prepare() + { + VulkanExampleBase::prepare(); + loadTextures(); + loadMeshes(); + prepareIndirectData(); + prepareInstanceData(); + setupVertexDescriptions(); + prepareUniformBuffers(); + setupDescriptorSetLayout(); + preparePipelines(); + setupDescriptorPool(); + setupDescriptorSet(); + buildCommandBuffers(); + prepared = true; + } + + virtual void render() + { + if (!prepared) + { + return; + } + draw(); + if (!paused) + { + updateUniformBuffer(false); + } + } + + virtual void viewChanged() + { + updateUniformBuffer(true); + } + + virtual void getOverlayText(VulkanTextOverlay *textOverlay) + { + textOverlay->addText("Rendering " + std::to_string(objectCount) + " objects", 5.0f, 85.0f, VulkanTextOverlay::alignLeft); + } +}; + +VulkanExample *vulkanExample; + +#if defined(_WIN32) +LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (vulkanExample != NULL) + { + vulkanExample->handleMessages(hWnd, uMsg, wParam, lParam); + } + return (DefWindowProc(hWnd, uMsg, wParam, lParam)); +} +#elif defined(__linux__) && !defined(__ANDROID__) +static void handleEvent(const xcb_generic_event_t *event) +{ + if (vulkanExample != NULL) + { + vulkanExample->handleEvent(event); + } +} +#endif + +// Main entry point +#if defined(_WIN32) +// Windows entry point +int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine, int nCmdShow) +#elif defined(__ANDROID__) +// Android entry point +void android_main(android_app* state) +#elif defined(__linux__) +// Linux entry point +int main(const int argc, const char *argv[]) +#endif +{ +#if defined(__ANDROID__) + // Removing this may cause the compiler to omit the main entry point + // which would make the application crash at start + app_dummy(); +#endif + vulkanExample = new VulkanExample(); +#if defined(_WIN32) + vulkanExample->setupWindow(hInstance, WndProc); +#elif defined(__ANDROID__) + // Attach vulkan example to global android application state + state->userData = vulkanExample; + state->onAppCmd = VulkanExample::handleAppCommand; + state->onInputEvent = VulkanExample::handleAppInput; + vulkanExample->androidApp = state; +#elif defined(__linux__) + vulkanExample->setupWindow(); +#endif +#if !defined(__ANDROID__) + vulkanExample->initSwapchain(); + vulkanExample->prepare(); +#endif + vulkanExample->renderLoop(); + delete(vulkanExample); +#if !defined(__ANDROID__) + return 0; +#endif +} diff --git a/indirectdraw/indirectdraw.vcxproj b/indirectdraw/indirectdraw.vcxproj new file mode 100644 index 00000000..e0a7bcf0 --- /dev/null +++ b/indirectdraw/indirectdraw.vcxproj @@ -0,0 +1,82 @@ + + + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + {2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B} + indirectdraw + 8.1 + + + + v140 + + + v140 + + + + + + + true + $(SolutionDir)\bin\ + $(SolutionDir)\bin\intermediate\$(ProjectName)\$(ConfigurationName) + + + $(SolutionDir)\bin\ + $(SolutionDir)\bin\intermediate\$(ProjectName)\$(ConfigurationName) + + + + ..\base;..\external\glm;..\external\gli;..\external\assimp;..\external;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;VK_USE_PLATFORM_WIN32_KHR;_USE_MATH_DEFINES;NOMINMAX + MultiThreadedDebugDLL + Disabled + true + /FS %(AdditionalOptions) + Level3 + + + ..\libs\vulkan\vulkan-1.lib;..\libs\assimp\assimp.lib;%(AdditionalDependencies) + true + %(AdditionalLibraryDirectories) + Console + + + + + WIN32;NDEBUG;_WINDOWS;VK_USE_PLATFORM_WIN32_KHR;_USE_MATH_DEFINES;NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\base;..\external\glm;..\external\gli;..\external\assimp;..\external;%(AdditionalIncludeDirectories) + + + ..\libs\vulkan\vulkan-1.lib;..\libs\assimp\assimp.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/indirectdraw/indirectdraw.vcxproj.filters b/indirectdraw/indirectdraw.vcxproj.filters new file mode 100644 index 00000000..1c4d8cef --- /dev/null +++ b/indirectdraw/indirectdraw.vcxproj.filters @@ -0,0 +1,53 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {37cda328-a1ea-4618-9651-ebcfb9f84293} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + + + Shaders + + + Shaders + + + \ No newline at end of file diff --git a/vulkanExamples.sln b/vulkanExamples.sln index b99e9e0e..73463d53 100644 --- a/vulkanExamples.sln +++ b/vulkanExamples.sln @@ -73,6 +73,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "terraintessellation", "terr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deferredshadows", "deferredshadows\deferredshadows.vcxproj", "{BFEB15A3-D252-4AF7-8CA8-B9396F374DDB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{09B9A54B-FC57-4A98-9671-5706FC3846C9}" + ProjectSection(SolutionItems) = preProject + base\camera.hpp = base\camera.hpp + base\frustum.hpp = base\frustum.hpp + base\threadpool.hpp = base\threadpool.hpp + base\vulkanandroid.cpp = base\vulkanandroid.cpp + base\vulkanandroid.h = base\vulkanandroid.h + base\vulkanbuffer.hpp = base\vulkanbuffer.hpp + base\vulkandebug.cpp = base\vulkandebug.cpp + base\vulkandebug.h = base\vulkandebug.h + base\vulkandevice.hpp = base\vulkandevice.hpp + base\vulkanexamplebase.cpp = base\vulkanexamplebase.cpp + base\vulkanexamplebase.h = base\vulkanexamplebase.h + base\vulkanframebuffer.hpp = base\vulkanframebuffer.hpp + base\vulkanMeshLoader.hpp = base\vulkanMeshLoader.hpp + base\vulkanswapchain.hpp = base\vulkanswapchain.hpp + base\vulkantextoverlay.hpp = base\vulkantextoverlay.hpp + base\vulkanTextureLoader.hpp = base\vulkanTextureLoader.hpp + base\vulkantools.cpp = base\vulkantools.cpp + base\vulkantools.h = base\vulkantools.h + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "indirectdraw", "indirectdraw\indirectdraw.vcxproj", "{2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -219,6 +243,10 @@ Global {BFEB15A3-D252-4AF7-8CA8-B9396F374DDB}.Debug|x64.Build.0 = Debug|x64 {BFEB15A3-D252-4AF7-8CA8-B9396F374DDB}.Release|x64.ActiveCfg = Release|x64 {BFEB15A3-D252-4AF7-8CA8-B9396F374DDB}.Release|x64.Build.0 = Release|x64 + {2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Debug|x64.ActiveCfg = Debug|x64 + {2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Debug|x64.Build.0 = Debug|x64 + {2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Release|x64.ActiveCfg = Release|x64 + {2BBDD10F-2C9D-4BEA-8C7B-1C510A2CE08B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE