Skip to content

fix(🔃): fix dependency cycles in header files #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wcandillon merged 3 commits into from
Sep 11, 2025
Merged

fix(🔃): fix dependency cycles in header files #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02e510a
:wrench:
wcandillon Sep 11, 2025
1c89849
:wrench:
wcandillon Sep 11, 2025
5305423
Apply suggestion from @Copilot
wcandillon Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion packages/webgpu/cpp/jsi/RNFHybridObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#pragma once

#include "RNFJSIConverter.h"
#include "WGPULogger.h"
#include "RNFWorkletRuntimeRegistry.h"
#include <functional>
Expand All @@ -17,6 +16,15 @@
#include <utility>
#include <string>

// Forward declare to avoid circular dependency
namespace margelo {
template <typename ArgType, typename SFINAE = void>
struct JSIConverter;
}

// Include the converter - this must come after forward declaration
#include "RNFJSIConverter.h"

namespace margelo {

namespace jsi = facebook::jsi;
Expand Down
3 changes: 2 additions & 1 deletion packages/webgpu/cpp/jsi/RNFJSIConverter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@
#include <jsi/jsi.h>

#include "RNFEnumMapper.h"
#include "RNFHybridObject.h"
#include "RNFJSIHelper.h"
#include "RNFPromise.h"
#include "RNFWorkletRuntimeRegistry.h"

#include "Dispatcher.h"
#include "ThreadPool.h"

#include "Unions.h"

// This number is the maximum integer that can be represented exactly as a double
#define MAX_SAFE_INTEGER static_cast<uint64_t>(9007199254740991)

Expand Down
1 change: 1 addition & 0 deletions packages/webgpu/cpp/rnwgpu/api/Convertors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
#include "GPUVertexAttribute.h"
#include "GPUVertexBufferLayout.h"
#include "GPUVertexState.h"
#include "Unions.h"

namespace rnwgpu {

Expand Down
2 changes: 1 addition & 1 deletion packages/webgpu/cpp/rnwgpu/api/GPUError.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include <memory>
#include <utility>
#include <string>
#include <utility>

#include "webgpu/webgpu_cpp.h"

Expand Down
2 changes: 1 addition & 1 deletion packages/webgpu/cpp/rnwgpu/api/GPURenderPassEncoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#include <string>
#include <vector>

#include "GPURenderPassEncoder.h"
#include "Convertors.h"
#include "GPURenderPassEncoder.h"

namespace rnwgpu {

Expand Down
Loading
Loading