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

Code Review: a) revert TinyGLTF #defines, b) call vkDeviceWaitIdle() in macOS/iOS termination handlers, c) remove OpenMP target_compile_options() in CMakeLists

Browse source
This commit is contained in:
Stephen Saunders 2022-07-27 01:11:20 -04:00
parent 46b2027dd1
commit c89d4eb776
7 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
base/vulkanexamplebase.cpp
View file

@ -1556,7 +1556,8 @@ dispatch_group_t concurrentGroup;
{ {
vulkanExample->quit = YES; vulkanExample->quit = YES;
dispatch_group_wait(concurrentGroup, DISPATCH_TIME_FOREVER); dispatch_group_wait(concurrentGroup, DISPATCH_TIME_FOREVER);
delete vulkanExample; vkDeviceWaitIdle(vulkanExample->vulkanDevice->logicalDevice);
delete(vulkanExample);
} }
@end @end

6
examples/CMakeLists.txt
View file

@ -59,15 +59,11 @@ function(buildExample EXAMPLE_NAME)
endif(WIN32) endif(WIN32)
set_target_properties(${EXAMPLE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) set_target_properties(${EXAMPLE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
#if(OpenMP_CXX_FOUND) if(${EXAMPLE_NAME} STREQUAL "texture3d")
# SRS - target_compile_options is not needed when using target_link_libraries(<target> OpenMP::OpenMP_CXX) syntax below
#target_compile_options(${EXAMPLE_NAME} PRIVATE ${OpenMP_CXX_FLAGS})
IF(${EXAMPLE_NAME} STREQUAL "texture3d")
if(OpenMP_CXX_FOUND) if(OpenMP_CXX_FOUND)
target_link_libraries(${EXAMPLE_NAME} OpenMP::OpenMP_CXX) target_link_libraries(${EXAMPLE_NAME} OpenMP::OpenMP_CXX)
endif() endif()
endif() endif()
#endif()
if(RESOURCE_INSTALL_DIR) if(RESOURCE_INSTALL_DIR)
install(TARGETS ${EXAMPLE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS ${EXAMPLE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

3
examples/computeraytracing/computeraytracing.cpp
View file

@ -94,9 +94,6 @@ public:
~VulkanExample() ~VulkanExample()
{ {
// SRS - Ensure all operations on the device have finished before destroying resources
vkDeviceWaitIdle(device);
// Graphics // Graphics
vkDestroyPipeline(device, graphics.pipeline, nullptr); vkDestroyPipeline(device, graphics.pipeline, nullptr);
vkDestroyPipelineLayout(device, graphics.pipelineLayout, nullptr); vkDestroyPipelineLayout(device, graphics.pipelineLayout, nullptr);

2
examples/gltfscenerendering/gltfscenerendering.h
View file

@ -15,7 +15,7 @@
#define TINYGLTF_IMPLEMENTATION #define TINYGLTF_IMPLEMENTATION
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#define TINYGLTF_NO_STB_IMAGE_WRITE #define TINYGLTF_NO_STB_IMAGE_WRITE
//#define TINYGLTF_NO_STB_IMAGE // SRS - Comment out to enable default image loader, otherwise LoadImageData() is undefined #define TINYGLTF_NO_STB_IMAGE
#define TINYGLTF_NO_EXTERNAL_IMAGE #define TINYGLTF_NO_EXTERNAL_IMAGE
#ifdef VK_USE_PLATFORM_ANDROID_KHR #ifdef VK_USE_PLATFORM_ANDROID_KHR
#define TINYGLTF_ANDROID_LOAD_FROM_ASSETS #define TINYGLTF_ANDROID_LOAD_FROM_ASSETS

3
examples/triangle/triangle.cpp
View file

@ -126,9 +126,6 @@ public:
~VulkanExample() ~VulkanExample()
{ {
// SRS - Ensure all operations on the device have finished before destroying resources
vkDeviceWaitIdle(device);
// Clean up used Vulkan resources // Clean up used Vulkan resources
// Note: Inherited destructor cleans up resources stored in base class // Note: Inherited destructor cleans up resources stored in base class
vkDestroyPipeline(device, pipeline, nullptr); vkDestroyPipeline(device, pipeline, nullptr);

2
examples/vertexattributes/vertexattributes.h
View file

@ -9,7 +9,7 @@
#define TINYGLTF_IMPLEMENTATION #define TINYGLTF_IMPLEMENTATION
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#define TINYGLTF_NO_STB_IMAGE_WRITE #define TINYGLTF_NO_STB_IMAGE_WRITE
//#define TINYGLTF_NO_STB_IMAGE // SRS - Comment out to enable default image loader, otherwise LoadImageData() is undefined #define TINYGLTF_NO_STB_IMAGE
#define TINYGLTF_NO_EXTERNAL_IMAGE #define TINYGLTF_NO_EXTERNAL_IMAGE
#ifdef VK_USE_PLATFORM_ANDROID_KHR #ifdef VK_USE_PLATFORM_ANDROID_KHR
#define TINYGLTF_ANDROID_LOAD_FROM_ASSETS #define TINYGLTF_ANDROID_LOAD_FROM_ASSETS

3
xcode/MVKExample.cpp
View file

@ -125,5 +125,6 @@ MVKExample::MVKExample(void* view, double scaleUI) {
} }
MVKExample::~MVKExample() { MVKExample::~MVKExample() {
delete _vulkanExample; vkDeviceWaitIdle(_vulkanExample->vulkanDevice->logicalDevice);
delete(_vulkanExample);
} }