Changeset 0ae182f in opengl-game
- Timestamp:
- Nov 11, 2019, 2:19:32 AM (5 years ago)
- Branches:
- feature/imgui-sdl, master, points-test
- Children:
- 5a23277
- Parents:
- 1f25a71
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
VulkanGame.vcxproj
r1f25a71 r0ae182f 159 159 </ItemGroup> 160 160 <ItemGroup> 161 <None Include="assets\laser.xcf" /> 161 162 <None Include="shaders\overlay.frag" /> 162 163 <None Include="shaders\overlay.vert" /> … … 164 165 <None Include="shaders\scene.vert" /> 165 166 </ItemGroup> 167 <ItemGroup> 168 <Image Include="assets\images\spaceship.bmp" /> 169 </ItemGroup> 170 <ItemGroup> 171 <Font Include="assets\fonts\lazy.ttf" /> 172 </ItemGroup> 166 173 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 167 174 <ImportGroup Label="ExtensionTargets"> -
graphics-pipeline_vulkan.cpp
r1f25a71 r0ae182f 27 27 28 28 GraphicsPipeline_Vulkan::~GraphicsPipeline_Vulkan() { 29 } 30 31 void GraphicsPipeline_Vulkan::updateRenderPass(VkRenderPass renderPass) { 32 this->renderPass = renderPass; 29 33 } 30 34 -
graphics-pipeline_vulkan.hpp
r1f25a71 r0ae182f 23 23 Viewport viewport, int vertexSize); 24 24 ~GraphicsPipeline_Vulkan(); 25 26 void updateRenderPass(VkRenderPass renderPass); 25 27 26 28 template<class VertexType, class IndexType> -
vulkan-game.cpp
r1f25a71 r0ae182f 74 74 } 75 75 76 // TODO: Make some more init ifunctions, or call this initUI if the76 // TODO: Make some more init functions, or call this initUI if the 77 77 // amount of things initialized here keeps growing 78 78 bool VulkanGame::initWindow(int width, int height, unsigned char guiFlags) { … … 252 252 graphicsPipelines.back().createDescriptorPool(swapChainImages); 253 253 graphicsPipelines.back().createDescriptorSets(swapChainImages); 254 255 // TODO: Creating the descriptor pool and descriptor sets might need to be redone when the256 // swap chain is recreated257 254 258 255 cout << "Created " << graphicsPipelines.size() << " graphics pipelines" << endl; … … 958 955 vkDeviceWaitIdle(device); 959 956 960 //cleanupSwapChain(); 957 cleanupSwapChain(); 958 959 createSwapChain(); 960 createImageViews(); 961 createRenderPass(); 962 963 VulkanUtils::createDepthImage(device, physicalDevice, commandPool, findDepthFormat(), swapChainExtent, 964 depthImage, graphicsQueue); 965 createFramebuffers(); 966 createUniformBuffers(); 967 968 graphicsPipelines[0].updateRenderPass(renderPass); 969 graphicsPipelines[0].createPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv"); 970 graphicsPipelines[0].createDescriptorPool(swapChainImages); 971 graphicsPipelines[0].createDescriptorSets(swapChainImages); 972 973 graphicsPipelines[1].updateRenderPass(renderPass); 974 graphicsPipelines[1].createPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv"); 975 graphicsPipelines[1].createDescriptorPool(swapChainImages); 976 graphicsPipelines[1].createDescriptorSets(swapChainImages); 977 978 createCommandBuffers(); 961 979 } 962 980 -
vulkan-ref.cpp
r1f25a71 r0ae182f 1894 1894 1895 1895 vkDeviceWaitIdle(device); 1896 /*** END OF REFACTORED CODE ***/1897 1896 1898 1897 cleanupSwapChain(); … … 1901 1900 createImageViews(); 1902 1901 createRenderPass(); 1903 1904 1902 createBufferResources(); 1905 /*** START OF REFACTORED CODE ***/1906 1903 } 1907 1904
Note:
See TracChangeset
for help on using the changeset viewer.