Skip to content

Commit ed5f269

Browse files
authored
Merge pull request #398 from asus4/gpu-buffer-bind
Up-to-date binding GL SSBO
2 parents b0ed596 + 98cbdce commit ed5f269

21 files changed

Lines changed: 397 additions & 231 deletions

Assets/Samples/GpuBind/GpuBind.unity

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.3708625, g: 0.37838694, b: 0.35726872, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
@@ -105,7 +104,7 @@ NavMeshSettings:
105104
serializedVersion: 2
106105
m_ObjectHideFlags: 0
107106
m_BuildSettings:
108-
serializedVersion: 2
107+
serializedVersion: 3
109108
agentTypeID: 0
110109
agentRadius: 0.5
111110
agentHeight: 2
@@ -118,7 +117,7 @@ NavMeshSettings:
118117
cellSize: 0.16666667
119118
manualTileSize: 0
120119
tileSize: 256
121-
accuratePlacement: 0
120+
buildHeightMesh: 0
122121
maxJobWorkers: 0
123122
preserveTilesOutsideBounds: 0
124123
debug:
@@ -164,9 +163,17 @@ Camera:
164163
m_projectionMatrixMode: 1
165164
m_GateFitMode: 2
166165
m_FOVAxisMode: 0
166+
m_Iso: 200
167+
m_ShutterSpeed: 0.005
168+
m_Aperture: 16
169+
m_FocusDistance: 10
170+
m_FocalLength: 50
171+
m_BladeCount: 5
172+
m_Curvature: {x: 2, y: 11}
173+
m_BarrelClipping: 0.25
174+
m_Anamorphism: 0
167175
m_SensorSize: {x: 36, y: 24}
168176
m_LensShift: {x: 0, y: 0}
169-
m_FocalLength: 50
170177
m_NormalizedViewPortRect:
171178
serializedVersion: 2
172179
x: 0
@@ -200,18 +207,20 @@ Transform:
200207
m_PrefabInstance: {fileID: 0}
201208
m_PrefabAsset: {fileID: 0}
202209
m_GameObject: {fileID: 32141214}
210+
serializedVersion: 2
203211
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
204212
m_LocalPosition: {x: 0, y: 1, z: -10}
205213
m_LocalScale: {x: 1, y: 1, z: 1}
214+
m_ConstrainProportionsScale: 0
206215
m_Children: []
207216
m_Father: {fileID: 0}
208-
m_RootOrder: 0
209217
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
210218
--- !u!1001 &742027866
211219
PrefabInstance:
212220
m_ObjectHideFlags: 0
213221
serializedVersion: 2
214222
m_Modification:
223+
serializedVersion: 3
215224
m_TransformParent: {fileID: 813037941}
216225
m_Modifications:
217226
- target: {fileID: 7719925103924872094, guid: c3ad31ccc59b04ac782aaabae2b9706b,
@@ -325,6 +334,9 @@ PrefabInstance:
325334
value: BackToIndexButton
326335
objectReference: {fileID: 0}
327336
m_RemovedComponents: []
337+
m_RemovedGameObjects: []
338+
m_AddedGameObjects: []
339+
m_AddedComponents: []
328340
m_SourcePrefab: {fileID: 100100000, guid: c3ad31ccc59b04ac782aaabae2b9706b, type: 3}
329341
--- !u!224 &742027867 stripped
330342
RectTransform:
@@ -408,7 +420,9 @@ Canvas:
408420
m_OverrideSorting: 0
409421
m_OverridePixelPerfect: 0
410422
m_SortingBucketNormalizedSize: 0
423+
m_VertexColorAlwaysGammaSpace: 0
411424
m_AdditionalShaderChannelsFlag: 0
425+
m_UpdateRectTransformForStandalone: 0
412426
m_SortingLayerID: 0
413427
m_SortingOrder: 0
414428
m_TargetDisplay: 0
@@ -422,12 +436,12 @@ RectTransform:
422436
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
423437
m_LocalPosition: {x: 0, y: 0, z: 0}
424438
m_LocalScale: {x: 0, y: 0, z: 0}
439+
m_ConstrainProportionsScale: 0
425440
m_Children:
426441
- {fileID: 1821163630}
427442
- {fileID: 1012275771}
428443
- {fileID: 742027867}
429444
m_Father: {fileID: 0}
430-
m_RootOrder: 1
431445
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
432446
m_AnchorMin: {x: 0, y: 0}
433447
m_AnchorMax: {x: 0, y: 0}
@@ -462,9 +476,9 @@ RectTransform:
462476
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
463477
m_LocalPosition: {x: 0, y: 0, z: 0}
464478
m_LocalScale: {x: 1, y: 1, z: 1}
479+
m_ConstrainProportionsScale: 0
465480
m_Children: []
466481
m_Father: {fileID: 813037941}
467-
m_RootOrder: 1
468482
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
469483
m_AnchorMin: {x: 0, y: 0}
470484
m_AnchorMax: {x: 0, y: 0}
@@ -543,6 +557,7 @@ MonoBehaviour:
543557
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
544558
m_Name:
545559
m_EditorClassIdentifier:
560+
m_SendPointerHoverToParent: 1
546561
m_HorizontalAxis: Horizontal
547562
m_VerticalAxis: Vertical
548563
m_SubmitButton: Submit
@@ -572,12 +587,13 @@ Transform:
572587
m_PrefabInstance: {fileID: 0}
573588
m_PrefabAsset: {fileID: 0}
574589
m_GameObject: {fileID: 1408557770}
590+
serializedVersion: 2
575591
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
576592
m_LocalPosition: {x: 0, y: 0, z: 0}
577593
m_LocalScale: {x: 1, y: 1, z: 1}
594+
m_ConstrainProportionsScale: 0
578595
m_Children: []
579596
m_Father: {fileID: 0}
580-
m_RootOrder: 2
581597
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
582598
--- !u!1 &1453601105
583599
GameObject:
@@ -603,12 +619,13 @@ Transform:
603619
m_PrefabInstance: {fileID: 0}
604620
m_PrefabAsset: {fileID: 0}
605621
m_GameObject: {fileID: 1453601105}
622+
serializedVersion: 2
606623
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
607624
m_LocalPosition: {x: 0, y: 0, z: 0}
608625
m_LocalScale: {x: 1, y: 1, z: 1}
626+
m_ConstrainProportionsScale: 0
609627
m_Children: []
610628
m_Father: {fileID: 0}
611-
m_RootOrder: 3
612629
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
613630
--- !u!114 &1453601108
614631
MonoBehaviour:
@@ -627,14 +644,8 @@ MonoBehaviour:
627644
outputImage: {fileID: 1821163632}
628645
infoLabel: {fileID: 1012275772}
629646
useBinding: 1
630-
computePreProcessNormal: {fileID: 7200000, guid: 465f85c9166ae4978ab4e22be7da3cac,
631-
type: 3}
632-
computePreProcessPadded: {fileID: 7200000, guid: 8d44d118e32f3468eab8511ad1baf017,
633-
type: 3}
634-
computePostProcessNormal: {fileID: 7200000, guid: 7caf47e738c50420faa9d0d839d98a1a,
635-
type: 3}
636-
computePostProcessPadded: {fileID: 7200000, guid: 026a7589dce2b48f8b5971a1fb1a48c9,
637-
type: 3}
647+
computePreProcess: {fileID: 7200000, guid: c547560e013cf4154ba1f63ec076618d, type: 3}
648+
computePostProcess: {fileID: 7200000, guid: 32e4234c9e6eb47f397a963c39b35963, type: 3}
638649
--- !u!1 &1821163629
639650
GameObject:
640651
m_ObjectHideFlags: 0
@@ -664,9 +675,9 @@ RectTransform:
664675
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
665676
m_LocalPosition: {x: 0, y: 0, z: 0}
666677
m_LocalScale: {x: 1, y: 1, z: 1}
678+
m_ConstrainProportionsScale: 0
667679
m_Children: []
668680
m_Father: {fileID: 813037941}
669-
m_RootOrder: 0
670681
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
671682
m_AnchorMin: {x: 0, y: 0}
672683
m_AnchorMax: {x: 0, y: 0}
@@ -722,3 +733,11 @@ CanvasRenderer:
722733
m_PrefabAsset: {fileID: 0}
723734
m_GameObject: {fileID: 1821163629}
724735
m_CullTransparentMesh: 0
736+
--- !u!1660057539 &9223372036854775807
737+
SceneRoots:
738+
m_ObjectHideFlags: 0
739+
m_Roots:
740+
- {fileID: 32141217}
741+
- {fileID: 813037941}
742+
- {fileID: 1408557773}
743+
- {fileID: 1453601107}

0 commit comments

Comments
 (0)