File tree Expand file tree Collapse file tree 6 files changed +15
-8
lines changed Expand file tree Collapse file tree 6 files changed +15
-8
lines changed Original file line number Diff line number Diff line change @@ -60,8 +60,8 @@ if(DEFINED ENV{VULKAN_SDK})
60
60
endif ()
61
61
add_subdirectory (volk volk EXCLUDE_FROM_ALL )
62
62
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 " )
65
65
endif ()
66
66
67
67
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
Original file line number Diff line number Diff line change @@ -176,7 +176,7 @@ Contact ***[@devshgraphicsprogramming](https://github.com/devshgraphicsprogrammi
176
176
177
177
- ** [ CMake] ( https://cmake.org/download/ ) **
178
178
- ** [ 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
180
180
- ** [ Perl 5.28 executable version] ( https://www.perl.org/get.html ) **
181
181
- ** [ NASM] ( https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D ) **
182
182
- ** [ Python 3.8] ( https://www.python.org/downloads/release/python-380/ ) ** or later
Original file line number Diff line number Diff line change @@ -249,7 +249,7 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
249
249
viewParams.subresourceRange .levelCount = cpuImage->getCreationParameters ().mipLevels ;
250
250
251
251
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!
253
253
254
254
auto writeSATandGetItsOutputName = [&]() -> std::string
255
255
{
@@ -342,7 +342,7 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
342
342
viewParams.components = {};
343
343
344
344
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!
346
346
347
347
asset::IAssetWriter::SAssetWriteParams wparams (cpuImageView.get ());
348
348
assetManager->writeAsset (convolutedSatFilePath.string (), wparams);
Original file line number Diff line number Diff line change @@ -395,10 +395,12 @@ class CommonAPI
395
395
#ifdef _NBL_PLATFORM_WINDOWS_
396
396
return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemWin32>(std::move (caller));
397
397
#elif defined(_NBL_PLATFORM_ANDROID_)
398
+ #if 0
398
399
return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemAndroid>(std::move(caller));
399
- #else
400
- return nullptr ;
401
400
#endif
401
+ #endif
402
+ return nullptr ;
403
+
402
404
}
403
405
404
406
// Used to help with queue selection
Original file line number Diff line number Diff line change @@ -26,6 +26,11 @@ namespace nbl::system
26
26
m_cachedArchiveFiles.insert (APKResourcesPath, std::move (archive));
27
27
28
28
}
29
+ SystemInfo getSystemInfo () const override
30
+ {
31
+ assert (false ); // TODO
32
+ return SystemInfo ();
33
+ }
29
34
};
30
35
}
31
36
#endif
Original file line number Diff line number Diff line change @@ -477,7 +477,7 @@ macro(nbl_target_link_spirv_tools _trgt)
477
477
target_link_libraries (${_trgt} INTERFACE
478
478
SPIRV SPIRV-Tools SPIRV-Tools-opt
479
479
)
480
- target_include_directories (${_trgt} PUBLIC
480
+ target_include_directories (${_trgt} PUBLIC BEFORE
481
481
${THIRD_PARTY_SOURCE_DIR} /SPIRV-Tools/include
482
482
)
483
483
endmacro ()
You can’t perform that action at this time.
0 commit comments