Skip to content

Commit 98612f6

Browse files
authored
fix(πŸ”ƒ): fix dependency cycles in header files (#257)
1 parent d610488 commit 98612f6

6 files changed

Lines changed: 78 additions & 68 deletions

File tree

β€Žpackages/webgpu/cpp/jsi/RNFHybridObject.hβ€Ž

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#pragma once
66

7-
#include "RNFJSIConverter.h"
87
#include "WGPULogger.h"
98
#include "RNFWorkletRuntimeRegistry.h"
109
#include <functional>
@@ -17,6 +16,15 @@
1716
#include <utility>
1817
#include <string>
1918

19+
// Forward declare to avoid circular dependency
20+
namespace margelo {
21+
template <typename ArgType, typename SFINAE = void>
22+
struct JSIConverter;
23+
}
24+
25+
// Include the converter - this must come after forward declaration
26+
#include "RNFJSIConverter.h"
27+
2028
namespace margelo {
2129

2230
namespace jsi = facebook::jsi;

β€Žpackages/webgpu/cpp/jsi/RNFJSIConverter.hβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@
2020
#include <jsi/jsi.h>
2121

2222
#include "RNFEnumMapper.h"
23-
#include "RNFHybridObject.h"
2423
#include "RNFJSIHelper.h"
2524
#include "RNFPromise.h"
2625
#include "RNFWorkletRuntimeRegistry.h"
2726

2827
#include "Dispatcher.h"
2928
#include "ThreadPool.h"
3029

30+
#include "Unions.h"
31+
3132
// This number is the maximum integer that can be represented exactly as a double
3233
#define MAX_SAFE_INTEGER static_cast<uint64_t>(9007199254740991)
3334

β€Žpackages/webgpu/cpp/rnwgpu/api/Convertors.hβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
#include "GPUVertexAttribute.h"
6161
#include "GPUVertexBufferLayout.h"
6262
#include "GPUVertexState.h"
63+
#include "Unions.h"
6364

6465
namespace rnwgpu {
6566

β€Žpackages/webgpu/cpp/rnwgpu/api/GPUError.hβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

33
#include <memory>
4-
#include <utility>
54
#include <string>
5+
#include <utility>
66

77
#include "webgpu/webgpu_cpp.h"
88

β€Žpackages/webgpu/cpp/rnwgpu/api/GPURenderPassEncoder.cppβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <string>
33
#include <vector>
44

5-
#include "GPURenderPassEncoder.h"
65
#include "Convertors.h"
6+
#include "GPURenderPassEncoder.h"
77

88
namespace rnwgpu {
99

0 commit comments

Comments
Β (0)