From 5dc8f8e26af2c28635ced058e27e28762a7570eb Mon Sep 17 00:00:00 2001 From: Albin Johansson Date: Wed, 10 Jul 2024 00:07:33 +0200 Subject: [PATCH] Tweak OpenGL renderer structure --- CMakeLists.txt | 8 +--- source/opengl/CMakeLists.txt | 43 ----------------- source/opengl/test/CMakeLists.txt | 24 ---------- source/opengl_renderer/CMakeLists.txt | 7 +++ source/opengl_renderer/lib/CMakeLists.txt | 46 +++++++++++++++++++ .../lib/inc/tactile/opengl_renderer}/api.hpp | 0 .../tactile/opengl_renderer}/opengl_error.hpp | 2 +- .../tactile/opengl_renderer}/opengl_imgui.hpp | 2 +- .../opengl_renderer}/opengl_renderer.hpp | 2 +- .../opengl_renderer_plugin.hpp | 4 +- .../opengl_renderer}/opengl_texture.hpp | 2 +- .../tactile/opengl_renderer}/opengl_error.cpp | 2 +- .../tactile/opengl_renderer}/opengl_imgui.cpp | 4 +- .../opengl_renderer}/opengl_renderer.cpp | 8 ++-- .../opengl_renderer_plugin.cpp | 2 +- .../opengl_renderer}/opengl_texture.cpp | 4 +- source/opengl_renderer/test/CMakeLists.txt | 24 ++++++++++ .../test/src/main.cpp | 0 .../test/src/opengl_error_test.cpp | 14 ++++-- .../test/src/opengl_renderer_test.cpp | 4 +- .../test/src/opengl_texture_test.cpp | 4 +- 21 files changed, 108 insertions(+), 98 deletions(-) delete mode 100644 source/opengl/CMakeLists.txt delete mode 100644 source/opengl/test/CMakeLists.txt create mode 100644 source/opengl_renderer/CMakeLists.txt create mode 100644 source/opengl_renderer/lib/CMakeLists.txt rename source/{opengl/inc/tactile/opengl => opengl_renderer/lib/inc/tactile/opengl_renderer}/api.hpp (100%) rename source/{opengl/inc/tactile/opengl => opengl_renderer/lib/inc/tactile/opengl_renderer}/opengl_error.hpp (96%) rename source/{opengl/inc/tactile/opengl => opengl_renderer/lib/inc/tactile/opengl_renderer}/opengl_imgui.hpp (97%) rename source/{opengl/inc/tactile/opengl => opengl_renderer/lib/inc/tactile/opengl_renderer}/opengl_renderer.hpp (97%) rename source/{opengl/inc/tactile/opengl => opengl_renderer/lib/inc/tactile/opengl_renderer}/opengl_renderer_plugin.hpp (87%) rename source/{opengl/inc/tactile/opengl => opengl_renderer/lib/inc/tactile/opengl_renderer}/opengl_texture.hpp (96%) rename source/{opengl/src/tactile/opengl => opengl_renderer/lib/src/tactile/opengl_renderer}/opengl_error.cpp (97%) rename source/{opengl/src/tactile/opengl => opengl_renderer/lib/src/tactile/opengl_renderer}/opengl_imgui.cpp (93%) rename source/{opengl/src/tactile/opengl => opengl_renderer/lib/src/tactile/opengl_renderer}/opengl_renderer.cpp (95%) rename source/{opengl/src/tactile/opengl => opengl_renderer/lib/src/tactile/opengl_renderer}/opengl_renderer_plugin.cpp (95%) rename source/{opengl/src/tactile/opengl => opengl_renderer/lib/src/tactile/opengl_renderer}/opengl_texture.cpp (96%) create mode 100644 source/opengl_renderer/test/CMakeLists.txt rename source/{opengl => opengl_renderer}/test/src/main.cpp (100%) rename source/{opengl => opengl_renderer}/test/src/opengl_error_test.cpp (65%) rename source/{opengl => opengl_renderer}/test/src/opengl_renderer_test.cpp (86%) rename source/{opengl => opengl_renderer}/test/src/opengl_texture_test.cpp (87%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ac2ec008b..4efb7130a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,12 +77,8 @@ add_subdirectory("source/zstd_compression") add_subdirectory("source/yaml_format") add_subdirectory("source/main") -if (TACTILE_BUILD_OPENGL_RENDERER MATCHES "ON") - add_subdirectory("source/opengl") - - if (TACTILE_BUILD_TESTS MATCHES "ON") - add_subdirectory("source/opengl/test") - endif () +if (TACTILE_BUILD_OPENGL_RENDERER) + add_subdirectory("source/opengl_renderer") endif () if (TACTILE_BUILD_VULKAN_RENDERER) diff --git a/source/opengl/CMakeLists.txt b/source/opengl/CMakeLists.txt deleted file mode 100644 index fd0c5bdcf3..0000000000 --- a/source/opengl/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -project(tactile-opengl CXX) - -add_library(tactile-opengl SHARED EXCLUDE_FROM_ALL) -add_library(tactile::opengl ALIAS tactile-opengl) - -target_sources(tactile-opengl - PRIVATE - "${PROJECT_SOURCE_DIR}/inc/tactile/opengl/api.hpp" - "${PROJECT_SOURCE_DIR}/inc/tactile/opengl/opengl_error.hpp" - "${PROJECT_SOURCE_DIR}/src/tactile/opengl/opengl_error.cpp" - "${PROJECT_SOURCE_DIR}/inc/tactile/opengl/opengl_imgui.hpp" - "${PROJECT_SOURCE_DIR}/src/tactile/opengl/opengl_imgui.cpp" - "${PROJECT_SOURCE_DIR}/inc/tactile/opengl/opengl_renderer.hpp" - "${PROJECT_SOURCE_DIR}/src/tactile/opengl/opengl_renderer.cpp" - "${PROJECT_SOURCE_DIR}/inc/tactile/opengl/opengl_renderer_plugin.hpp" - "${PROJECT_SOURCE_DIR}/src/tactile/opengl/opengl_renderer_plugin.cpp" - "${PROJECT_SOURCE_DIR}/inc/tactile/opengl/opengl_texture.hpp" - "${PROJECT_SOURCE_DIR}/src/tactile/opengl/opengl_texture.cpp" - ) - -tactile_prepare_target(tactile-opengl) - -target_compile_definitions(tactile-opengl PRIVATE "TACTILE_BUILDING_OPENGL_RENDERER") - -target_include_directories(tactile-opengl - PUBLIC - "${PROJECT_SOURCE_DIR}/inc" - - SYSTEM PRIVATE - "${Stb_INCLUDE_DIR}" - ) - -target_link_libraries(tactile-opengl - PUBLIC - tactile::base - tactile::runtime - - PRIVATE - OpenGL::GL - glad::glad - SDL2::SDL2 - imgui::imgui - ) diff --git a/source/opengl/test/CMakeLists.txt b/source/opengl/test/CMakeLists.txt deleted file mode 100644 index 475e87b4e0..0000000000 --- a/source/opengl/test/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -project(tactile-opengl-test CXX) - -file(GLOB_RECURSE TACTILE_OPENGL_TEST_FILES CONFIGURE_DEPENDS - "${PROJECT_SOURCE_DIR}/src/*.cpp" - "${PROJECT_SOURCE_DIR}/src/*.hpp" - "${PROJECT_SOURCE_DIR}/src/**/*.cpp" - "${PROJECT_SOURCE_DIR}/src/**/*.hpp" - ) - -add_executable(tactile-opengl-test "${TACTILE_OPENGL_TEST_FILES}") - -tactile_prepare_target(tactile-opengl-test) - -target_link_libraries(tactile-opengl-test - PUBLIC - tactile::opengl - tactile::core - GTest::gtest - - PRIVATE - glad::glad - SDL2::SDL2 - imgui::imgui - ) diff --git a/source/opengl_renderer/CMakeLists.txt b/source/opengl_renderer/CMakeLists.txt new file mode 100644 index 0000000000..0c4cdcfb79 --- /dev/null +++ b/source/opengl_renderer/CMakeLists.txt @@ -0,0 +1,7 @@ +project(tactile-opengl-renderer CXX) + +add_subdirectory("lib") + +if (TACTILE_BUILD_TESTS) + add_subdirectory("test") +endif () diff --git a/source/opengl_renderer/lib/CMakeLists.txt b/source/opengl_renderer/lib/CMakeLists.txt new file mode 100644 index 0000000000..2d7add8c9e --- /dev/null +++ b/source/opengl_renderer/lib/CMakeLists.txt @@ -0,0 +1,46 @@ +project(tactile-opengl-renderer-lib CXX) + +add_library(tactile-opengl-renderer SHARED EXCLUDE_FROM_ALL) +add_library(tactile::opengl_renderer ALIAS tactile-opengl-renderer) + +target_sources(tactile-opengl-renderer + PRIVATE + "${PROJECT_SOURCE_DIR}/inc/tactile/opengl_renderer/api.hpp" + "${PROJECT_SOURCE_DIR}/inc/tactile/opengl_renderer/opengl_error.hpp" + "${PROJECT_SOURCE_DIR}/src/tactile/opengl_renderer/opengl_error.cpp" + "${PROJECT_SOURCE_DIR}/inc/tactile/opengl_renderer/opengl_imgui.hpp" + "${PROJECT_SOURCE_DIR}/src/tactile/opengl_renderer/opengl_imgui.cpp" + "${PROJECT_SOURCE_DIR}/inc/tactile/opengl_renderer/opengl_renderer.hpp" + "${PROJECT_SOURCE_DIR}/src/tactile/opengl_renderer/opengl_renderer.cpp" + "${PROJECT_SOURCE_DIR}/inc/tactile/opengl_renderer/opengl_renderer_plugin.hpp" + "${PROJECT_SOURCE_DIR}/src/tactile/opengl_renderer/opengl_renderer_plugin.cpp" + "${PROJECT_SOURCE_DIR}/inc/tactile/opengl_renderer/opengl_texture.hpp" + "${PROJECT_SOURCE_DIR}/src/tactile/opengl_renderer/opengl_texture.cpp" + ) + +tactile_prepare_target(tactile-opengl-renderer) + +target_compile_definitions(tactile-opengl-renderer + PRIVATE + "TACTILE_BUILDING_OPENGL_RENDERER" + ) + +target_include_directories(tactile-opengl-renderer + PUBLIC + "${PROJECT_SOURCE_DIR}/inc" + + SYSTEM PRIVATE + "${Stb_INCLUDE_DIR}" + ) + +target_link_libraries(tactile-opengl-renderer + PUBLIC + tactile::base + tactile::runtime + + PRIVATE + OpenGL::GL + glad::glad + SDL2::SDL2 + imgui::imgui + ) diff --git a/source/opengl/inc/tactile/opengl/api.hpp b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/api.hpp similarity index 100% rename from source/opengl/inc/tactile/opengl/api.hpp rename to source/opengl_renderer/lib/inc/tactile/opengl_renderer/api.hpp diff --git a/source/opengl/inc/tactile/opengl/opengl_error.hpp b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_error.hpp similarity index 96% rename from source/opengl/inc/tactile/opengl/opengl_error.hpp rename to source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_error.hpp index 269892e8cf..36ea473c75 100644 --- a/source/opengl/inc/tactile/opengl/opengl_error.hpp +++ b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_error.hpp @@ -6,7 +6,7 @@ #include "tactile/base/container/expected.hpp" #include "tactile/base/prelude.hpp" -#include "tactile/opengl/api.hpp" +#include "tactile/opengl_renderer/api.hpp" namespace tactile { diff --git a/source/opengl/inc/tactile/opengl/opengl_imgui.hpp b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_imgui.hpp similarity index 97% rename from source/opengl/inc/tactile/opengl/opengl_imgui.hpp rename to source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_imgui.hpp index 8c1d72d505..93eef42d43 100644 --- a/source/opengl/inc/tactile/opengl/opengl_imgui.hpp +++ b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_imgui.hpp @@ -4,7 +4,7 @@ #include "tactile/base/container/expected.hpp" #include "tactile/base/prelude.hpp" -#include "tactile/opengl/api.hpp" +#include "tactile/opengl_renderer/api.hpp" struct SDL_Window; struct ImGuiContext; diff --git a/source/opengl/inc/tactile/opengl/opengl_renderer.hpp b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_renderer.hpp similarity index 97% rename from source/opengl/inc/tactile/opengl/opengl_renderer.hpp rename to source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_renderer.hpp index 41e5f5bc27..1ae0a9d6c4 100644 --- a/source/opengl/inc/tactile/opengl/opengl_renderer.hpp +++ b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_renderer.hpp @@ -6,7 +6,7 @@ #include "tactile/base/container/smart_ptr.hpp" #include "tactile/base/prelude.hpp" #include "tactile/base/render/renderer.hpp" -#include "tactile/opengl/api.hpp" +#include "tactile/opengl_renderer/api.hpp" namespace tactile { diff --git a/source/opengl/inc/tactile/opengl/opengl_renderer_plugin.hpp b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_renderer_plugin.hpp similarity index 87% rename from source/opengl/inc/tactile/opengl/opengl_renderer_plugin.hpp rename to source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_renderer_plugin.hpp index 6d217aac19..b887ed177e 100644 --- a/source/opengl/inc/tactile/opengl/opengl_renderer_plugin.hpp +++ b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_renderer_plugin.hpp @@ -4,8 +4,8 @@ #include "tactile/base/container/maybe.hpp" #include "tactile/base/prelude.hpp" -#include "tactile/opengl/api.hpp" -#include "tactile/opengl/opengl_renderer.hpp" +#include "tactile/opengl_renderer/api.hpp" +#include "tactile/opengl_renderer/opengl_renderer.hpp" #include "tactile/runtime/plugin.hpp" namespace tactile { diff --git a/source/opengl/inc/tactile/opengl/opengl_texture.hpp b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_texture.hpp similarity index 96% rename from source/opengl/inc/tactile/opengl/opengl_texture.hpp rename to source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_texture.hpp index 6f29892ea9..f8d7e920c8 100644 --- a/source/opengl/inc/tactile/opengl/opengl_texture.hpp +++ b/source/opengl_renderer/lib/inc/tactile/opengl_renderer/opengl_texture.hpp @@ -6,7 +6,7 @@ #include "tactile/base/int.hpp" #include "tactile/base/prelude.hpp" #include "tactile/base/render/texture.hpp" -#include "tactile/opengl/api.hpp" +#include "tactile/opengl_renderer/api.hpp" namespace tactile { diff --git a/source/opengl/src/tactile/opengl/opengl_error.cpp b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_error.cpp similarity index 97% rename from source/opengl/src/tactile/opengl/opengl_error.cpp rename to source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_error.cpp index 7e018b72a6..2cef278936 100644 --- a/source/opengl/src/tactile/opengl/opengl_error.cpp +++ b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_error.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/opengl/opengl_error.hpp" +#include "tactile/opengl_renderer/opengl_error.hpp" #include diff --git a/source/opengl/src/tactile/opengl/opengl_imgui.cpp b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_imgui.cpp similarity index 93% rename from source/opengl/src/tactile/opengl/opengl_imgui.cpp rename to source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_imgui.cpp index be63d1cd6d..f1d4f212b2 100644 --- a/source/opengl/src/tactile/opengl/opengl_imgui.cpp +++ b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_imgui.cpp @@ -1,13 +1,13 @@ // Copyright (C) 2023 Albin Johansson (GNU General Public License v3.0) -#include "tactile/opengl/opengl_imgui.hpp" +#include "tactile/opengl_renderer/opengl_imgui.hpp" #include // exchange #include #include -#include "tactile/opengl/opengl_error.hpp" +#include "tactile/opengl_renderer/opengl_error.hpp" namespace tactile { diff --git a/source/opengl/src/tactile/opengl/opengl_renderer.cpp b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_renderer.cpp similarity index 95% rename from source/opengl/src/tactile/opengl/opengl_renderer.cpp rename to source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_renderer.cpp index a9f202e063..de4070f1e4 100644 --- a/source/opengl/src/tactile/opengl/opengl_renderer.cpp +++ b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_renderer.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/opengl/opengl_renderer.hpp" +#include "tactile/opengl_renderer/opengl_renderer.hpp" #include // malloc, free #include // list @@ -17,9 +17,9 @@ #include "tactile/base/container/maybe.hpp" #include "tactile/base/container/smart_ptr.hpp" #include "tactile/base/render/window.hpp" -#include "tactile/opengl/opengl_error.hpp" -#include "tactile/opengl/opengl_imgui.hpp" -#include "tactile/opengl/opengl_texture.hpp" +#include "tactile/opengl_renderer/opengl_error.hpp" +#include "tactile/opengl_renderer/opengl_imgui.hpp" +#include "tactile/opengl_renderer/opengl_texture.hpp" #include "tactile/runtime/runtime.hpp" namespace tactile { diff --git a/source/opengl/src/tactile/opengl/opengl_renderer_plugin.cpp b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_renderer_plugin.cpp similarity index 95% rename from source/opengl/src/tactile/opengl/opengl_renderer_plugin.cpp rename to source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_renderer_plugin.cpp index 7d38ec14bc..f7572baafe 100644 --- a/source/opengl/src/tactile/opengl/opengl_renderer_plugin.cpp +++ b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_renderer_plugin.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/opengl/opengl_renderer_plugin.hpp" +#include "tactile/opengl_renderer/opengl_renderer_plugin.hpp" #include // nothrow diff --git a/source/opengl/src/tactile/opengl/opengl_texture.cpp b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_texture.cpp similarity index 96% rename from source/opengl/src/tactile/opengl/opengl_texture.cpp rename to source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_texture.cpp index 2618e637f3..854a380928 100644 --- a/source/opengl/src/tactile/opengl/opengl_texture.cpp +++ b/source/opengl_renderer/lib/src/tactile/opengl_renderer/opengl_texture.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/opengl/opengl_texture.hpp" +#include "tactile/opengl_renderer/opengl_texture.hpp" #define STB_IMAGE_IMPLEMENTATION @@ -10,7 +10,7 @@ #include #include -#include "tactile/opengl/opengl_error.hpp" +#include "tactile/opengl_renderer/opengl_error.hpp" namespace tactile { diff --git a/source/opengl_renderer/test/CMakeLists.txt b/source/opengl_renderer/test/CMakeLists.txt new file mode 100644 index 0000000000..9461d16a7b --- /dev/null +++ b/source/opengl_renderer/test/CMakeLists.txt @@ -0,0 +1,24 @@ +project(tactile-opengl-renderer-test CXX) + +add_executable(tactile-opengl-renderer-test) + +target_sources(tactile-opengl-renderer-test + PRIVATE + "${PROJECT_SOURCE_DIR}/src/main.cpp" + "${PROJECT_SOURCE_DIR}/src/opengl_error_test.cpp" + "${PROJECT_SOURCE_DIR}/src/opengl_renderer_test.cpp" + "${PROJECT_SOURCE_DIR}/src/opengl_texture_test.cpp" + ) + +tactile_prepare_target(tactile-opengl-renderer-test) + +target_link_libraries(tactile-opengl-renderer-test + PUBLIC + tactile::opengl_renderer + GTest::gtest + + PRIVATE + glad::glad + SDL2::SDL2 + imgui::imgui + ) diff --git a/source/opengl/test/src/main.cpp b/source/opengl_renderer/test/src/main.cpp similarity index 100% rename from source/opengl/test/src/main.cpp rename to source/opengl_renderer/test/src/main.cpp diff --git a/source/opengl/test/src/opengl_error_test.cpp b/source/opengl_renderer/test/src/opengl_error_test.cpp similarity index 65% rename from source/opengl/test/src/opengl_error_test.cpp rename to source/opengl_renderer/test/src/opengl_error_test.cpp index 4b4bc2551d..23ea19bf55 100644 --- a/source/opengl/test/src/opengl_error_test.cpp +++ b/source/opengl_renderer/test/src/opengl_error_test.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/opengl/opengl_error.hpp" +#include "tactile/opengl_renderer/opengl_error.hpp" #include // to_underlying @@ -13,10 +13,14 @@ namespace tactile { TEST(OpenGLError, MapOpenGLErrorCode) { EXPECT_EQ(map_opengl_error_code(GL_INVALID_ENUM), OpenGLError::kInvalidEnum); - EXPECT_EQ(map_opengl_error_code(GL_INVALID_VALUE), OpenGLError::kInvalidValue); - EXPECT_EQ(map_opengl_error_code(GL_INVALID_OPERATION), OpenGLError::kInvalidOperation); - EXPECT_EQ(map_opengl_error_code(GL_STACK_OVERFLOW), OpenGLError::kStackOverflow); - EXPECT_EQ(map_opengl_error_code(GL_STACK_UNDERFLOW), OpenGLError::kStackUnderflow); + EXPECT_EQ(map_opengl_error_code(GL_INVALID_VALUE), + OpenGLError::kInvalidValue); + EXPECT_EQ(map_opengl_error_code(GL_INVALID_OPERATION), + OpenGLError::kInvalidOperation); + EXPECT_EQ(map_opengl_error_code(GL_STACK_OVERFLOW), + OpenGLError::kStackOverflow); + EXPECT_EQ(map_opengl_error_code(GL_STACK_UNDERFLOW), + OpenGLError::kStackUnderflow); EXPECT_EQ(map_opengl_error_code(GL_OUT_OF_MEMORY), OpenGLError::kOutOfMemory); EXPECT_EQ(map_opengl_error_code(GL_INVALID_FRAMEBUFFER_OPERATION), OpenGLError::kInvalidFramebufferOperation); diff --git a/source/opengl/test/src/opengl_renderer_test.cpp b/source/opengl_renderer/test/src/opengl_renderer_test.cpp similarity index 86% rename from source/opengl/test/src/opengl_renderer_test.cpp rename to source/opengl_renderer/test/src/opengl_renderer_test.cpp index a4d1601995..ddde04256b 100644 --- a/source/opengl/test/src/opengl_renderer_test.cpp +++ b/source/opengl_renderer/test/src/opengl_renderer_test.cpp @@ -1,10 +1,10 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/opengl/opengl_renderer.hpp" +#include "tactile/opengl_renderer/opengl_renderer.hpp" #include -#include "tactile/opengl/opengl_renderer_plugin.hpp" +#include "tactile/opengl_renderer/opengl_renderer_plugin.hpp" #include "tactile/runtime/runtime.hpp" namespace tactile { diff --git a/source/opengl/test/src/opengl_texture_test.cpp b/source/opengl_renderer/test/src/opengl_texture_test.cpp similarity index 87% rename from source/opengl/test/src/opengl_texture_test.cpp rename to source/opengl_renderer/test/src/opengl_texture_test.cpp index 3817700a68..c09feeed59 100644 --- a/source/opengl/test/src/opengl_texture_test.cpp +++ b/source/opengl_renderer/test/src/opengl_texture_test.cpp @@ -1,10 +1,10 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/opengl/opengl_texture.hpp" +#include "tactile/opengl_renderer/opengl_texture.hpp" #include -#include "tactile/opengl/opengl_renderer_plugin.hpp" +#include "tactile/opengl_renderer/opengl_renderer_plugin.hpp" #include "tactile/runtime/runtime.hpp" namespace tactile {