Merge branch 'cad-text-rendering'

Author: Erfan-Ahmadi

21_LRUCacheUnitTest/main.cpp

@@ -19,6 +19,22 @@ class LRUCacheTestApp final : public nbl::application_templates::MonoSystemMonoL
 	public:
 		using base_t::base_t;
 
+		constexpr static uint32_t InvalidTextureIdx = 41234;
+		struct TextureReference
+		{
+			uint32_t alloc_idx;
+			uint64_t lastUsedSemaphoreValue;
+
+			TextureReference(uint32_t alloc_idx, uint64_t semaphoreVal) : alloc_idx(alloc_idx), lastUsedSemaphoreValue(semaphoreVal) {}
+			TextureReference(uint64_t semaphoreVal) : TextureReference(InvalidTextureIdx, semaphoreVal) {}
+			TextureReference() : TextureReference(InvalidTextureIdx, ~0ull) {}
+
+			// In LRU Cache `insert` function, in case of cache hit, we need to assign semaphore value to TextureReference without changing `alloc_idx`
+			inline TextureReference& operator=(uint64_t semamphoreVal) { lastUsedSemaphoreValue = semamphoreVal; return *this;  }
+		};
+
+		using TextureLRUCache = core::LRUCache<uint32_t, TextureReference>;
+
 		// we stuff all our work here because its a "single shot" app
 		bool onAppInitialized(smart_refctd_ptr<ISystem>&& system) override
 		{
@@ -108,6 +124,24 @@ class LRUCacheTestApp final : public nbl::application_templates::MonoSystemMonoL
 			cache2.print(m_logger);
 			cache2.insert(++i, "key is 112");
 
+			m_textureLRUCache = std::unique_ptr<TextureLRUCache>(new TextureLRUCache(1024u));
+			{
+				SIntendedSubmitInfo intendedNextSubmit = {};
+				auto evictionCallback = [&](const TextureReference& evicted)
+					{
+					};
+				const auto nextSemaSignal = intendedNextSubmit.getFutureScratchSemaphore();
+				TextureReference* inserted = m_textureLRUCache->insert(69420, nextSemaSignal.value, evictionCallback);
+			}
+			{
+				SIntendedSubmitInfo intendedNextSubmit = {};
+				auto evictionCallback = [&](const TextureReference& evicted)
+					{
+					};
+				const auto nextSemaSignal = intendedNextSubmit.getFutureScratchSemaphore();
+				TextureReference* inserted = m_textureLRUCache->insert(69420, nextSemaSignal.value, evictionCallback);
+			}
+
 		#ifdef _NBL_DEBUG
 			cache2.print(m_logger);
 		#endif
@@ -153,6 +187,7 @@ class LRUCacheTestApp final : public nbl::application_templates::MonoSystemMonoL
 
 			return true;
 		}
+		std::unique_ptr<TextureLRUCache> m_textureLRUCache;
 
 		void workLoopBody() override {}
 

24_ColorSpaceTest/app_resources/present.frag.hlsl

@@ -21,5 +21,6 @@ using namespace nbl::hlsl::ext::FullScreenTriangle;
 {
     const float32_t2 repeatCoord = vxAttr.uv*float32_t2(pc.grid);
     const int32_t layer = int32_t(repeatCoord.y)*pc.grid.x+int32_t(repeatCoord.x);
-    return texture.Sample(samplerState,float32_t3(repeatCoord,layer));
+    float4 color = texture.Sample(samplerState,float32_t3(repeatCoord,layer));
+    return color * color.a;
 }

62_CAD/CMakeLists.txt

@@ -11,6 +11,7 @@ set(EXAMPLE_SOURCES
   "${CMAKE_CURRENT_SOURCE_DIR}/Polyline.h"
   "${CMAKE_CURRENT_SOURCE_DIR}/DrawResourcesFiller.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/DrawResourcesFiller.h"
+  "../../src/nbl/ext/TextRendering/TextRendering.cpp" # TODO: this one will be a part of dedicated Nabla ext called "TextRendering" later on which uses MSDF + Freetype
 )
 set(EXAMPLE_INCLUDES
   "${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/boost/superproject/libs/math/include")
@@ -32,4 +33,27 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
 	ADD_CUSTOM_BUILTIN_RESOURCES(${_BR_TARGET_} RESOURCES_TO_EMBED "${_SEARCH_DIRECTORIES_}" "${RESOURCE_DIR}" "nbl::this_example::builtin" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}")
 
 	LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} ${_BR_TARGET_})
+endif()
+
+# if enabled then try use Nabla "Text Rendering" extension 
+# with an implemented interface using the 3rdparty deps 
+
+set(NBL_CAD_EX_USE_TEXT_RENDERING_EXT OFF) # do not enable, for future usage when the extension is written
+
+if(NBL_BUILD_TEXT_RENDERING AND NBL_CAD_EX_USE_TEXT_RENDERING_EXT)
+	add_dependencies(${EXECUTABLE_NAME} ${NBL_EXT_TEXT_RENDERING_TARGET})
+	target_link_libraries(${EXECUTABLE_NAME} PRIVATE ${NBL_EXT_TEXT_RENDERING_TARGET})
+	target_include_directories(${EXECUTABLE_NAME} PUBLIC $<TARGET_PROPERTY:${NBL_EXT_TEXT_RENDERING_TARGET},INCLUDE_DIRECTORIES>)
+else()
+	# Freetype
+	add_dependencies(${EXECUTABLE_NAME} freetype)
+	target_link_libraries(${EXECUTABLE_NAME} PRIVATE freetype)
+	target_include_directories(${EXECUTABLE_NAME} PUBLIC $<TARGET_PROPERTY:freetype,INCLUDE_DIRECTORIES>)
+
+	# msdfgen
+	add_dependencies(${EXECUTABLE_NAME} ${NBL_MSDFGEN_TARGETS})
+	target_link_libraries(${EXECUTABLE_NAME} PRIVATE ${NBL_MSDFGEN_TARGETS})
+	foreach(NBL_TARGET IN LISTS NBL_MSDFGEN_TARGETS)
+		target_include_directories(${EXECUTABLE_NAME} PUBLIC $<TARGET_PROPERTY:${NBL_TARGET},INCLUDE_DIRECTORIES>)
+	endforeach()
 endif()