claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor cleanup

Browse source
This commit is contained in:
Sascha Willems 2023-07-18 19:23:43 +02:00
parent 208739f401
commit ae4ed5f9ad
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/graphicspipelinelibrary/graphicspipelinelibrary.cpp
View file

@ -1,7 +1,7 @@
/* /*
* Vulkan Example - Using VK_EXT_graphics_pipeline_library * Vulkan Example - Using VK_EXT_graphics_pipeline_library
* *
* Copyright (C) 2022 by Sascha Willems - www.saschawillems.de * Copyright (C) 2022-2023 by Sascha Willems - www.saschawillems.de
* *
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
*/ */
@ -207,7 +207,6 @@ public:
{ {
#if defined(__ANDROID__) #if defined(__ANDROID__)
// Load shader from compressed asset // Load shader from compressed asset
// @todo
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, fileName, AASSET_MODE_STREAMING); AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, fileName, AASSET_MODE_STREAMING);
assert(asset); assert(asset);
size_t size = AAsset_getLength(asset); size_t size = AAsset_getLength(asset);
@ -280,7 +279,6 @@ public:
VkPipelineRasterizationStateCreateInfo rasterizationState = vks::initializers::pipelineRasterizationStateCreateInfo(VK_POLYGON_MODE_FILL, VK_CULL_MODE_BACK_BIT, VK_FRONT_FACE_COUNTER_CLOCKWISE, 0); VkPipelineRasterizationStateCreateInfo rasterizationState = vks::initializers::pipelineRasterizationStateCreateInfo(VK_POLYGON_MODE_FILL, VK_CULL_MODE_BACK_BIT, VK_FRONT_FACE_COUNTER_CLOCKWISE, 0);
// @todo: we can skip the pipeline shader module info and directly consume the shader module
ShaderInfo shaderInfo{}; ShaderInfo shaderInfo{};
loadShaderFile(getShadersPath() + "graphicspipelinelibrary/shared.vert.spv", shaderInfo); loadShaderFile(getShadersPath() + "graphicspipelinelibrary/shared.vert.spv", shaderInfo);
@ -307,6 +305,8 @@ public:
pipelineLibraryCI.pViewportState = &viewportState; pipelineLibraryCI.pViewportState = &viewportState;
pipelineLibraryCI.pRasterizationState = &rasterizationState; pipelineLibraryCI.pRasterizationState = &rasterizationState;
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineLibraryCI, nullptr, &pipelineLibrary.preRasterizationShaders)); VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineLibraryCI, nullptr, &pipelineLibrary.preRasterizationShaders));
delete[] shaderInfo.code;
} }
// Create a pipeline library for the fragment output interface // Create a pipeline library for the fragment output interface
@ -442,6 +442,8 @@ public:
pipelines.push_back(executable); pipelines.push_back(executable);
// Push fragment shader to list for deletion in the sample's destructor // Push fragment shader to list for deletion in the sample's destructor
pipelineLibrary.fragmentShaders.push_back(fragmentShader); pipelineLibrary.fragmentShaders.push_back(fragmentShader);
delete[] shaderInfo.code;
} }
// Prepare and initialize uniform buffer containing shader uniforms // Prepare and initialize uniform buffer containing shader uniforms