goggles-dev · K1ngst0m · Mar 25, 2026 · Mar 25, 2026
diff --git a/filter-chain b/filter-chain
diff --git a/src/app/application.cpp b/src/app/application.cpp
@@ -6,6 +6,7 @@
 #include <compositor/compositor_server.hpp>
 #include <cstdlib>
 #include <filesystem>
+#include <goggles/profiling.hpp>
 #include <poll.h>
 #include <ranges>
 #include <render/backend/vulkan_backend.hpp>
@@ -21,7 +22,6 @@
 #include <util/drm_fourcc.hpp>
 #include <util/logging.hpp>
 #include <util/paths.hpp>
-#include <util/profiling.hpp>
 #include <utility>
 #include <vector>
 

diff --git a/src/app/application.hpp b/src/app/application.hpp
@@ -3,13 +3,13 @@
 #include <compositor/compositor_server.hpp>
 #include <cstdint>
 #include <filesystem>
+#include <goggles/error.hpp>
 #include <memory>
 #include <optional>
 #include <string>
 #include <sys/types.h>
 #include <unordered_map>
 #include <util/config.hpp>
-#include <util/error.hpp>
 #include <util/external_image.hpp>
 #include <util/paths.hpp>
 

diff --git a/src/app/cli.cpp b/src/app/cli.cpp
@@ -1,7 +1,7 @@
 #include "app/cli.hpp"
 
 #include <CLI/CLI.hpp>
-#include <util/profiling.hpp>
+#include <goggles/profiling.hpp>
 
 namespace goggles::app {
 namespace {

diff --git a/src/app/cli.hpp b/src/app/cli.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "util/error.hpp"
-
 #include <cstdint>
 #include <filesystem>
+#include <goggles/error.hpp>
 #include <optional>
 #include <string>
 #include <vector>

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -11,6 +11,8 @@
 #include <cstring>
 #include <exception>
 #include <filesystem>
+#include <goggles/error.hpp>
+#include <goggles/profiling.hpp>
 #include <optional>
 #include <poll.h>
 #include <spawn.h>
@@ -21,10 +23,8 @@
 #include <thread>
 #include <unistd.h>
 #include <util/config.hpp>
-#include <util/error.hpp>
 #include <util/logging.hpp>
 #include <util/paths.hpp>
-#include <util/profiling.hpp>
 #include <util/unique_fd.hpp>
 #include <vector>
 

diff --git a/src/compositor/compositor_core.cpp b/src/compositor/compositor_core.cpp
@@ -32,8 +32,8 @@ extern "C" {
 #endif
 }
 
+#include <goggles/profiling.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::compositor {
 

diff --git a/src/compositor/compositor_cursor.cpp b/src/compositor/compositor_cursor.cpp
@@ -13,9 +13,9 @@ extern "C" {
 #include <wlr/xcursor.h>
 }
 
+#include <goggles/profiling.hpp>
 #include <util/drm_fourcc.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::compositor {
 

diff --git a/src/compositor/compositor_focus.cpp b/src/compositor/compositor_focus.cpp
@@ -37,8 +37,8 @@ extern "C" {
 #endif
 }
 
+#include <goggles/profiling.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::compositor {
 

diff --git a/src/compositor/compositor_input.cpp b/src/compositor/compositor_input.cpp
@@ -14,8 +14,8 @@ extern "C" {
 #include <xkbcommon/xkbcommon.h>
 }
 
+#include <goggles/profiling.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::compositor {
 

diff --git a/src/compositor/compositor_layer_shell.cpp b/src/compositor/compositor_layer_shell.cpp
@@ -24,8 +24,8 @@ extern "C" {
 #endif
 }
 
+#include <goggles/profiling.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::compositor {
 

diff --git a/src/compositor/compositor_present.cpp b/src/compositor/compositor_present.cpp
@@ -44,10 +44,10 @@ extern "C" {
 #endif
 }
 
+#include <goggles/profiling.hpp>
 #include <util/drm_format.hpp>
 #include <util/drm_fourcc.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::compositor {
 

diff --git a/src/compositor/compositor_server.cpp b/src/compositor/compositor_server.cpp
@@ -1,8 +1,8 @@
 #include "compositor_state.hpp"
 
+#include <goggles/profiling.hpp>
 #include <memory>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::compositor {
 

diff --git a/src/compositor/compositor_server.hpp b/src/compositor/compositor_server.hpp
@@ -2,10 +2,10 @@
 
 #include <SDL3/SDL_events.h>
 #include <cstdint>
+#include <goggles/error.hpp>
 #include <memory>
 #include <optional>
 #include <string>
-#include <util/error.hpp>
 #include <util/external_image.hpp>
 #include <util/runtime_metrics.hpp>
 #include <vector>

diff --git a/src/compositor/compositor_xdg.cpp b/src/compositor/compositor_xdg.cpp
@@ -9,8 +9,8 @@ extern "C" {
 #include <wlr/types/wlr_xdg_shell.h>
 }
 
+#include <goggles/profiling.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::compositor {
 

diff --git a/src/compositor/compositor_xwayland.cpp b/src/compositor/compositor_xwayland.cpp
@@ -21,8 +21,8 @@ extern "C" {
 #endif
 }
 
+#include <goggles/profiling.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::compositor {
 

diff --git a/src/render/backend/external_frame_importer.hpp b/src/render/backend/external_frame_importer.hpp
@@ -3,7 +3,7 @@
 #include "vulkan_context.hpp"
 
 #include <array>
-#include <util/error.hpp>
+#include <goggles/error.hpp>
 #include <util/external_image.hpp>
 #include <vulkan/vulkan.hpp>
 

diff --git a/src/render/backend/filter_chain_controller.cpp b/src/render/backend/filter_chain_controller.cpp
@@ -6,12 +6,12 @@
 #include <cstring>
 #include <filesystem>
 #include <format>
+#include <goggles/profiling.hpp>
 #include <limits>
 #include <string>
 #include <string_view>
 #include <util/job_system.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 #include <vector>
 
 namespace goggles::render::backend_internal {

diff --git a/src/render/backend/render_output.hpp b/src/render/backend/render_output.hpp
@@ -6,7 +6,7 @@
 #include <chrono>
 #include <cstdint>
 #include <filesystem>
-#include <util/error.hpp>
+#include <goggles/error.hpp>
 #include <vector>
 #include <vulkan/vulkan.hpp>
 

diff --git a/src/render/backend/vulkan_backend.cpp b/src/render/backend/vulkan_backend.cpp
@@ -8,8 +8,8 @@
 
 #include <algorithm>
 #include <array>
+#include <goggles/profiling.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::render {
 

diff --git a/src/render/backend/vulkan_debug.cpp b/src/render/backend/vulkan_debug.cpp
@@ -2,8 +2,8 @@
 
 #include <algorithm>
 #include <cstring>
+#include <goggles/profiling.hpp>
 #include <util/logging.hpp>
-#include <util/profiling.hpp>
 
 namespace goggles::render {
 

diff --git a/src/render/backend/vulkan_debug.hpp b/src/render/backend/vulkan_debug.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/error.hpp>
+#include <goggles/error.hpp>
 #include <vulkan/vulkan.hpp>
 
 namespace goggles::render {

diff --git a/src/render/backend/vulkan_error.hpp b/src/render/backend/vulkan_error.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/error.hpp>
+#include <goggles/error.hpp>
 #include <vulkan/vulkan.hpp>
 
 // NOLINTBEGIN(cppcoreguidelines-macro-usage)

diff --git a/src/ui/imgui_layer.cpp b/src/ui/imgui_layer.cpp
@@ -6,12 +6,12 @@
 #include <cmath>
 #include <compositor/compositor_server.hpp>
 #include <filesystem>
+#include <goggles/profiling.hpp>
 #include <imgui.h>
 #include <imgui_impl_sdl3.h>
 #include <imgui_impl_vulkan.h>
 #include <util/logging.hpp>
 #include <util/paths.hpp>
-#include <util/profiling.hpp>
 #include <utility>
 
 namespace goggles::ui {

diff --git a/src/ui/imgui_layer.hpp b/src/ui/imgui_layer.hpp
@@ -3,11 +3,11 @@
 #include <cstdint>
 #include <filesystem>
 #include <functional>
+#include <goggles/error.hpp>
 #include <goggles/filter_chain/filter_controls.hpp>
 #include <map>
 #include <string>
 #include <util/config.hpp>
-#include <util/error.hpp>
 #include <util/runtime_metrics.hpp>
 #include <vector>
 #include <vulkan/vulkan.hpp>

diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
@@ -10,6 +10,7 @@ target_include_directories(goggles_util_logging_obj PRIVATE
 )
 
 target_link_libraries(goggles_util_logging_obj PRIVATE
+    goggles_core
     spdlog::spdlog
 )
 
@@ -30,7 +31,7 @@ target_include_directories(goggles_util PUBLIC
 
 # Link dependencies (provided by Pixi)
 target_link_libraries(goggles_util PUBLIC
-    nonstd::expected-lite
+    goggles_core
     spdlog::spdlog
     toml11::toml11
     BS_thread_pool

diff --git a/src/util/config.cpp b/src/util/config.cpp
@@ -1,7 +1,6 @@
 #include "config.hpp"
 
-#include "profiling.hpp"
-
+#include <goggles/profiling.hpp>
 #include <toml.hpp>
 
 namespace goggles {

diff --git a/src/util/config.hpp b/src/util/config.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "error.hpp"
 #include "scale_mode.hpp"
 
 #include <cstdint>
 #include <filesystem>
+#include <goggles/error.hpp>
 #include <string>
 #include <string_view>
+9 −4		CMakeLists.txt
+6 −0		common/CMakeLists.txt
+4 −18		common/include/goggles/error.hpp
+0 −0		common/include/goggles/profiling.hpp
+1 −1		include/goggles/filter_chain.hpp
+0 −3		include/goggles/filter_chain/result.hpp
+1 −1		src/chain/chain_builder.cpp
+1 −1		src/chain/chain_executor.cpp
+1 −1		src/chain/chain_resources.cpp
+1 −1		src/chain/chain_runtime.cpp
+1 −1		src/chain/chain_runtime.hpp
+1 −1		src/chain/downsample_pass.cpp
+1 −1		src/chain/filter_pass.cpp
+1 −1		src/chain/frame_history.cpp
+1 −1		src/chain/framebuffer.cpp
+1 −1		src/chain/framebuffer.hpp
+1 −1		src/chain/output_pass.cpp
+1 −1		src/chain/preset_parser.cpp
+1 −1		src/chain/preset_parser.hpp
+1 −1		src/chain/vulkan_result.hpp
+1 −1		src/diagnostics/gpu_timestamp_pool.hpp
+1 −1		src/runtime/source_resolver.hpp
+1 −1		src/shader/retroarch_preprocessor.cpp
+1 −1		src/shader/retroarch_preprocessor.hpp
+1 −1		src/shader/shader_runtime.cpp
+1 −1		src/shader/shader_runtime.hpp
+1 −1		src/shader/slang_reflect.cpp
+1 −1		src/shader/slang_reflect.hpp
+1 −1		src/texture/texture_loader.cpp
+1 −1		src/texture/texture_loader.hpp
+1 −1		src/util/logging.hpp
+1 −1		src/util/serializer.hpp
+1 −1		tests/contract/shader_batch_report.hpp
+1 −1		tests/visual/image_compare.hpp
+1 −1		tests/visual/runtime_capture.hpp