Skip to content

Commit 521fc2d

Browse files
aaronfrankeaaronfranke
authored
Merge pull request #735 from voylin/2DScreenSpaceShaders4.0Update
Screen Space Shader Update to 4.0
2 parents 7349ccc + 3657f91 commit 521fc2d

11 files changed

+204
-228
lines changed

‎2d/screen_space_shaders/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Many common full-res effects are implemented here for reference.
55

66
Language: [GDSL](https://docs.godotengine.org/en/latest/tutorials/shaders/shader_reference/shading_language.html) and GDScript
77

8-
Renderer: GLES 3 (the blur effect is not available in GLES 2, the rest work)
8+
Renderer: Vulkan Clustered
99

1010
Check out this demo on the asset library: https://godotengine.org/asset-library/asset/122
1111

‎2d/screen_space_shaders/art/burano.jpg.import

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
[remap]
22

33
importer="texture"
4-
type="StreamTexture2D"
5-
path="res://.godot/imported/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.stex"
4+
type="CompressedTexture2D"
5+
uid="uid://bxfl16c7nqg0t"
6+
path="res://.godot/imported/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.ctex"
67
metadata={
78
"vram_texture": false
89
}
910

1011
[deps]
1112

1213
source_file="res://art/burano.jpg"
13-
dest_files=["res://.godot/imported/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.stex"]
14+
dest_files=["res://.godot/imported/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.ctex"]
1415

1516
[params]
1617

1718
compress/mode=0
1819
compress/lossy_quality=0.7
19-
compress/hdr_mode=0
20+
compress/hdr_compression=1
2021
compress/bptc_ldr=0
2122
compress/normal_map=0
22-
flags/repeat=0
23-
flags/filter=true
24-
flags/mipmaps=false
25-
flags/anisotropic=false
26-
flags/srgb=2
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
2728
process/fix_alpha_border=true
2829
process/premult_alpha=false
29-
process/HDR_as_SRGB=false
30-
process/invert_color=false
3130
process/normal_map_invert_y=false
32-
stream=false
33-
size_limit=0
34-
detect_3d=true
35-
svg/scale=1.0
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

‎2d/screen_space_shaders/art/filmgrain.png.import

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[remap]
22

33
importer="texture"
4-
type="StreamTexture2D"
5-
path.s3tc="res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.stex"
6-
path.etc2="res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.stex"
4+
type="CompressedTexture2D"
5+
uid="uid://c5jxxypesp0k5"
6+
path.s3tc="res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.ctex"
7+
path.etc2="res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.ctex"
78
metadata={
89
"imported_formats": ["s3tc", "etc2"],
910
"vram_texture": true
@@ -12,26 +13,24 @@ metadata={
1213
[deps]
1314

1415
source_file="res://art/filmgrain.png"
15-
dest_files=["res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.stex", "res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.stex"]
16+
dest_files=["res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.ctex", "res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.ctex"]
1617

1718
[params]
1819

1920
compress/mode=2
2021
compress/lossy_quality=0.7
21-
compress/hdr_mode=0
22+
compress/hdr_compression=1
2223
compress/bptc_ldr=0
2324
compress/normal_map=0
24-
flags/repeat=true
25-
flags/filter=true
26-
flags/mipmaps=true
27-
flags/anisotropic=false
28-
flags/srgb=2
25+
compress/channel_pack=0
26+
mipmaps/generate=true
27+
mipmaps/limit=-1
28+
roughness/mode=0
29+
roughness/src_normal=""
2930
process/fix_alpha_border=true
3031
process/premult_alpha=false
31-
process/HDR_as_SRGB=false
32-
process/invert_color=false
3332
process/normal_map_invert_y=false
34-
stream=false
35-
size_limit=0
36-
detect_3d=false
37-
svg/scale=1.0
33+
process/hdr_as_srgb=false
34+
process/hdr_clamp_exposure=false
35+
process/size_limit=0
36+
detect_3d/compress_to=0

‎2d/screen_space_shaders/art/forest.jpg.import

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
[remap]
22

33
importer="texture"
4-
type="StreamTexture2D"
5-
path="res://.godot/imported/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.stex"
4+
type="CompressedTexture2D"
5+
uid="uid://dmposqqlg6e2m"
6+
path="res://.godot/imported/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.ctex"
67
metadata={
78
"vram_texture": false
89
}
910

1011
[deps]
1112

1213
source_file="res://art/forest.jpg"
13-
dest_files=["res://.godot/imported/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.stex"]
14+
dest_files=["res://.godot/imported/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.ctex"]
1415

1516
[params]
1617

1718
compress/mode=0
1819
compress/lossy_quality=0.7
19-
compress/hdr_mode=0
20+
compress/hdr_compression=1
2021
compress/bptc_ldr=0
2122
compress/normal_map=0
22-
flags/repeat=0
23-
flags/filter=true
24-
flags/mipmaps=false
25-
flags/anisotropic=false
26-
flags/srgb=2
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
2728
process/fix_alpha_border=true
2829
process/premult_alpha=false
29-
process/HDR_as_SRGB=false
30-
process/invert_color=false
3130
process/normal_map_invert_y=false
32-
stream=false
33-
size_limit=0
34-
detect_3d=true
35-
svg/scale=1.0
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

‎2d/screen_space_shaders/art/mountains.jpg.import

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
[remap]
22

33
importer="texture"
4-
type="StreamTexture2D"
5-
path="res://.godot/imported/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.stex"
4+
type="CompressedTexture2D"
5+
uid="uid://bj5ysvx4sbbw0"
6+
path="res://.godot/imported/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.ctex"
67
metadata={
78
"vram_texture": false
89
}
910

1011
[deps]
1112

1213
source_file="res://art/mountains.jpg"
13-
dest_files=["res://.godot/imported/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.stex"]
14+
dest_files=["res://.godot/imported/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.ctex"]
1415

1516
[params]
1617

1718
compress/mode=0
1819
compress/lossy_quality=0.7
19-
compress/hdr_mode=0
20+
compress/hdr_compression=1
2021
compress/bptc_ldr=0
2122
compress/normal_map=0
22-
flags/repeat=0
23-
flags/filter=true
24-
flags/mipmaps=false
25-
flags/anisotropic=false
26-
flags/srgb=2
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
2728
process/fix_alpha_border=true
2829
process/premult_alpha=false
29-
process/HDR_as_SRGB=false
30-
process/invert_color=false
3130
process/normal_map_invert_y=false
32-
stream=false
33-
size_limit=0
34-
detect_3d=true
35-
svg/scale=1.0
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

‎2d/screen_space_shaders/art/platformer.jpg.import

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
[remap]
22

33
importer="texture"
4-
type="StreamTexture2D"
5-
path="res://.godot/imported/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.stex"
4+
type="CompressedTexture2D"
5+
uid="uid://cjycbveqawf6o"
6+
path="res://.godot/imported/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.ctex"
67
metadata={
78
"vram_texture": false
89
}
910

1011
[deps]
1112

1213
source_file="res://art/platformer.jpg"
13-
dest_files=["res://.godot/imported/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.stex"]
14+
dest_files=["res://.godot/imported/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.ctex"]
1415

1516
[params]
1617

1718
compress/mode=0
1819
compress/lossy_quality=0.7
19-
compress/hdr_mode=0
20+
compress/hdr_compression=1
2021
compress/bptc_ldr=0
2122
compress/normal_map=0
22-
flags/repeat=0
23-
flags/filter=true
24-
flags/mipmaps=false
25-
flags/anisotropic=false
26-
flags/srgb=2
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
2728
process/fix_alpha_border=true
2829
process/premult_alpha=false
29-
process/HDR_as_SRGB=false
30-
process/invert_color=false
3130
process/normal_map_invert_y=false
32-
stream=false
33-
size_limit=0
34-
detect_3d=true
35-
svg/scale=1.0
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

‎2d/screen_space_shaders/art/vignette.png.import

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[remap]
22

33
importer="texture"
4-
type="StreamTexture2D"
5-
path.s3tc="res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.stex"
6-
path.etc2="res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.stex"
4+
type="CompressedTexture2D"
5+
uid="uid://c7uiamx2smpx5"
6+
path.s3tc="res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.ctex"
7+
path.etc2="res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.ctex"
78
metadata={
89
"imported_formats": ["s3tc", "etc2"],
910
"vram_texture": true
@@ -12,26 +13,24 @@ metadata={
1213
[deps]
1314

1415
source_file="res://art/vignette.png"
15-
dest_files=["res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.stex", "res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.stex"]
16+
dest_files=["res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.ctex", "res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.ctex"]
1617

1718
[params]
1819

1920
compress/mode=2
2021
compress/lossy_quality=0.7
21-
compress/hdr_mode=0
22+
compress/hdr_compression=1
2223
compress/bptc_ldr=0
2324
compress/normal_map=0
24-
flags/repeat=true
25-
flags/filter=true
26-
flags/mipmaps=true
27-
flags/anisotropic=false
28-
flags/srgb=2
25+
compress/channel_pack=0
26+
mipmaps/generate=true
27+
mipmaps/limit=-1
28+
roughness/mode=0
29+
roughness/src_normal=""
2930
process/fix_alpha_border=true
3031
process/premult_alpha=false
31-
process/HDR_as_SRGB=false
32-
process/invert_color=false
3332
process/normal_map_invert_y=false
34-
stream=false
35-
size_limit=0
36-
detect_3d=false
37-
svg/scale=1.0
33+
process/hdr_as_srgb=false
34+
process/hdr_clamp_exposure=false
35+
process/size_limit=0
36+
detect_3d/compress_to=0

‎2d/screen_space_shaders/art/white.png.import

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
[remap]
22

33
importer="texture"
4-
type="StreamTexture2D"
5-
path="res://.godot/imported/white.png-9cdc9524282ba2bce69b45edcd6ac827.stex"
4+
type="CompressedTexture2D"
5+
uid="uid://dxb6wr1r452am"
6+
path="res://.godot/imported/white.png-9cdc9524282ba2bce69b45edcd6ac827.ctex"
67
metadata={
78
"vram_texture": false
89
}
910

1011
[deps]
1112

1213
source_file="res://art/white.png"
13-
dest_files=["res://.godot/imported/white.png-9cdc9524282ba2bce69b45edcd6ac827.stex"]
14+
dest_files=["res://.godot/imported/white.png-9cdc9524282ba2bce69b45edcd6ac827.ctex"]
1415

1516
[params]
1617

1718
compress/mode=0
1819
compress/lossy_quality=0.7
19-
compress/hdr_mode=0
20+
compress/hdr_compression=1
2021
compress/bptc_ldr=0
2122
compress/normal_map=0
22-
flags/repeat=0
23-
flags/filter=true
24-
flags/mipmaps=false
25-
flags/anisotropic=false
26-
flags/srgb=2
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
2728
process/fix_alpha_border=true
2829
process/premult_alpha=false
29-
process/HDR_as_SRGB=false
30-
process/invert_color=false
3130
process/normal_map_invert_y=false
32-
stream=false
33-
size_limit=0
34-
detect_3d=true
35-
svg/scale=1.0
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

0 commit comments

Comments
 (0)