Skip to content

Commit 2d3bdca

Browse files
committed
Merge pull request #105470 from clayjohn/RID-owner-limit
Increase chunk limit for known problematic RID_Owners.
2 parents 1bf9d8e + 941ad15 commit 2d3bdca

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

modules/godot_physics_2d/godot_physics_server_2d.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class GodotPhysicsServer2D : public PhysicsServer2D {
6060
mutable RID_PtrOwner<GodotShape2D, true> shape_owner;
6161
mutable RID_PtrOwner<GodotSpace2D, true> space_owner;
6262
mutable RID_PtrOwner<GodotArea2D, true> area_owner;
63-
mutable RID_PtrOwner<GodotBody2D, true> body_owner;
63+
mutable RID_PtrOwner<GodotBody2D, true> body_owner{ 65536, 1048576 };
6464
mutable RID_PtrOwner<GodotJoint2D, true> joint_owner;
6565

6666
static GodotPhysicsServer2D *godot_singleton;

modules/godot_physics_3d/godot_physics_server_3d.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class GodotPhysicsServer3D : public PhysicsServer3D {
5858
mutable RID_PtrOwner<GodotShape3D, true> shape_owner;
5959
mutable RID_PtrOwner<GodotSpace3D, true> space_owner;
6060
mutable RID_PtrOwner<GodotArea3D, true> area_owner;
61-
mutable RID_PtrOwner<GodotBody3D, true> body_owner;
61+
mutable RID_PtrOwner<GodotBody3D, true> body_owner{ 65536, 1048576 };
6262
mutable RID_PtrOwner<GodotSoftBody3D, true> soft_body_owner;
6363
mutable RID_PtrOwner<GodotJoint3D, true> joint_owner;
6464

modules/jolt_physics/jolt_physics_server_3d.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class JoltPhysicsServer3D final : public PhysicsServer3D {
4848

4949
mutable RID_PtrOwner<JoltSpace3D, true> space_owner;
5050
mutable RID_PtrOwner<JoltArea3D, true> area_owner;
51-
mutable RID_PtrOwner<JoltBody3D, true> body_owner;
51+
mutable RID_PtrOwner<JoltBody3D, true> body_owner{ 65536, 1048576 };
5252
mutable RID_PtrOwner<JoltSoftBody3D, true> soft_body_owner;
5353
mutable RID_PtrOwner<JoltShape3D, true> shape_owner;
5454
mutable RID_PtrOwner<JoltJoint3D, true> joint_owner;

servers/rendering/renderer_canvas_cull.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class RendererCanvasCull {
184184
};
185185

186186
mutable RID_Owner<Canvas, true> canvas_owner;
187-
RID_Owner<Item, true> canvas_item_owner;
187+
RID_Owner<Item, true> canvas_item_owner{ 65536, 4194304 };
188188
RID_Owner<RendererCanvasRender::Light, true> canvas_light_owner;
189189

190190
template <typename T>

servers/rendering/renderer_scene_cull.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ class RendererSceneCull : public RenderingMethod {
10311031

10321032
uint32_t thread_cull_threshold = 200;
10331033

1034-
mutable RID_Owner<Instance, true> instance_owner;
1034+
mutable RID_Owner<Instance, true> instance_owner{ 65536, 4194304 };
10351035

10361036
uint32_t geometry_instance_pair_mask = 0; // used in traditional forward, unnecessary on clustered
10371037

0 commit comments

Comments
 (0)