Tweak OpenGL renderer structure

albin-johansson · Jul 9, 2024 · 5dc8f8e · 5dc8f8e
1 parent 60ef604
commit 5dc8f8e
Show file tree

Hide file tree

Showing 21 changed files with 108 additions and 98 deletions.
diff --git 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
diff --git a/source/opengl/test/CMakeLists.txt b/source/opengl/test/CMakeLists.txt
diff --git a/source/opengl_renderer/CMakeLists.txt 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
@@ -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 → ...r/lib/inc/tactile/opengl_renderer/api.hpp b/source/opengl/inc/tactile/opengl/api.hpp → ...r/lib/inc/tactile/opengl_renderer/api.hpp
diff --git a/...pengl/inc/tactile/opengl/opengl_error.hpp → .../tactile/opengl_renderer/opengl_error.hpp b/...pengl/inc/tactile/opengl/opengl_error.hpp → .../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/...pengl/inc/tactile/opengl/opengl_imgui.hpp → .../tactile/opengl_renderer/opengl_imgui.hpp b/...pengl/inc/tactile/opengl/opengl_imgui.hpp → .../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/...gl/inc/tactile/opengl/opengl_renderer.hpp → ...ctile/opengl_renderer/opengl_renderer.hpp b/...gl/inc/tactile/opengl/opengl_renderer.hpp → ...ctile/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/...tactile/opengl/opengl_renderer_plugin.hpp → ...pengl_renderer/opengl_renderer_plugin.hpp b/...tactile/opengl/opengl_renderer_plugin.hpp → ...pengl_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/...ngl/inc/tactile/opengl/opengl_texture.hpp → ...actile/opengl_renderer/opengl_texture.hpp b/...ngl/inc/tactile/opengl/opengl_texture.hpp → ...actile/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/...pengl/src/tactile/opengl/opengl_error.cpp → .../tactile/opengl_renderer/opengl_error.cpp b/...pengl/src/tactile/opengl/opengl_error.cpp → .../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 <glad/glad.h>
 

diff --git a/...pengl/src/tactile/opengl/opengl_imgui.cpp → .../tactile/opengl_renderer/opengl_imgui.cpp b/...pengl/src/tactile/opengl/opengl_imgui.cpp → .../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 <utility>  // exchange
 
 #include <imgui_impl_opengl3.h>
 #include <imgui_impl_sdl2.h>
 
-#include "tactile/opengl/opengl_error.hpp"
+#include "tactile/opengl_renderer/opengl_error.hpp"
 
 namespace tactile {
 

diff --git a/...gl/src/tactile/opengl/opengl_renderer.cpp → ...ctile/opengl_renderer/opengl_renderer.cpp b/...gl/src/tactile/opengl/opengl_renderer.cpp → ...ctile/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 <cstdlib>  // malloc, free
 #include <list>     // 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/...tactile/opengl/opengl_renderer_plugin.cpp → ...pengl_renderer/opengl_renderer_plugin.cpp b/...tactile/opengl/opengl_renderer_plugin.cpp → ...pengl_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 <new>  // nothrow
 

diff --git a/...ngl/src/tactile/opengl/opengl_texture.cpp → ...actile/opengl_renderer/opengl_texture.cpp b/...ngl/src/tactile/opengl/opengl_texture.cpp → ...actile/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 <glad/glad.h>
 #include <stb_image.h>
 
-#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
@@ -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 → source/opengl_renderer/test/src/main.cpp b/source/opengl/test/src/main.cpp → source/opengl_renderer/test/src/main.cpp
diff --git a/source/opengl/test/src/opengl_error_test.cpp → ...l_renderer/test/src/opengl_error_test.cpp b/source/opengl/test/src/opengl_error_test.cpp → ...l_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 <utility>  // 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/.../opengl/test/src/opengl_renderer_test.cpp → ...enderer/test/src/opengl_renderer_test.cpp b/.../opengl/test/src/opengl_renderer_test.cpp → ...enderer/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 <gtest/gtest.h>
 
-#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/...e/opengl/test/src/opengl_texture_test.cpp → ...renderer/test/src/opengl_texture_test.cpp b/...e/opengl/test/src/opengl_texture_test.cpp → ...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 <gtest/gtest.h>
 
-#include "tactile/opengl/opengl_renderer_plugin.hpp"
+#include "tactile/opengl_renderer/opengl_renderer_plugin.hpp"
 #include "tactile/runtime/runtime.hpp"
 
 namespace tactile {