diff --git a/graphics/CMakeLists.txt b/graphics/CMakeLists.txt index 6b702e11..5ce10914 100644 --- a/graphics/CMakeLists.txt +++ b/graphics/CMakeLists.txt @@ -25,17 +25,6 @@ function(compile_shader) endforeach() endfunction() -# Replace CMAKE_IMAGE_MAX_COUNT in both source file and shader -# TODO: Please do better -file(READ src/rse_vulkan_image.c FILE_CONTENTS) -string(REPLACE "" "1" FILE_CONTENTS "${FILE_CONTENTS}") -file(WRITE src/rse_vulkan_image.c "${FILE_CONTENTS}") - -file(READ shaders/shader.frag FILE_CONTENTS) -string(REPLACE "" "1" FILE_CONTENTS "${FILE_CONTENTS}") -file(WRITE src/shaders/shader.frag "${FILE_CONTENTS}") - - compile_shader(rse_graphics ENV opengl FORMAT num diff --git a/graphics/shaders/shader.frag.num b/graphics/shaders/shader.frag.num new file mode 100644 index 00000000..3a47c217 Binary files /dev/null and b/graphics/shaders/shader.frag.num differ diff --git a/graphics/shaders/shader.vert.num b/graphics/shaders/shader.vert.num new file mode 100644 index 00000000..ca65223c Binary files /dev/null and b/graphics/shaders/shader.vert.num differ diff --git a/graphics/src/rse_graphics.c b/graphics/src/rse_graphics.c index 95756125..acc10f43 100644 --- a/graphics/src/rse_graphics.c +++ b/graphics/src/rse_graphics.c @@ -36,7 +36,7 @@ void rse_graphics_test_function(void) rse_err_t status = RSE_ERROR_NO_ERROR; uint16_t tex_id_2 = 0; - status = rse_load_texture("../../test_image.png", &tex_id_2); + status = rse_load_texture("../../test_image.jpg", &tex_id_2); if (status != RSE_ERROR_NO_ERROR) { LOGE("Failed to do something. Check error messages"); return; diff --git a/graphics/src/vulkan_base.c b/graphics/src/vulkan_base.c index 804b26ea..bc49df1f 100644 --- a/graphics/src/vulkan_base.c +++ b/graphics/src/vulkan_base.c @@ -54,7 +54,7 @@ const char* g_enabled_instance_layers_names[] = {"VK_LAYER_KHRONOS_validation"}; #else #define ENABLED_EXTENSIONS_COUT 3 #define ENABLED_INSTANCE_LAYERS_COUNT 0 -const char* g_enabled_instance_layers_names = {}; +const char* g_enabled_instance_layers_names[] = {}; #endif const char* g_enabled_instance_extensions_names[ENABLED_EXTENSIONS_COUT] = {}; diff --git a/test_image.jpg b/test_image.jpg new file mode 100644 index 00000000..6ff1f42d Binary files /dev/null and b/test_image.jpg differ diff --git a/test_image.png b/test_image.png deleted file mode 100644 index e39a01ae..00000000 Binary files a/test_image.png and /dev/null differ diff --git a/tests/src/rse_graphics_tests.c b/tests/src/rse_graphics_tests.c index ad06b0d7..64bf83c6 100644 --- a/tests/src/rse_graphics_tests.c +++ b/tests/src/rse_graphics_tests.c @@ -179,5 +179,5 @@ TestSuite(rse_textures); Test(rse_textures, load_png_image) { - rse_load_texture("../../miotacz_piorunów.png"); + rse_load_texture("../../test_image.jpg"); } diff --git a/utilities/src/file_utils.c b/utilities/src/file_utils.c index 85b1cc18..2f52e6c4 100644 --- a/utilities/src/file_utils.c +++ b/utilities/src/file_utils.c @@ -17,7 +17,10 @@ void rse_read_file(const char* file_name, long* bytes_count, char* buffer) return; } - fread(buffer, *bytes_count, 1, file); + if (fread(buffer, *bytes_count, 1, file)) { + perror("Empty file read"); + } + fclose(file); } @@ -29,4 +32,4 @@ void rse_write_to_file(const char* file_name, long bytes_count, char* buffer) fwrite(buffer, bytes_count, 1, file); fclose(file); -} \ No newline at end of file +}