Skip to content

Commit 3e587ad

Browse files
committed
Minior fixes, update README
1 parent b93e23b commit 3e587ad

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

3rdparty/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ if(DEFINED ENV{VULKAN_SDK})
6060
endif()
6161
add_subdirectory(volk volk EXCLUDE_FROM_ALL)
6262

63-
target_include_directories(volk PUBLIC "$ENV{VULKAN_SDK}/include")
64-
target_include_directories(volk_headers INTERFACE "$ENV{VULKAN_SDK}/include")
63+
target_include_directories(volk PUBLIC "$ENV{VULKAN_SDK}/Include")
64+
target_include_directories(volk_headers INTERFACE "$ENV{VULKAN_SDK}/Include")
6565
endif()
6666

6767
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Contact ***[@devshgraphicsprogramming](https://github.com/devshgraphicsprogrammi
176176

177177
- **[CMake](https://cmake.org/download/)**
178178
- **[MSVC](https://visualstudio.microsoft.com/pl/downloads/)** or **[GCC](https://sourceforge.net/projects/mingw-w64/)**
179-
- **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home)**
179+
- **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home)**, at least **1.2.198.1** version ***without* any components** installed
180180
- **[Perl 5.28 executable version](https://www.perl.org/get.html)**
181181
- **[NASM](https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D)**
182182
- **[Python 3.8](https://www.python.org/downloads/release/python-380/)** or later

examples_tests/43.SumAndCDFFilters/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
249249
viewParams.subresourceRange.levelCount = cpuImage->getCreationParameters().mipLevels;
250250

251251
auto cpuImageView = ICPUImageView::create(std::move(viewParams));
252-
assert(cpuImageView.get(), "The imageView didn't pass creation validation!");
252+
assert(cpuImageView.get()); // The imageView didn't pass creation validation!
253253

254254
auto writeSATandGetItsOutputName = [&]() -> std::string
255255
{
@@ -342,7 +342,7 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
342342
viewParams.components = {};
343343

344344
auto cpuImageView = ICPUImageView::create(std::move(viewParams));
345-
assert(cpuImageView.get(), "The imageView didn't pass creation validation!");
345+
assert(cpuImageView.get()); // The imageView didn't pass creation validation!
346346

347347
asset::IAssetWriter::SAssetWriteParams wparams(cpuImageView.get());
348348
assetManager->writeAsset(convolutedSatFilePath.string(), wparams);

examples_tests/common/CommonAPI.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,10 +395,12 @@ class CommonAPI
395395
#ifdef _NBL_PLATFORM_WINDOWS_
396396
return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemWin32>(std::move(caller));
397397
#elif defined(_NBL_PLATFORM_ANDROID_)
398+
#if 0
398399
return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemAndroid>(std::move(caller));
399-
#else
400-
return nullptr;
401400
#endif
401+
#endif
402+
return nullptr;
403+
402404
}
403405

404406
// Used to help with queue selection

include/nbl/system/CSystemAndroid.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ namespace nbl::system
2626
m_cachedArchiveFiles.insert(APKResourcesPath, std::move(archive));
2727

2828
}
29+
SystemInfo getSystemInfo() const override
30+
{
31+
assert(false); // TODO
32+
return SystemInfo();
33+
}
2934
};
3035
}
3136
#endif

src/nbl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ macro(nbl_target_link_spirv_tools _trgt)
477477
target_link_libraries(${_trgt} INTERFACE
478478
SPIRV SPIRV-Tools SPIRV-Tools-opt
479479
)
480-
target_include_directories(${_trgt} PUBLIC
480+
target_include_directories(${_trgt} PUBLIC BEFORE
481481
${THIRD_PARTY_SOURCE_DIR}/SPIRV-Tools/include
482482
)
483483
endmacro()

0 commit comments

Comments
 (0)