File tree 6 files changed +19
-19
lines changed
servers/rendering/renderer_rd
6 files changed +19
-19
lines changed Original file line number Diff line number Diff line change 35
35
36
36
struct HashMapData {
37
37
union {
38
+ uint64_t data;
38
39
struct
39
40
{
40
41
uint32_t hash;
41
42
uint32_t hash_to_key;
42
43
};
43
- uint64_t data;
44
44
};
45
45
};
46
46
Original file line number Diff line number Diff line change @@ -250,6 +250,10 @@ class RasterizerSceneGLES3 : public RendererSceneRender {
250
250
};
251
251
252
252
union {
253
+ struct {
254
+ uint64_t sort_key1;
255
+ uint64_t sort_key2;
256
+ };
253
257
struct {
254
258
uint64_t lod_index : 8 ;
255
259
uint64_t surface_index : 8 ;
@@ -265,10 +269,6 @@ class RasterizerSceneGLES3 : public RendererSceneRender {
265
269
uint64_t depth_layer : 4 ;
266
270
uint64_t priority : 8 ;
267
271
};
268
- struct {
269
- uint64_t sort_key1;
270
- uint64_t sort_key2;
271
- };
272
272
} sort;
273
273
274
274
RS::PrimitiveType primitive = RS::PRIMITIVE_MAX;
Original file line number Diff line number Diff line change @@ -72,13 +72,13 @@ class Voxelizer {
72
72
73
73
struct CellSort {
74
74
union {
75
+ uint64_t key = 0 ;
75
76
struct {
76
77
uint64_t z : 16 ;
77
78
uint64_t y : 16 ;
78
79
uint64_t x : 16 ;
79
80
uint64_t level : 16 ;
80
81
};
81
- uint64_t key = 0 ;
82
82
};
83
83
84
84
int32_t index = 0 ;
Original file line number Diff line number Diff line change @@ -150,11 +150,11 @@ class GraphEdit : public Control {
150
150
private:
151
151
struct ConnectionType {
152
152
union {
153
+ uint64_t key = 0 ;
153
154
struct {
154
155
uint32_t type_a;
155
156
uint32_t type_b;
156
157
};
157
- uint64_t key = 0 ;
158
158
};
159
159
160
160
static uint32_t hash (const ConnectionType &p_conn) {
Original file line number Diff line number Diff line change @@ -428,6 +428,10 @@ class RenderForwardClustered : public RendererSceneRenderRD {
428
428
};
429
429
430
430
union {
431
+ struct {
432
+ uint64_t sort_key1;
433
+ uint64_t sort_key2;
434
+ };
431
435
struct {
432
436
uint64_t lod_index : 8 ;
433
437
uint64_t surface_index : 8 ;
@@ -443,10 +447,6 @@ class RenderForwardClustered : public RendererSceneRenderRD {
443
447
uint64_t depth_layer : 4 ;
444
448
uint64_t priority : 8 ;
445
449
};
446
- struct {
447
- uint64_t sort_key1;
448
- uint64_t sort_key2;
449
- };
450
450
} sort;
451
451
452
452
RS::PrimitiveType primitive = RS::PRIMITIVE_MAX;
@@ -541,6 +541,8 @@ class RenderForwardClustered : public RendererSceneRenderRD {
541
541
542
542
struct GlobalPipelineData {
543
543
union {
544
+ uint32_t key;
545
+
544
546
struct {
545
547
uint32_t texture_samples : 3 ;
546
548
uint32_t use_reflection_probes : 1 ;
@@ -556,8 +558,6 @@ class RenderForwardClustered : public RendererSceneRenderRD {
556
558
uint32_t use_shadow_cubemaps : 1 ;
557
559
uint32_t use_shadow_dual_paraboloid : 1 ;
558
560
};
559
-
560
- uint32_t key;
561
561
};
562
562
};
563
563
Original file line number Diff line number Diff line change @@ -397,6 +397,10 @@ class RenderForwardMobile : public RendererSceneRenderRD {
397
397
};
398
398
399
399
union {
400
+ struct {
401
+ uint64_t sort_key1;
402
+ uint64_t sort_key2;
403
+ };
400
404
struct {
401
405
// !BAS! CHECK BITS!!!
402
406
@@ -413,10 +417,6 @@ class RenderForwardMobile : public RendererSceneRenderRD {
413
417
// uint64_t lod_index : 8; // no need to sort on LOD
414
418
// uint64_t uses_forward_gi : 1; // no GI here, remove
415
419
};
416
- struct {
417
- uint64_t sort_key1;
418
- uint64_t sort_key2;
419
- };
420
420
} sort;
421
421
422
422
RS::PrimitiveType primitive = RS::PRIMITIVE_MAX;
@@ -575,6 +575,8 @@ class RenderForwardMobile : public RendererSceneRenderRD {
575
575
576
576
struct GlobalPipelineData {
577
577
union {
578
+ uint32_t key;
579
+
578
580
struct {
579
581
uint32_t texture_samples : 3 ;
580
582
uint32_t target_samples : 3 ;
@@ -586,8 +588,6 @@ class RenderForwardMobile : public RendererSceneRenderRD {
586
588
uint32_t use_shadow_cubemaps : 1 ;
587
589
uint32_t use_shadow_dual_paraboloid : 1 ;
588
590
};
589
-
590
- uint32_t key;
591
591
};
592
592
};
593
593
You can’t perform that action at this time.
0 commit comments