Merge branch 'abstract_image_decoder' into wip

Author: tgfrerer

CMakeLists.txt.island_prolog.in

@@ -28,12 +28,14 @@ set(CMAKE_DEBUG_POSTFIX "" CACHE STRING "Suffix for debug builds" FORCE)
 
 set ( PLUGIN_LIBS_DEPENDENCIES "" CACHE INTERNAL "plugins_libs_dependencies" )
 set ( PLUGIN_LINK_DIRS "")
+    
+set ( CMAKE_DEBUG_POSTFIX "" CACHE STRING "Suffix for debug builds" FORCE )
 
 # specify output directory
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/modules)
-set(CMAKE_MODULE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/modules)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/modules)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"  CACHE PATH "" FORCE )
+set(CMAKE_MODULE_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/modules" CACHE PATH "" FORCE)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/modules" CACHE PATH "archive output directory" FORCE)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/modules" CACHE PATH "" FORCE )
 
 # get git commit version for island framework
 execute_process(COMMAND
@@ -63,10 +65,12 @@ function (link_resources param_target param_link_name)
 
     else()
         if (EXISTS "${param_link_name}")
-            message(STATUS "local resources exists ${param_link_name}")
+            message(STATUS "Link already exists: '${param_link_name}'")
         else()
-            execute_process(COMMAND ln -sfn ${param_target} ${param_link_name} )
-            message(STATUS "created symbolic link ${param_target} ${param_link_name}")
+            get_filename_component( tmp_link_dir "${param_link_name}" DIRECTORY )
+            execute_process(COMMAND mkdir -p "${tmp_link_dir}" )
+            execute_process(COMMAND ln -sfn "${param_target}" "${param_link_name}" )
+            message(STATUS "Created symbolic link '${param_link_name}' → '${param_target}'" )
         endif()
     endif()
 
@@ -116,7 +120,7 @@ if (REQUIRES_ISLAND_CORE)
     include_using_absolute_path("${ISLAND_BASE_DIR}/3rdparty/src/glm/")
 
     # create a link to shared resources
-    link_resources(${ISLAND_BASE_DIR}/resources ${CMAKE_BINARY_DIR}/resources )
+    link_resources(${ISLAND_BASE_DIR}/resources ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/resources )
 
     # Check if a local copy of the Vulkan SDK exists, and the environment VULKAN_SDK points to it.
     # If yes, use this directory for header includes, and linking.

apps/examples/asterisks/CMakeLists.txt

@@ -40,6 +40,6 @@ add_subdirectory (asterisks_app)
 include ("${ISLAND_BASE_DIR}/CMakeLists.txt.island_epilog.in")
 
 # (optional) create a link to local resources
-link_resources(${PROJECT_SOURCE_DIR}/resources ${CMAKE_BINARY_DIR}/local_resources)
+link_resources("${PROJECT_SOURCE_DIR}/resources" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/local_resources")
 
 source_group(${PROJECT_NAME} FILES ${SOURCES})

apps/examples/bitonic_merge_sort_example/CMakeLists.txt

@@ -39,7 +39,7 @@ add_subdirectory (bitonic_merge_sort_example_app)
 include ("${ISLAND_BASE_DIR}/CMakeLists.txt.island_epilog.in")
 
 # create a link to local resources
-link_resources(${PROJECT_SOURCE_DIR}/resources ${CMAKE_BINARY_DIR}/local_resources)
+link_resources("${PROJECT_SOURCE_DIR}/resources" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/local_resources")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
 

apps/examples/bitonic_merge_sort_example/bitonic_merge_sort_example_app/bitonic_merge_sort_example_app.cpp

@@ -6,6 +6,8 @@
 #include "le_pipeline_builder.h"
 #include "le_ui_event.h"
 #include "le_pixels.h"
+#include "shared/interfaces/le_image_decoder_interface.h"
+
 #include "le_log.h"
 
 #define GLM_FORCE_DEPTH_ZERO_TO_ONE // vulkan clip space is from 0 to 1
@@ -19,6 +21,12 @@
 #include <vector>
 #include <stdlib.h> // for random
 
+// Wrapper for format enum so that we can pass this around in a c-style api without
+// completely losing type safety.
+struct le_image_decoder_format_o {
+	le::Format format;
+};
+
 struct pixels_data_t {
 	le_buf_resource_handle handle;
 	uint32_t               w;                 // let's make sure that w is a power of 2
@@ -103,10 +111,10 @@ static bitonic_merge_sort_example_app_o* bitonic_merge_sort_example_app_create()
 // ----------------------------------------------------------------------
 
 static void bitonic_merge_sort_example_app_destroy( bitonic_merge_sort_example_app_o* self ) {
-    if (self) {
-        delete self->pixels_data;
-    }
-	delete ( self ); 
+	if ( self ) {
+		delete self->pixels_data;
+	}
+	delete ( self );
 }
 
 // ----------------------------------------------------------------------
@@ -225,7 +233,7 @@ static bool pass_sort_setup( le_renderpass_o* rp_, void* user_data ) {
 
 static void pass_noise_execute( le_command_buffer_encoder_o* encoder_, void* user_data ) {
 	le::TransferEncoder encoder{ encoder_ };
-	auto        app = static_cast<app_o*>( user_data );
+	auto                app = static_cast<app_o*>( user_data );
 
 	std::vector<uint32_t> buffer_initial_data;
 	buffer_initial_data.reserve( app->pixels_data->w * app->pixels_data->h * app->pixels_data->num_channels );
@@ -256,20 +264,28 @@ static void pass_upload_image_execute( le_command_buffer_encoder_o* encoder_, vo
 
 	// we must load image from disk
 
-	le::Pixels pixels( app->dropped_image_path.c_str(), 4 );
+	le_image_decoder_interface_t* image_decoder_api = le_pixels::api->le_pixels_image_decoder_i;
+	le_image_decoder_o*           image_decoder     = image_decoder_api->create_image_decoder( app->dropped_image_path.c_str() );
 
-	if ( !pixels.isValid() ) {
+	if ( nullptr == image_decoder ) {
 		log.warn( "Could not load image '%s'", app->dropped_image_path.c_str() );
 		app->dropped_image_path.clear();
 		return;
 	}
 
 	// invariant: pixels must be valid
 
-	le_pixels_info info = pixels.getInfo();
+	uint32_t width;
+	uint32_t height;
+
+	// request that the image decoder provide us with a float image
+	le_image_decoder_format_o format = { le::Format::eR8G8B8A8Unorm };
+
+	image_decoder_api->set_requested_format( image_decoder, &format );
+	image_decoder_api->get_image_data_description( image_decoder, &format, &width, &height );
 
-	if ( info.width * info.height < app->pixels_data->w * app->pixels_data->h ) {
-		log.warn( "Could not load image '%s': Too small: w: %d, h: %d", app->dropped_image_path.c_str(), info.width, info.height );
+	if ( width * height < app->pixels_data->w * app->pixels_data->h || format.format != le::Format::eR8G8B8A8Unorm ) {
+		log.warn( "Could not load image '%s': Too small: w: %d, h: %d", app->dropped_image_path.c_str(), width, height );
 		app->dropped_image_path.clear();
 
 		app->pixels_data->unsorted = false;
@@ -287,8 +303,21 @@ static void pass_upload_image_execute( le_command_buffer_encoder_o* encoder_, vo
 
 	uint32_t num_bytes = app->pixels_data->w * app->pixels_data->h * app->pixels_data->bytes_per_channel * app->pixels_data->num_channels;
 
-	// upload pixels
-	encoder.writeToBuffer( app->pixels_data->handle, 0, pixels.getData(), num_bytes );
+	// Allocate data so that the image decoder can read pixels into
+	uint8_t* data = ( uint8_t* )malloc( num_bytes );
+
+	if ( data ) {
+
+		// Use the image decoder to read pixels into `data`
+		image_decoder_api->read_pixels( image_decoder, data, num_bytes );
+
+		// Upload pixels to buffer GPU memory
+		encoder.writeToBuffer( app->pixels_data->handle, 0, data, num_bytes );
+
+		free( data );
+	} else {
+		LeLog( "app" ).error( "Could not allocate data to hold image. %d bytes requested", num_bytes );
+	}
 
 	app->dropped_image_path.clear();
 }
@@ -302,7 +331,7 @@ static void pass_sort_execute( le_command_buffer_encoder_o* encoder_, void* user
 	log.info( "running compute pass..." );
 
 	le::ComputeEncoder encoder{ encoder_ };
-	auto        app = static_cast<app_o*>( user_data );
+	auto               app = static_cast<app_o*>( user_data );
 
 	size_t n = app->pixels_data->w * app->pixels_data->h;
 
@@ -452,7 +481,7 @@ static void pass_sort_execute( le_command_buffer_encoder_o* encoder_, void* user
 // ----------------------------------------------------------------------
 // Draw contents of buffer to screen
 static void pass_draw_exec( le_command_buffer_encoder_o* encoder_, void* user_data ) {
-	auto        app = static_cast<bitonic_merge_sort_example_app_o*>( user_data );
+	auto                app = static_cast<bitonic_merge_sort_example_app_o*>( user_data );
 	le::GraphicsEncoder encoder{ encoder_ };
 
 	// Draw main scene

apps/examples/compute_example/CMakeLists.txt

@@ -40,7 +40,7 @@ add_subdirectory (compute_example_app)
 include ("${ISLAND_BASE_DIR}/CMakeLists.txt.island_epilog.in")
 
 # create a link to local resources
-link_resources(${PROJECT_SOURCE_DIR}/resources ${CMAKE_BINARY_DIR}/local_resources)
+link_resources("${PROJECT_SOURCE_DIR}/resources" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/local_resources")
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
 
 source_group(${PROJECT_NAME} FILES ${SOURCES})

apps/examples/hello_world/CMakeLists.txt

@@ -40,7 +40,7 @@ add_subdirectory (hello_world_app)
 include ("${ISLAND_BASE_DIR}/CMakeLists.txt.island_epilog.in")
 
 # create a link to local resources
-link_resources(${PROJECT_SOURCE_DIR}/resources ${CMAKE_BINARY_DIR}/local_resources)
+link_resources("${PROJECT_SOURCE_DIR}/resources" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/local_resources")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
 

apps/examples/hello_world/hello_world_app/hello_world_app.cpp

@@ -276,7 +276,7 @@ static bool pass_resource_setup( le_renderpass_o* pRp, void* user_data ) {
 // ----------------------------------------------------------------------
 
 static void pass_resource_exec( le_command_buffer_encoder_o* encoder_, void* user_data ) {
-	auto        app = static_cast<hello_world_app_o*>( user_data );
+	auto                app = static_cast<hello_world_app_o*>( user_data );
 	le::TransferEncoder encoder{ encoder_ };
 
 	if ( false == app->worldGeometry.wasLoaded ) {
@@ -395,7 +395,7 @@ static bool pass_main_setup( le_renderpass_o* pRp, void* user_data ) {
 // ----------------------------------------------------------------------
 
 static void pass_main_exec( le_command_buffer_encoder_o* encoder_, void* user_data ) {
-	auto        app = static_cast<hello_world_app_o*>( user_data );
+	auto                app = static_cast<hello_world_app_o*>( user_data );
 	le::GraphicsEncoder encoder{ encoder_ };
 
 	le::Extent2D passExtent = encoder.getRenderpassExtent();
@@ -551,8 +551,8 @@ static void pass_main_exec( le_command_buffer_encoder_o* encoder_, void* user_da
 
 		bool hit = hello_world_app_ray_cam_to_sun_hits_earth( app, howClose );
 
-		//		std::cout << "Hit? " << ( hit ? "true  " : " false " ) << ", distance: " << howClose << std::endl
-		//		          << std::flush;
+		// std::cout << "Hit? " << ( hit ? "true  " : " false " ) << ", distance: " << howClose << std::endl
+		//           << std::flush;
 
 		if ( !hit && fabsf( howClose ) > 1000.f ) {
 
@@ -698,7 +698,7 @@ static void hello_world_app_process_ui_events( hello_world_app_o* self ) {
 	using namespace le_window;
 	uint32_t         numEvents;
 	LeUiEvent const* pEvents;
-	window_i.get_ui_event_queue( self->window, &pEvents,&numEvents );
+	window_i.get_ui_event_queue( self->window, &pEvents, &numEvents );
 
 	std::vector<LeUiEvent> events{ pEvents, pEvents + numEvents };
 

apps/examples/imgui_example/CMakeLists.txt

@@ -40,6 +40,6 @@ add_subdirectory (imgui_example_app)
 include ("${ISLAND_BASE_DIR}/CMakeLists.txt.island_epilog.in")
 
 # (optional) create a link to local resources
-link_resources(${PROJECT_SOURCE_DIR}/resources ${CMAKE_BINARY_DIR}/local_resources)
+link_resources(${PROJECT_SOURCE_DIR}/resources ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/local_resources)
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
-source_group(${PROJECT_NAME} FILES ${SOURCES})
+source_group(${PROJECT_NAME} FILES ${SOURCES})

apps/examples/imgui_example/resources/.gitignore

@@ -27,7 +27,7 @@ set(REQUIRES_ISLAND_CORE ON )
 include ("${ISLAND_BASE_DIR}/CMakeLists.txt.island_prolog.in")
 
 # Add custom module search paths
-# add_island_module_location(${PROJECT_SOURCE_DIR}/../../modules)
+add_island_module_location(${ISLAND_BASE_DIR}/../extra_modules)
 
 # Main application c++ file. Not much to see there,
 set (SOURCES main.cpp)
@@ -40,7 +40,7 @@ add_subdirectory (lut_grading_example_app)
 include ("${ISLAND_BASE_DIR}/CMakeLists.txt.island_epilog.in")
 
 # create a link to local resources
-link_resources(${PROJECT_SOURCE_DIR}/resources ${CMAKE_BINARY_DIR}/local_resources)
+link_resources(${PROJECT_SOURCE_DIR}/resources ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/local_resources)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")