Update to 6.2.0.300 version, remove redundant files and upload .spv f…

…or compile convenient
HMS-Core · Nov 22, 2021 · 9890607 · 9890607
1 parent 81a8cdb
commit 9890607
Show file tree

Hide file tree

Showing 38 changed files with 4 additions and 1,097 deletions.
diff --git a/3rdparty/SaschaWillemsVulkan/vulkanexamplebase.cpp b/3rdparty/SaschaWillemsVulkan/vulkanexamplebase.cpp
@@ -565,7 +565,7 @@ VulkanExampleBase::VulkanExampleBase(bool enableValidation)
 #endif
 }
 
-VulkanExampleBase::~VulkanExampleBase()
+VulkanExampleBase::~VulkanExampleBase() noexcept
 {
     // Clean up Vulkan resources
     swapChain.cleanup();

diff --git a/README_zh.md b/README_zh.md
@@ -72,6 +72,7 @@ adb shell am start -n "com.huawei.rtcore.vkhybridrt/.VulkanActivity"
 ### [用混合渲染管线实现局部反射](examples/hybridreflection)
 本例子搭建了一套基于光线追踪的混合渲染管线，实现了光追局部反射的后 处理效果，具体流程如下图。
 <img src="images/hybridpipeline_zh.png" width="850px">
+
 1\. 通过传统光栅化的方法，实现了PBR的渲染管线(图中黄色虚线部分)，具体参考代码： 
 
 * `examples/hybridreRayTracing/HybridRayTracing`

diff --git a/android/examples/_template/src/main/java/de/saschawillems/vulkanSample/VulkanActivity.java b/android/examples/_template/src/main/java/de/saschawillems/vulkanSample/VulkanActivity.java
diff --git a/android/examples/base/CMakeLists.txt b/android/examples/base/CMakeLists.txt
@@ -30,7 +30,6 @@ add_library(libbase SHARED ${BASE_SRC} ${RAYSHOP_SRC_FILES})
 include_directories(${BASE_DIR})
 include_directories(${PROJ_ROOT}/3rdparty)
 include_directories(${PROJ_ROOT}/3rdparty/glm)
-include_directories(${PROJ_ROOT}/3rdparty/gli)
 include_directories(${PROJ_ROOT}/3rdparty/imgui)
 include_directories(${PROJ_ROOT}/3rdparty/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)

diff --git a/android/examples/hybridRayTracing/CMakeLists.txt b/android/examples/hybridRayTracing/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(native-lib SHARED ${EXAMPLE_SRC})
 add_library(native-app-glue STATIC ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
 
 add_subdirectory(../base ${CMAKE_SOURCE_DIR}/../base)
-add_subdirectory(../../../data ${CMAKE_SOURCE_DIR}/../../../data)
+#add_subdirectory(../../../data ${CMAKE_SOURCE_DIR}/../../../data)
 
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 

diff --git a/android/examples/triangle/CMakeLists.txt b/android/examples/triangle/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(native-lib SHARED ${EXAMPLE_SRC})
 add_library(native-app-glue STATIC ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
 
 add_subdirectory(../base ${CMAKE_SOURCE_DIR}/../base)
-add_subdirectory(../../../data ${CMAKE_SOURCE_DIR}/../../../data)
+#add_subdirectory(../../../data ${CMAKE_SOURCE_DIR}/../../../data)
 
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 

diff --git a/android/examples/triangle/src/main/java/de/saschawillems/vulkanSample/VulkanActivity.java b/android/examples/triangle/src/main/java/de/saschawillems/vulkanSample/VulkanActivity.java
diff --git a/data/shaders/glsl/hybridRayTracing/filtercube.vert.spv b/data/shaders/glsl/hybridRayTracing/filtercube.vert.spv
diff --git a/data/shaders/glsl/hybridRayTracing/fullscreen.frag.spv b/data/shaders/glsl/hybridRayTracing/fullscreen.frag.spv
diff --git a/...glsl/hybridreflection/genbrdflut.frag.spv → ...glsl/hybridRayTracing/genbrdflut.frag.spv b/...glsl/hybridreflection/genbrdflut.frag.spv → ...glsl/hybridRayTracing/genbrdflut.frag.spv
diff --git a/...glsl/hybridreflection/genbrdflut.vert.spv → ...glsl/hybridRayTracing/genbrdflut.vert.spv b/...glsl/hybridreflection/genbrdflut.vert.spv → ...glsl/hybridRayTracing/genbrdflut.vert.spv
diff --git a/.../hybridreflection/irradiancecube.frag.spv → .../hybridRayTracing/irradiancecube.frag.spv b/.../hybridreflection/irradiancecube.frag.spv → .../hybridRayTracing/irradiancecube.frag.spv
diff --git a/...haders/glsl/hybridreflection/pbr.frag.spv → ...haders/glsl/hybridRayTracing/pbr.frag.spv b/...haders/glsl/hybridreflection/pbr.frag.spv → ...haders/glsl/hybridRayTracing/pbr.frag.spv
diff --git a/...hybridreflection/prefilterenvmap.frag.spv → ...hybridRayTracing/prefilterenvmap.frag.spv b/...hybridreflection/prefilterenvmap.frag.spv → ...hybridRayTracing/prefilterenvmap.frag.spv
diff --git a/data/shaders/glsl/hybridRayTracing/raytracing.vert.spv b/data/shaders/glsl/hybridRayTracing/raytracing.vert.spv
diff --git a/...ders/glsl/hybridreflection/scene.vert.spv → ...ders/glsl/hybridRayTracing/scene.vert.spv b/...ders/glsl/hybridreflection/scene.vert.spv → ...ders/glsl/hybridRayTracing/scene.vert.spv
diff --git a/data/shaders/glsl/hybridRayTracing/skybox.frag.spv b/data/shaders/glsl/hybridRayTracing/skybox.frag.spv
diff --git a/...ers/glsl/hybridreflection/skybox.vert.spv → ...ers/glsl/hybridRayTracing/skybox.vert.spv b/...ers/glsl/hybridreflection/skybox.vert.spv → ...ers/glsl/hybridRayTracing/skybox.vert.spv