From b9b6e43317b4cf2dce0f1e88bb266c9f90180bdd Mon Sep 17 00:00:00 2001 From: luboslenco Date: Wed, 12 Feb 2025 18:41:36 +0100 Subject: [PATCH] Cleanup --- .../backends/direct3d12/kinc/backend/graphics5/compute.c.h | 2 +- .../direct3d12/kinc/backend/graphics5/constantbuffer.c.h | 2 +- .../backends/direct3d12/kinc/backend/graphics5/d3d12unit.c | 2 +- .../kinc/backend/graphics5/{Direct3D12.c.h => direct3d12.c.h} | 4 ++-- .../direct3d12/kinc/backend/graphics5/indexbuffer.c.h | 2 +- .../backends/direct3d12/kinc/backend/graphics5/pipeline.c.h | 2 +- .../direct3d12/kinc/backend/graphics5/rendertarget.c.h | 2 +- .../backends/direct3d12/kinc/backend/graphics5/shader.c.h | 2 +- .../backends/direct3d12/kinc/backend/graphics5/texture.c.h | 2 +- .../direct3d12/kinc/backend/graphics5/vertexbuffer.c.h | 2 +- .../backends/g4ong5/kinc/backend/graphics4/{G4.c.h => g4.c.h} | 2 +- .../backends/g4ong5/kinc/backend/graphics4/{G4.h => g4.h} | 0 .../backends/g4ong5/kinc/backend/graphics4/g4ong5unit.c | 2 +- .../metal/kinc/backend/graphics5/{Metal.h => metal.h} | 0 .../metal/kinc/backend/graphics5/{Metal.m.h => metal.m.h} | 2 +- .../sources/backends/metal/kinc/backend/graphics5/metalunit.m | 2 +- .../sources/backends/microsoft/kinc/backend/microsoftunit.c | 2 +- .../microsoft/kinc/backend/{MiniWindows.h => miniwindows.h} | 0 .../backend/{SystemMicrosoft.c.h => system_microsoft.c.h} | 2 +- .../kinc/backend/{SystemMicrosoft.h => system_microsoft.h} | 0 armorcore/sources/backends/wasapi/kinc/backend/wasapi.c | 2 +- .../webgpu/kinc/backend/graphics5/{WebGPU.c => webgpu.c} | 0 .../webgpu/kinc/backend/graphics5/{WebGPU.h => webgpu.h} | 0 armorcore/sources/backends/windows/kinc/backend/Windows.c.h | 1 - armorcore/sources/backends/windows/kinc/backend/display.c.h | 2 +- armorcore/sources/backends/windows/kinc/backend/mouse.c.h | 2 +- armorcore/sources/backends/windows/kinc/backend/system.c.h | 4 ++-- armorcore/sources/backends/windows/kinc/backend/window.c.h | 2 +- armorcore/sources/backends/windows/kinc/backend/windows.c.h | 1 + .../backends/windows/kinc/backend/{Windows.h => windows.h} | 0 armorcore/sources/backends/windows/kinc/backend/windowsunit.c | 2 +- armorcore/sources/kinc/error.h | 4 ++-- armorcore/sources/kinc/io/filereader.h | 2 +- armorcore/sources/kinc/io/filewriter.h | 2 +- armorcore/sources/kinc/log.h | 4 ++-- 35 files changed, 31 insertions(+), 31 deletions(-) rename armorcore/sources/backends/direct3d12/kinc/backend/graphics5/{Direct3D12.c.h => direct3d12.c.h} (99%) rename armorcore/sources/backends/g4ong5/kinc/backend/graphics4/{G4.c.h => g4.c.h} (99%) rename armorcore/sources/backends/g4ong5/kinc/backend/graphics4/{G4.h => g4.h} (100%) rename armorcore/sources/backends/metal/kinc/backend/graphics5/{Metal.h => metal.h} (100%) rename armorcore/sources/backends/metal/kinc/backend/graphics5/{Metal.m.h => metal.m.h} (99%) rename armorcore/sources/backends/microsoft/kinc/backend/{MiniWindows.h => miniwindows.h} (100%) rename armorcore/sources/backends/microsoft/kinc/backend/{SystemMicrosoft.c.h => system_microsoft.c.h} (97%) rename armorcore/sources/backends/microsoft/kinc/backend/{SystemMicrosoft.h => system_microsoft.h} (100%) rename armorcore/sources/backends/webgpu/kinc/backend/graphics5/{WebGPU.c => webgpu.c} (100%) rename armorcore/sources/backends/webgpu/kinc/backend/graphics5/{WebGPU.h => webgpu.h} (100%) delete mode 100644 armorcore/sources/backends/windows/kinc/backend/Windows.c.h create mode 100644 armorcore/sources/backends/windows/kinc/backend/windows.c.h rename armorcore/sources/backends/windows/kinc/backend/{Windows.h => windows.h} (100%) diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/compute.c.h b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/compute.c.h index 7fecc321..81cba918 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/compute.c.h +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/compute.c.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include void kinc_g5_compute_shader_init(kinc_g5_compute_shader *shader, void *_data, int length) { unsigned index = 0; diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/constantbuffer.c.h b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/constantbuffer.c.h index 48eeb1fb..2d05346e 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/constantbuffer.c.h +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/constantbuffer.c.h @@ -1,5 +1,5 @@ -#include +#include bool kinc_g5_transposeMat = false; diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/d3d12unit.c b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/d3d12unit.c index f8a13031..6c328916 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/d3d12unit.c +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/d3d12unit.c @@ -76,7 +76,7 @@ static bool compute_pipeline_set = false; #include #include -#include "Direct3D12.c.h" +#include "direct3d12.c.h" #include "shaderhash.c.h" #include "commandlist.c.h" #include "compute.c.h" diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/Direct3D12.c.h b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/direct3d12.c.h similarity index 99% rename from armorcore/sources/backends/direct3d12/kinc/backend/graphics5/Direct3D12.c.h rename to armorcore/sources/backends/direct3d12/kinc/backend/graphics5/direct3d12.c.h index e8a7c5ec..c8cd5840 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/Direct3D12.c.h +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/direct3d12.c.h @@ -10,8 +10,8 @@ #include #undef CreateWindow #include -#include -#include +#include +#include ID3D12CommandQueue *commandQueue; diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/indexbuffer.c.h b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/indexbuffer.c.h index a68690e3..72453a50 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/indexbuffer.c.h +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/indexbuffer.c.h @@ -1,6 +1,6 @@ #include "indexbuffer.h" -#include +#include #include void kinc_g5_index_buffer_init(kinc_g5_index_buffer_t *buffer, int count, bool gpuMemory) { diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/pipeline.c.h b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/pipeline.c.h index 0e01960f..a0d7098a 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/pipeline.c.h +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/pipeline.c.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include void kinc_g5_internal_setConstants(kinc_g5_command_list_t *commandList, kinc_g5_pipeline_t *pipeline) { commandList->impl._commandList->lpVtbl->SetGraphicsRootSignature(commandList->impl._commandList, globalRootSignature); diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/rendertarget.c.h b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/rendertarget.c.h index 12303218..d016e8d1 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/rendertarget.c.h +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/rendertarget.c.h @@ -1,7 +1,7 @@ #include "rendertarget.h" #include #include -#include +#include #include static void WaitForFence(ID3D12Fence *fence, UINT64 completionValue, HANDLE waitEvent) { diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/shader.c.h b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/shader.c.h index 6318520b..18460741 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/shader.c.h +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/shader.c.h @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/texture.c.h b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/texture.c.h index efce6008..17bcb88e 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/texture.c.h +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/texture.c.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include diff --git a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/vertexbuffer.c.h b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/vertexbuffer.c.h index f086cb7f..7a30d465 100644 --- a/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/vertexbuffer.c.h +++ b/armorcore/sources/backends/direct3d12/kinc/backend/graphics5/vertexbuffer.c.h @@ -1,6 +1,6 @@ #include "vertexbuffer.h" #include -#include +#include #include kinc_g5_vertex_buffer_t *_current_vertex_buffer = NULL; diff --git a/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/G4.c.h b/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/g4.c.h similarity index 99% rename from armorcore/sources/backends/g4ong5/kinc/backend/graphics4/G4.c.h rename to armorcore/sources/backends/g4ong5/kinc/backend/graphics4/g4.c.h index e698e4d0..bb876e37 100644 --- a/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/G4.c.h +++ b/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/g4.c.h @@ -1,4 +1,4 @@ -#include "G4.h" +#include "g4.h" #include "kinc/graphics4/graphics.h" #include "kinc/window.h" #include diff --git a/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/G4.h b/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/g4.h similarity index 100% rename from armorcore/sources/backends/g4ong5/kinc/backend/graphics4/G4.h rename to armorcore/sources/backends/g4ong5/kinc/backend/graphics4/g4.h diff --git a/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/g4ong5unit.c b/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/g4ong5unit.c index a1a72e27..e5506ff5 100644 --- a/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/g4ong5unit.c +++ b/armorcore/sources/backends/g4ong5/kinc/backend/graphics4/g4ong5unit.c @@ -1,6 +1,6 @@ #include "samplers.c.h" -#include "G4.c.h" +#include "g4.c.h" #include "compute.c.h" #include "indexbuffer.c.h" #include "pipeline.c.h" diff --git a/armorcore/sources/backends/metal/kinc/backend/graphics5/Metal.h b/armorcore/sources/backends/metal/kinc/backend/graphics5/metal.h similarity index 100% rename from armorcore/sources/backends/metal/kinc/backend/graphics5/Metal.h rename to armorcore/sources/backends/metal/kinc/backend/graphics5/metal.h diff --git a/armorcore/sources/backends/metal/kinc/backend/graphics5/Metal.m.h b/armorcore/sources/backends/metal/kinc/backend/graphics5/metal.m.h similarity index 99% rename from armorcore/sources/backends/metal/kinc/backend/graphics5/Metal.m.h rename to armorcore/sources/backends/metal/kinc/backend/graphics5/metal.m.h index a79ebab7..8ed0743a 100644 --- a/armorcore/sources/backends/metal/kinc/backend/graphics5/Metal.m.h +++ b/armorcore/sources/backends/metal/kinc/backend/graphics5/metal.m.h @@ -1,4 +1,4 @@ -#include "Metal.h" +#include "metal.h" #include #include #include diff --git a/armorcore/sources/backends/metal/kinc/backend/graphics5/metalunit.m b/armorcore/sources/backends/metal/kinc/backend/graphics5/metalunit.m index b8a70973..a5426c7b 100644 --- a/armorcore/sources/backends/metal/kinc/backend/graphics5/metalunit.m +++ b/armorcore/sources/backends/metal/kinc/backend/graphics5/metalunit.m @@ -8,7 +8,7 @@ static id compute_command_encoder = nil; static void start_render_pass(void); static void end_render_pass(void); -#include "Metal.m.h" +#include "metal.m.h" #include "commandlist.m.h" #include "compute.m.h" #include "constantbuffer.m.h" diff --git a/armorcore/sources/backends/microsoft/kinc/backend/microsoftunit.c b/armorcore/sources/backends/microsoft/kinc/backend/microsoftunit.c index 29557407..9d4ae626 100644 --- a/armorcore/sources/backends/microsoft/kinc/backend/microsoftunit.c +++ b/armorcore/sources/backends/microsoft/kinc/backend/microsoftunit.c @@ -47,7 +47,7 @@ #include #include -#include "SystemMicrosoft.c.h" +#include "system_microsoft.c.h" #include "event.c.h" #include "fiber.c.h" #include "mutex.c.h" diff --git a/armorcore/sources/backends/microsoft/kinc/backend/MiniWindows.h b/armorcore/sources/backends/microsoft/kinc/backend/miniwindows.h similarity index 100% rename from armorcore/sources/backends/microsoft/kinc/backend/MiniWindows.h rename to armorcore/sources/backends/microsoft/kinc/backend/miniwindows.h diff --git a/armorcore/sources/backends/microsoft/kinc/backend/SystemMicrosoft.c.h b/armorcore/sources/backends/microsoft/kinc/backend/system_microsoft.c.h similarity index 97% rename from armorcore/sources/backends/microsoft/kinc/backend/SystemMicrosoft.c.h rename to armorcore/sources/backends/microsoft/kinc/backend/system_microsoft.c.h index 79d347c9..41cdb111 100644 --- a/armorcore/sources/backends/microsoft/kinc/backend/SystemMicrosoft.c.h +++ b/armorcore/sources/backends/microsoft/kinc/backend/system_microsoft.c.h @@ -1,4 +1,4 @@ -#include "SystemMicrosoft.h" +#include "system_microsoft.h" #include #include diff --git a/armorcore/sources/backends/microsoft/kinc/backend/SystemMicrosoft.h b/armorcore/sources/backends/microsoft/kinc/backend/system_microsoft.h similarity index 100% rename from armorcore/sources/backends/microsoft/kinc/backend/SystemMicrosoft.h rename to armorcore/sources/backends/microsoft/kinc/backend/system_microsoft.h diff --git a/armorcore/sources/backends/wasapi/kinc/backend/wasapi.c b/armorcore/sources/backends/wasapi/kinc/backend/wasapi.c index 07d0b451..3ec25a64 100644 --- a/armorcore/sources/backends/wasapi/kinc/backend/wasapi.c +++ b/armorcore/sources/backends/wasapi/kinc/backend/wasapi.c @@ -2,7 +2,7 @@ #ifdef KINC_A2 #include -#include +#include #include #include diff --git a/armorcore/sources/backends/webgpu/kinc/backend/graphics5/WebGPU.c b/armorcore/sources/backends/webgpu/kinc/backend/graphics5/webgpu.c similarity index 100% rename from armorcore/sources/backends/webgpu/kinc/backend/graphics5/WebGPU.c rename to armorcore/sources/backends/webgpu/kinc/backend/graphics5/webgpu.c diff --git a/armorcore/sources/backends/webgpu/kinc/backend/graphics5/WebGPU.h b/armorcore/sources/backends/webgpu/kinc/backend/graphics5/webgpu.h similarity index 100% rename from armorcore/sources/backends/webgpu/kinc/backend/graphics5/WebGPU.h rename to armorcore/sources/backends/webgpu/kinc/backend/graphics5/webgpu.h diff --git a/armorcore/sources/backends/windows/kinc/backend/Windows.c.h b/armorcore/sources/backends/windows/kinc/backend/Windows.c.h deleted file mode 100644 index 7bd72ae1..00000000 --- a/armorcore/sources/backends/windows/kinc/backend/Windows.c.h +++ /dev/null @@ -1 +0,0 @@ -#include "Windows.h" diff --git a/armorcore/sources/backends/windows/kinc/backend/display.c.h b/armorcore/sources/backends/windows/kinc/backend/display.c.h index 393314dc..0a921403 100644 --- a/armorcore/sources/backends/windows/kinc/backend/display.c.h +++ b/armorcore/sources/backends/windows/kinc/backend/display.c.h @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/armorcore/sources/backends/windows/kinc/backend/mouse.c.h b/armorcore/sources/backends/windows/kinc/backend/mouse.c.h index 717f2ce2..2a314f6b 100644 --- a/armorcore/sources/backends/windows/kinc/backend/mouse.c.h +++ b/armorcore/sources/backends/windows/kinc/backend/mouse.c.h @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/armorcore/sources/backends/windows/kinc/backend/system.c.h b/armorcore/sources/backends/windows/kinc/backend/system.c.h index 9d2b4184..d0cddc7d 100644 --- a/armorcore/sources/backends/windows/kinc/backend/system.c.h +++ b/armorcore/sources/backends/windows/kinc/backend/system.c.h @@ -1,7 +1,7 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/armorcore/sources/backends/windows/kinc/backend/window.c.h b/armorcore/sources/backends/windows/kinc/backend/window.c.h index 8ae9b504..4ab44dd6 100644 --- a/armorcore/sources/backends/windows/kinc/backend/window.c.h +++ b/armorcore/sources/backends/windows/kinc/backend/window.c.h @@ -1,7 +1,7 @@ #include #include #include -#include +#include #undef CreateWindow diff --git a/armorcore/sources/backends/windows/kinc/backend/windows.c.h b/armorcore/sources/backends/windows/kinc/backend/windows.c.h new file mode 100644 index 00000000..81d905ab --- /dev/null +++ b/armorcore/sources/backends/windows/kinc/backend/windows.c.h @@ -0,0 +1 @@ +#include "windows.h" diff --git a/armorcore/sources/backends/windows/kinc/backend/Windows.h b/armorcore/sources/backends/windows/kinc/backend/windows.h similarity index 100% rename from armorcore/sources/backends/windows/kinc/backend/Windows.h rename to armorcore/sources/backends/windows/kinc/backend/windows.h diff --git a/armorcore/sources/backends/windows/kinc/backend/windowsunit.c b/armorcore/sources/backends/windows/kinc/backend/windowsunit.c index 09e3e807..1f56e57a 100644 --- a/armorcore/sources/backends/windows/kinc/backend/windowsunit.c +++ b/armorcore/sources/backends/windows/kinc/backend/windowsunit.c @@ -117,7 +117,7 @@ enum tagPOINTER_INPUT_TYPE { #include -#include "Windows.c.h" +#include "windows.c.h" #include "base.c.h" #include "display.c.h" #include "http.c.h" diff --git a/armorcore/sources/kinc/error.h b/armorcore/sources/kinc/error.h index 6f077ecb..e4fe85c9 100644 --- a/armorcore/sources/kinc/error.h +++ b/armorcore/sources/kinc/error.h @@ -35,8 +35,8 @@ void kinc_error_args(const char *format, va_list args); #ifdef KINC_WINDOWS -#include -#include +#include +#include #endif void kinc_affirm(bool condition) { diff --git a/armorcore/sources/kinc/io/filereader.h b/armorcore/sources/kinc/io/filereader.h index 64758a09..75713b0c 100644 --- a/armorcore/sources/kinc/io/filereader.h +++ b/armorcore/sources/kinc/io/filereader.h @@ -127,7 +127,7 @@ const char *macgetresourcepath(void); #endif #if defined(KINC_WINDOWS) -#include +#include #endif static char *fileslocation = NULL; diff --git a/armorcore/sources/kinc/io/filewriter.h b/armorcore/sources/kinc/io/filewriter.h index 8dbe62b7..34e35807 100644 --- a/armorcore/sources/kinc/io/filewriter.h +++ b/armorcore/sources/kinc/io/filewriter.h @@ -35,7 +35,7 @@ void kinc_file_writer_close(kinc_file_writer_t *writer); #include #if defined(KINC_WINDOWS) -#include +#include #endif bool kinc_file_writer_open(kinc_file_writer_t *writer, const char *filepath) { diff --git a/armorcore/sources/kinc/log.h b/armorcore/sources/kinc/log.h index 7222873a..d29d13c4 100644 --- a/armorcore/sources/kinc/log.h +++ b/armorcore/sources/kinc/log.h @@ -27,8 +27,8 @@ void kinc_log_args(kinc_log_level_t log_level, const char *format, va_list args) #endif #ifdef KINC_MICROSOFT -#include -#include +#include +#include #endif #ifdef KINC_ANDROID