cluster ts engine v340 code (#9405)

* cluster ts engine v340 code

* add macro to enable/disable cluster feature

* fix cluster switch bug
This commit is contained in:
DolaMay
2021-09-30 10:16:53 +08:00
committed by GitHub
parent 9a3a897b12
commit a785144943
18 changed files with 357 additions and 138 deletions
+62 -50
View File
@@ -9,9 +9,9 @@ export const effects = [
"shaders": [
{
"name": "billboard|vert:vs_main|tinted-fs:add",
"hash": 1723894312,
"hash": 1225516189,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 51, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 38 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 53, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
},
@@ -84,9 +84,9 @@ export const effects = [
"shaders": [
{
"name": "graphics|vs:vert|fs:frag",
"hash": 3113634185,
"hash": 2610213142,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 46, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 48, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
},
@@ -114,9 +114,9 @@ export const effects = [
"shaders": [
{
"name": "particle-gpu|particle-vs-gpu:gpvs_main|tinted-fs:add",
"hash": 3399671947,
"hash": 1985652451,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 61, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 38 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 63, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
},
@@ -206,9 +206,9 @@ export const effects = [
"shaders": [
{
"name": "particle-trail|particle-trail:vs_main|tinted-fs:add",
"hash": 2460630641,
"hash": 2996796714,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 50, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 38 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 52, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
},
@@ -255,9 +255,9 @@ export const effects = [
"shaders": [
{
"name": "particle|particle-vs-legacy:lpvs_main|tinted-fs:add",
"hash": 3017610583,
"hash": 3024088451,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 50, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 38 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 52, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
},
@@ -307,9 +307,9 @@ export const effects = [
"shaders": [
{
"name": "spine|sprite-vs:vert|sprite-fs:frag",
"hash": 1867464226,
"hash": 2517893167,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 46, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 1 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 48, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 1 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCLocal", "defines": ["USE_LOCAL"] }], "samplerTextures": [{ "name": "cc_spriteTexture", "defines": [] }], "buffers": [], "images": [] }
},
@@ -346,9 +346,9 @@ export const effects = [
"shaders": [
{
"name": "sprite-gpu|sprite-vs-gpu:vert|sprite-fs-gpu:frag",
"hash": 1091715580,
"hash": 2450198964,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 37, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCUILocal", "defines": [] }], "samplerTextures": [{ "name": "cc_spriteTexture", "defines": ["USE_TEXTURE"] }], "buffers": [], "images": [] }
},
@@ -382,9 +382,9 @@ export const effects = [
"shaders": [
{
"name": "sprite|sprite-vs:vert|sprite-fs:frag",
"hash": 1559944983,
"hash": 483203576,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 46, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 1 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 48, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 1 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCLocal", "defines": ["USE_LOCAL"] }], "samplerTextures": [{ "name": "cc_spriteTexture", "defines": ["USE_TEXTURE"] }], "buffers": [], "images": [] }
},
@@ -424,11 +424,11 @@ export const effects = [
"shaders": [
{
"name": "standard|standard-vs|standard-fs",
"hash": 2295676981,
"hash": 537762175,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 220, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 63 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 222, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 65 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_environment", "defines": ["CC_USE_IBL"] }], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }, { "name": "CCLocalBatched", "defines": ["!USE_INSTANCING", "USE_BATCHING"] }, { "name": "CCLocal", "defines": ["!USE_INSTANCING", "!USE_BATCHING"] }, { "name": "CCForwardLight", "defines": ["CC_FORWARD_ADD"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "cc_lightingMap", "defines": ["USE_LIGHTMAP", "!USE_BATCHING", "!CC_FORWARD_ADD"] }], "buffers": [], "images": [] }
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }, { "name": "CCLocalBatched", "defines": ["!USE_INSTANCING", "USE_BATCHING"] }, { "name": "CCLocal", "defines": ["!USE_INSTANCING", "!USE_BATCHING"] }, { "name": "CCForwardLight", "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "cc_lightingMap", "defines": ["USE_LIGHTMAP", "!USE_BATCHING", "!CC_FORWARD_ADD"] }], "buffers": [], "images": [] }
},
"defines": [
{ "name": "CC_USE_MORPH", "type": "boolean" },
@@ -503,7 +503,11 @@ export const effects = [
{ "name": "occlusionMap", "type": 28, "count": 1, "defines": ["USE_OCCLUSION_MAP"], "stageFlags": 16, "binding": 5 },
{ "name": "emissiveMap", "type": 28, "count": 1, "defines": ["USE_EMISSIVE_MAP"], "stageFlags": 16, "binding": 6 }
],
"buffers": [],
"buffers": [
{ "name": "b_ccLightsBuffer", "memoryAccess": 1, "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"], "stageFlags": 16, "binding": 7 },
{ "name": "b_clusterLightIndicesBuffer", "memoryAccess": 1, "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"], "stageFlags": 16, "binding": 8 },
{ "name": "b_clusterLightGridBuffer", "memoryAccess": 1, "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"], "stageFlags": 16, "binding": 9 }
],
"images": [],
"textures": [],
"samplers": [],
@@ -511,9 +515,9 @@ export const effects = [
},
{
"name": "standard|shadow-caster-vs:vert|shadow-caster-fs:frag",
"hash": 1783225275,
"hash": 2817250752,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 183, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 63 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 183, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 65 },
"globals": { "blocks": [{ "name": "CCShadow", "defines": [] }, { "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }, { "name": "CCLocalBatched", "defines": ["!USE_INSTANCING", "USE_BATCHING"] }, { "name": "CCLocal", "defines": ["!USE_INSTANCING", "!USE_BATCHING"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
},
@@ -582,11 +586,11 @@ export const effects = [
"shaders": [
{
"name": "terrain|terrain-vs|terrain-fs",
"hash": 994098192,
"hash": 854125145,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 67, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 58 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 69, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 60 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_environment", "defines": ["CC_USE_IBL"] }], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCLocal", "defines": [] }, { "name": "CCForwardLight", "defines": ["CC_FORWARD_ADD"] }], "samplerTextures": [{ "name": "cc_lightingMap", "defines": ["USE_LIGHTMAP", "!USE_BATCHING", "!CC_FORWARD_ADD"] }], "buffers": [], "images": [] }
"locals": { "blocks": [{ "name": "CCLocal", "defines": [] }, { "name": "CCForwardLight", "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"] }], "samplerTextures": [{ "name": "cc_lightingMap", "defines": ["USE_LIGHTMAP", "!USE_BATCHING", "!CC_FORWARD_ADD"] }], "buffers": [], "images": [] }
},
"defines": [
{ "name": "CC_USE_FOG", "type": "number", "range": [0, 4] },
@@ -630,7 +634,11 @@ export const effects = [
{ "name": "normalMap3", "type": 28, "count": 1, "defines": [], "stageFlags": 16, "binding": 10 },
{ "name": "lightMap", "type": 28, "count": 1, "defines": [], "stageFlags": 16, "binding": 11 }
],
"buffers": [],
"buffers": [
{ "name": "b_ccLightsBuffer", "memoryAccess": 1, "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"], "stageFlags": 16, "binding": 12 },
{ "name": "b_clusterLightIndicesBuffer", "memoryAccess": 1, "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"], "stageFlags": 16, "binding": 13 },
{ "name": "b_clusterLightGridBuffer", "memoryAccess": 1, "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"], "stageFlags": 16, "binding": 14 }
],
"images": [],
"textures": [],
"samplers": [],
@@ -638,9 +646,9 @@ export const effects = [
},
{
"name": "terrain|shadow-caster-vs:vert|shadow-caster-fs:frag",
"hash": 3278422876,
"hash": 809389262,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 65, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 67, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
},
@@ -668,9 +676,9 @@ export const effects = [
"shaders": [
{
"name": "unlit|unlit-vs:vert|unlit-fs:frag",
"hash": 1017648509,
"hash": 916586250,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 195, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 197, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }, { "name": "CCLocalBatched", "defines": ["!USE_INSTANCING", "USE_BATCHING"] }, { "name": "CCLocal", "defines": ["!USE_INSTANCING", "!USE_BATCHING"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
},
@@ -739,9 +747,9 @@ export const effects = [
"shaders": [
{
"name": "bloom|bloom-vs|prefilter-fs",
"hash": 933538815,
"hash": 2372596343,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 145, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 37 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
},
@@ -778,9 +786,9 @@ export const effects = [
},
{
"name": "bloom|bloom-vs|downsample-fs",
"hash": 2920255350,
"hash": 2774644899,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 145, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 38 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
},
@@ -821,9 +829,9 @@ export const effects = [
},
{
"name": "bloom|bloom-vs|upsample-fs",
"hash": 3806761226,
"hash": 3146738086,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 145, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 38 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
},
@@ -864,9 +872,9 @@ export const effects = [
},
{
"name": "bloom|bloom-vs|combine-fs",
"hash": 1688116455,
"hash": 1000071333,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 145, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 37 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
},
@@ -912,11 +920,11 @@ export const effects = [
"shaders": [
{
"name": "deferred-lighting|lighting-vs|lighting-fs",
"hash": 1908170758,
"hash": 4081853987,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 37, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 56 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 58 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_environment", "defines": ["CC_USE_IBL"] }], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCForwardLight", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
"locals": { "blocks": [{ "name": "CCForwardLight", "defines": ["CC_ENABLE_CLUSTERED_LIGHT_CULLING"] }], "samplerTextures": [], "buffers": [], "images": [] }
},
"defines": [
{ "name": "CC_RECEIVE_SHADOW", "type": "boolean" },
@@ -943,7 +951,11 @@ export const effects = [
{ "name": "gbuffer_normalMap", "type": 28, "count": 1, "defines": [], "stageFlags": 16, "binding": 2 },
{ "name": "gbuffer_emissiveMap", "type": 28, "count": 1, "defines": [], "stageFlags": 16, "binding": 3 }
],
"buffers": [],
"buffers": [
{ "name": "b_ccLightsBuffer", "memoryAccess": 1, "defines": ["CC_ENABLE_CLUSTERED_LIGHT_CULLING"], "stageFlags": 16, "binding": 4 },
{ "name": "b_clusterLightIndicesBuffer", "memoryAccess": 1, "defines": ["CC_ENABLE_CLUSTERED_LIGHT_CULLING"], "stageFlags": 16, "binding": 5 },
{ "name": "b_clusterLightGridBuffer", "memoryAccess": 1, "defines": ["CC_ENABLE_CLUSTERED_LIGHT_CULLING"], "stageFlags": 16, "binding": 6 }
],
"images": [],
"textures": [],
"samplers": [],
@@ -959,9 +971,9 @@ export const effects = [
"shaders": [
{
"name": "planar-shadow|planar-shadow-vs:vert|planar-shadow-fs:frag",
"hash": 1115292548,
"hash": 2781161332,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 213, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 56 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 215, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 58 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }, { "name": "CCLocalBatched", "defines": ["!USE_INSTANCING", "USE_BATCHING"] }, { "name": "CCLocal", "defines": ["!USE_INSTANCING", "!USE_BATCHING"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
},
@@ -1012,9 +1024,9 @@ export const effects = [
"shaders": [
{
"name": "post-process|post-process-vs|post-process-fs",
"hash": 2286065615,
"hash": 1541179109,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 145, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 37 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
},
@@ -1060,9 +1072,9 @@ export const effects = [
"shaders": [
{
"name": "skybox|sky-vs:vert|sky-fs:frag",
"hash": 849701109,
"hash": 3341302509,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 37, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 37 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [{ "name": "cc_environment", "defines": [] }], "buffers": [], "images": [] },
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
},
@@ -1095,9 +1107,9 @@ export const effects = [
"shaders": [
{
"name": "profiler|profiler-vs:vert|profiler-fs:frag",
"hash": 4249741501,
"hash": 3709831752,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 58, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 37 },
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 60, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
},
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+7 -3
View File
@@ -33,7 +33,7 @@ import { Model } from '../renderer/scene/model';
import { SubModel } from '../renderer/scene/submodel';
import { Layers } from '../scene-graph/layers';
import { legacyCC } from '../global-exports';
import { BindingMappingInfo, DescriptorType, Type, ShaderStageFlagBit,
import { BindingMappingInfo, DescriptorType, Type, ShaderStageFlagBit, UniformStorageBuffer,
DescriptorSetLayoutBinding, Uniform, UniformBlock, UniformSamplerTexture, UniformStorageImage, Device, Feature, API } from '../gfx';
export const PIPELINE_FLOW_MAIN = 'MainFlow';
@@ -103,7 +103,7 @@ export interface IRenderQueueDesc {
export interface IDescriptorSetLayoutInfo {
bindings: DescriptorSetLayoutBinding[];
layouts: Record<string, UniformBlock | UniformSamplerTexture | UniformStorageImage>;
layouts: Record<string, UniformBlock | UniformSamplerTexture | UniformStorageImage | UniformStorageBuffer>;
}
export const globalDescriptorSetLayout: IDescriptorSetLayoutInfo = { bindings: [], layouts: {} };
@@ -204,7 +204,9 @@ export class UBOCamera {
public static readonly GLOBAL_FOG_COLOR_OFFSET = UBOCamera.AMBIENT_GROUND_OFFSET + 4;
public static readonly GLOBAL_FOG_BASE_OFFSET = UBOCamera.GLOBAL_FOG_COLOR_OFFSET + 4;
public static readonly GLOBAL_FOG_ADD_OFFSET = UBOCamera.GLOBAL_FOG_BASE_OFFSET + 4;
public static readonly COUNT = UBOCamera.GLOBAL_FOG_ADD_OFFSET + 4;
public static readonly NEAR_FAR_OFFSET = UBOCamera.GLOBAL_FOG_ADD_OFFSET + 4;
public static readonly VIEW_PORT_OFFSET = UBOCamera.NEAR_FAR_OFFSET + 4;
public static readonly COUNT = UBOCamera.VIEW_PORT_OFFSET + 4;
public static readonly SIZE = UBOCamera.COUNT * 4;
public static readonly NAME = 'CCCamera';
@@ -227,6 +229,8 @@ export class UBOCamera {
new Uniform('cc_fogColor', Type.FLOAT4, 1),
new Uniform('cc_fogBase', Type.FLOAT4, 1),
new Uniform('cc_fogAdd', Type.FLOAT4, 1),
new Uniform('cc_nearFar', Type.FLOAT4, 1),
new Uniform('cc_viewPort', Type.FLOAT4, 1),
], 1);
}
globalDescriptorSetLayout.layouts[UBOCamera.NAME] = UBOCamera.LAYOUT;
+8
View File
@@ -139,6 +139,14 @@ export class PipelineUBO {
cv[UBOCamera.GLOBAL_FOG_ADD_OFFSET] = fog.fogTop;
cv[UBOCamera.GLOBAL_FOG_ADD_OFFSET + 1] = fog.fogRange;
cv[UBOCamera.GLOBAL_FOG_ADD_OFFSET + 2] = fog.fogAtten;
cv[UBOCamera.NEAR_FAR_OFFSET] = camera.nearClip;
cv[UBOCamera.NEAR_FAR_OFFSET + 1] = camera.farClip;
cv[UBOCamera.VIEW_PORT_OFFSET] = camera.viewport.x;
cv[UBOCamera.VIEW_PORT_OFFSET + 1] = camera.viewport.y;
cv[UBOCamera.VIEW_PORT_OFFSET + 1] = camera.viewport.z;
cv[UBOCamera.VIEW_PORT_OFFSET + 1] = camera.viewport.w;
}
public static updateShadowUBOView (pipeline: RenderPipeline, bufferView: Float32Array, camera: Camera) {
+13 -4
View File
@@ -217,6 +217,14 @@ export abstract class RenderPipeline extends Asset {
return this._profiler;
}
set clusterEnabled (value) {
this._clusterEnabled = value;
}
get clusterEnabled () {
return this._clusterEnabled;
}
set bloomEnable (value) {
this._bloomEnable = value;
}
@@ -239,6 +247,7 @@ export abstract class RenderPipeline extends Asset {
protected _width = 0;
protected _height = 0;
protected _lastUsedRenderArea: Rect = new Rect();
protected _clusterEnabled = false;
protected _bloomEnable = false;
/**
@@ -319,16 +328,15 @@ export abstract class RenderPipeline extends Asset {
this._globalDSManager = new GlobalDSManager(this);
this._descriptorSet = this._globalDSManager.globalDescriptorSet;
this._pipelineUBO.activate(this._device, this);
// update global defines in advance here for deferred pipeline may tryCompile shaders.
this._macros.CC_USE_HDR = this._pipelineSceneData.isHDR;
this._generateConstantMacros();
this._pipelineSceneData.activate(this._device, this);
for (let i = 0; i < this._flows.length; i++) {
this._flows[i].activate(this);
}
// update global defines when all states initialized.
this._macros.CC_USE_HDR = this._pipelineSceneData.isHDR;
this._generateConstantMacros();
return true;
}
@@ -560,6 +568,7 @@ export abstract class RenderPipeline extends Asset {
protected _generateConstantMacros () {
let str = '';
str += `#define CC_DEVICE_SUPPORT_FLOAT_TEXTURE ${this.device.hasFeature(Feature.TEXTURE_FLOAT) ? 1 : 0}\n`;
str += `#define CC_ENABLE_CLUSTERED_LIGHT_CULLING ${this._clusterEnabled ? 1 : 0}\n`;
str += `#define CC_DEVICE_MAX_VERTEX_UNIFORM_VECTORS ${this.device.capabilities.maxVertexUniformVectors}\n`;
str += `#define CC_DEVICE_MAX_FRAGMENT_UNIFORM_VECTORS ${this.device.capabilities.maxFragmentUniformVectors}\n`;
this._constantMacros = str;
+6
View File
@@ -395,6 +395,9 @@ export class Camera {
set nearClip (nearClip) {
this._nearClip = nearClip;
if (JSB) {
this._nativeObj!.nearClip = this._nearClip;
}
this._isProjDirty = true;
}
@@ -404,6 +407,9 @@ export class Camera {
set farClip (farClip) {
this._farClip = farClip;
if (JSB) {
this._nativeObj!.farClip = this._farClip;
}
this._isProjDirty = true;
}
@@ -161,6 +161,8 @@ export type NativeRenderWindow = InstanceType<typeof NativeRenderWindow>;
export const NativeCamera: Constructor<{
width: number;
height: number;
nearClip: number;
farClip: number;
scene: NativeRenderScene | null;
frustum: Frustum;
matView: Mat4;
+6 -1
View File
@@ -41,7 +41,7 @@ import { SpotLight } from './renderer/scene/spot-light';
import { IBatcher } from '../2d/renderer/i-batcher';
import { legacyCC } from './global-exports';
import { RenderWindow, IRenderWindowInfo } from './renderer/core/render-window';
import { ColorAttachment, DepthStencilAttachment, RenderPassInfo, StoreOp, Device, Swapchain } from './gfx';
import { ColorAttachment, DepthStencilAttachment, RenderPassInfo, StoreOp, Device, Swapchain, Feature } from './gfx';
import { warnID } from './platform/debug';
/**
@@ -341,6 +341,11 @@ export class Root {
isCreateDefaultPipeline = true;
}
this._pipeline = rppl;
// now cluster just enabled in deferred pipeline
if (!this._useDeferredPipeline || !this.device.hasFeature(Feature.COMPUTE_SHADER)) {
// disable cluster
this._pipeline.clusterEnabled = false;
}
this._pipeline.bloomEnable = false;
if (!this._pipeline.activate(this._mainWindow!.swapchain)) {
@@ -11,6 +11,7 @@
# define LIGHTS_PER_PASS 10 // indent to avoid effect-compile-time substitution
#endif
#if CC_ENABLE_CLUSTERED_LIGHT_CULLING == 0
#pragma builtin(local)
layout(set = 2, binding = 1) uniform CCForwardLight {
highp vec4 cc_lightPos[LIGHTS_PER_PASS]; // xyz: pos, w: isSpotLight
@@ -18,3 +19,4 @@ layout(set = 2, binding = 1) uniform CCForwardLight {
vec4 cc_lightSizeRangeAngle[LIGHTS_PER_PASS]; // x: size, y: range, z: cos(half outterAngle), w: enable shadow
vec4 cc_lightDir[LIGHTS_PER_PASS]; // xyz: dir, w: valid light count
};
#endif
+2
View File
@@ -27,4 +27,6 @@ layout(set = 0, binding = 1) uniform CCCamera {
mediump vec4 cc_fogColor; // xyzw: global fog color
mediump vec4 cc_fogBase; // xyz: fogStart, fogEnd, fogDensity
mediump vec4 cc_fogAdd; // xyz: fogTop, fogRange, fogAtten
mediump vec4 cc_nearFar; // xy: frustum near, frustum far
mediump vec4 cc_viewPort; // xyzw: camera view port, default(0, 0, 1, 1)
};
+2
View File
@@ -21,6 +21,8 @@
#pragma define CC_DEVICE_MAX_VERTEX_UNIFORM_VECTORS default(1024)
#pragma define CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS default(128)
#pragma define CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS default(128)
// use cluster shading or not
#pragma define CC_ENABLE_CLUSTERED_LIGHT_CULLING default(0)
// When sampling RTs, Y-flip is needed if the screen space sign Y is positive (pointing upwards)
#define CC_HANDLE_RT_SAMPLE_FLIP(uv) uv = cc_cameraPos.w > 1.0 ? vec2(uv.x, 1.0 - uv.y) : uv
#define CC_HANDLE_GET_CLIP_FLIP(uv) uv = cc_cameraPos.w == 0.0 ? vec2(uv.x, -uv.y) : uv
@@ -0,0 +1,143 @@
// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.
#define CLUSTERS_X 16
#define CLUSTERS_Y 8
#define CLUSTERS_Z 24
#define MAX_LIGHTS_PER_CLUSTER 100u
#pragma glBinding(4)
readonly buffer b_ccLightsBuffer { vec4 b_ccLights[]; };
#pragma glBinding(5)
readonly buffer b_clusterLightIndicesBuffer { uint b_clusterLightIndices[]; };
#pragma glBinding(6)
readonly buffer b_clusterLightGridBuffer { uvec4 b_clusterLightGrid[]; };
struct CCLight
{
vec4 cc_lightPos;
vec4 cc_lightColor;
vec4 cc_lightSizeRangeAngle;
vec4 cc_lightDir;
};
struct Cluster
{
vec3 minBounds;
vec3 maxBounds;
};
struct LightGrid
{
uint offset;
uint ccLights;
};
float screen2EyeDepth(float depth, float near, float far)
{
float ndc = 2.0 * depth - 1.0;
float eye = 2.0 * far * near / (far + near + ndc * (near - far));
return eye;
}
CCLight getCCLight(uint i)
{
CCLight light;
light.cc_lightPos = b_ccLights[4u * i + 0u];
light.cc_lightColor = b_ccLights[4u * i + 1u];
light.cc_lightSizeRangeAngle = b_ccLights[4u * i + 2u];
light.cc_lightDir = b_ccLights[4u * i + 3u];
return light;
}
LightGrid getLightGrid(uint cluster)
{
uvec4 gridvec = b_clusterLightGrid[cluster];
LightGrid grid;
grid.offset = gridvec.x;
grid.ccLights = gridvec.y;
return grid;
}
uint getGridLightIndex(uint start, uint offset)
{
return b_clusterLightIndices[start + offset];
}
uint getClusterZIndex(vec4 worldPos)
{
float scale = float(CLUSTERS_Z) / log(cc_nearFar.y / cc_nearFar.x);
float bias = -(float(CLUSTERS_Z) * log(cc_nearFar.x) / log(cc_nearFar.y / cc_nearFar.x));
float eyeDepth = -(cc_matView * worldPos).z;
uint zIndex = uint(max(log(eyeDepth) * scale + bias, 0.0));
return zIndex;
}
uint getClusterIndex(vec4 fragCoord, vec4 worldPos)
{
uint zIndex = getClusterZIndex(worldPos);
float clusterSizeX = ceil(cc_screenSize.x / float(CLUSTERS_X));
float clusterSizeY = ceil(cc_screenSize.y / float(CLUSTERS_Y));
uvec3 indices = uvec3(uvec2(fragCoord.xy / vec2(clusterSizeX, clusterSizeY)), zIndex);
uint cluster = (16u * 8u) * indices.z + 16u * indices.y + indices.x;
return cluster;
}
vec4 CCClusterShadingAdditive (StandardSurface s, vec4 shadowPos) {
// Calculate diffuse & specular
vec3 diffuse = s.albedo.rgb * (1.0 - s.metallic);
vec3 specular = mix(vec3(0.04), s.albedo.rgb, s.metallic);
vec3 diffuseContrib = diffuse / PI;
vec3 N = normalize(s.normal);
vec3 V = normalize(cc_cameraPos.xyz - s.position);
float NV = max(abs(dot(N, V)), 0.001);
specular = BRDFApprox(specular, s.roughness, NV);
vec3 finalColor = vec3(0.0);
uint cluster = getClusterIndex(gl_FragCoord, vec4(s.position, 1.0));
LightGrid grid = getLightGrid(cluster);
uint numLights = grid.ccLights;
for (uint i = 0u; i < MAX_LIGHTS_PER_CLUSTER; i++) {
if (i >= numLights) break;
uint lightIndex = getGridLightIndex(grid.offset, i);
CCLight light = getCCLight(lightIndex);
vec3 SLU = light.cc_lightPos.xyz - s.position;
vec3 SL = normalize(SLU);
vec3 SH = normalize(SL + V);
float SNL = max(dot(N, SL), 0.001);
float SNH = max(dot(N, SH), 0.0);
float distSqr = dot(SLU, SLU);
float litRadius = light.cc_lightSizeRangeAngle.x;
float litRadiusSqr = litRadius * litRadius;
float illum = PI * (litRadiusSqr / max(litRadiusSqr , distSqr));
float attRadiusSqrInv = 1.0 / max(light.cc_lightSizeRangeAngle.y, 0.01);
attRadiusSqrInv *= attRadiusSqrInv;
float att = GetDistAtt(distSqr, attRadiusSqrInv);
vec3 lspec = specular * CalcSpecular(s.roughness, SNH, SH, N);
if (light.cc_lightPos.w > 0.0) {
float cosInner = max(dot(-light.cc_lightDir.xyz, SL), 0.01);
float cosOuter = light.cc_lightSizeRangeAngle.z;
float litAngleScale = 1.0 / max(0.001, cosInner - cosOuter);
float litAngleOffset = -cosOuter * litAngleScale;
att *= GetAngleAtt(SL, -light.cc_lightDir.xyz, litAngleScale, litAngleOffset);
}
vec3 lightColor = light.cc_lightColor.rgb;
float shadow = 1.0;
#if CC_RECEIVE_SHADOW
if (light.cc_lightPos.w > 0.0) {
CC_SPOT_SHADOW_FACTOR_BASE(shadow, shadowPos, s.position, light.cc_lightPos, N);
}
#endif
lightColor *= shadow;
finalColor += SNL * lightColor * light.cc_lightColor.w * illum * att * (diffuseContrib + lspec);
}
return vec4(finalColor, 0.0);
}
@@ -0,0 +1,9 @@
{
"ver": "1.0.0",
"importer": "effect-header",
"imported": true,
"uuid": "b2d386c6-615b-4375-accd-574405611e35",
"files": [],
"subMetas": {},
"userData": {}
}
@@ -2,6 +2,7 @@
#include <lighting>
#if CC_ENABLE_CLUSTERED_LIGHT_CULLING == 0
vec4 CCStandardShadingAdditive (StandardSurface s, vec4 shadowPos) {
// Calculate diffuse & specular
vec3 diffuse = s.albedo.rgb * (1.0 - s.metallic);
@@ -56,3 +57,4 @@ vec4 CCStandardShadingAdditive (StandardSurface s, vec4 shadowPos) {
return vec4(finalColor, 0.0);
}
#endif
@@ -9,12 +9,19 @@
#define CC_STANDARD_SURFACE_ENTRY() \
#if CC_FORWARD_ADD \
#include <shading-standard-additive> \
#if CC_ENABLE_CLUSTERED_LIGHT_CULLING == 1 \
#include <shading-cluster-additive> \
#endif \
\
layout(location = 0) out vec4 fragColorX; \
\
void main () { \
StandardSurface s; surf(s); \
#if CC_ENABLE_CLUSTERED_LIGHT_CULLING == 1 \
vec4 color = CCClusterShadingAdditive(s, CC_SHADOW_POSITION); \
#else \
vec4 color = CCStandardShadingAdditive(s, CC_SHADOW_POSITION); \
#endif \
CC_APPLY_FOG(color); \
fragColorX = CCFragOutput(color); \
} \
@@ -34,6 +34,9 @@ CCProgram lighting-fs %{
#include <cc-global>
#include <shading-standard-base>
#include <shading-standard-additive>
#if CC_ENABLE_CLUSTERED_LIGHT_CULLING == 1
#include <shading-cluster-additive>
#endif
#include <output-standard>
#include <cc-fog-base>
@@ -69,8 +72,11 @@ CCProgram lighting-fs %{
CC_TRANSFER_SHADOW_BASE(vec4(s.position, 1), shadowPos);
vec4 color = CCStandardShadingBase(s, shadowPos) +
#if CC_ENABLE_CLUSTERED_LIGHT_CULLING == 1
CCClusterShadingAdditive(s, shadowPos);
#else
CCStandardShadingAdditive(s, shadowPos);
#endif
CC_APPLY_FOG_BASE(color, fogFactor);
fragColor = CCFragOutput(color);
}