Merge pull request #735 from voylin/2DScreenSpaceShaders4.0Update

Screen Space Shader Update to 4.0
godotengine · May 7, 2022 · 521fc2d · 521fc2d
2 parents 7349ccc + 3657f91
commit 521fc2d
Show file tree

Hide file tree

Showing 11 changed files with 204 additions and 228 deletions.
diff --git a/2d/screen_space_shaders/README.md b/2d/screen_space_shaders/README.md
@@ -5,7 +5,7 @@ Many common full-res effects are implemented here for reference.
 
 Language: [GDSL](https://docs.godotengine.org/en/latest/tutorials/shaders/shader_reference/shading_language.html) and GDScript
 
-Renderer: GLES 3 (the blur effect is not available in GLES 2, the rest work)
+Renderer: Vulkan Clustered
 
 Check out this demo on the asset library: https://godotengine.org/asset-library/asset/122
 

diff --git a/2d/screen_space_shaders/art/burano.jpg.import b/2d/screen_space_shaders/art/burano.jpg.import
@@ -1,35 +1,34 @@
 [remap]
 
 importer="texture"
-type="StreamTexture2D"
-path="res://.godot/imported/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.stex"
+type="CompressedTexture2D"
+uid="uid://bxfl16c7nqg0t"
+path="res://.godot/imported/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
 source_file="res://art/burano.jpg"
-dest_files=["res://.godot/imported/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.stex"]
+dest_files=["res://.godot/imported/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.ctex"]
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
-compress/hdr_mode=0
+compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/2d/screen_space_shaders/art/filmgrain.png.import b/2d/screen_space_shaders/art/filmgrain.png.import
@@ -1,9 +1,10 @@
 [remap]
 
 importer="texture"
-type="StreamTexture2D"
-path.s3tc="res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.stex"
-path.etc2="res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.stex"
+type="CompressedTexture2D"
+uid="uid://c5jxxypesp0k5"
+path.s3tc="res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.ctex"
+path.etc2="res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc", "etc2"],
 "vram_texture": true
@@ -12,26 +13,24 @@ metadata={
 [deps]
 
 source_file="res://art/filmgrain.png"
-dest_files=["res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.stex", "res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.stex"]
+dest_files=["res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.ctex", "res://.godot/imported/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.ctex"]
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
-compress/hdr_mode=0
+compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0
diff --git a/2d/screen_space_shaders/art/forest.jpg.import b/2d/screen_space_shaders/art/forest.jpg.import
@@ -1,35 +1,34 @@
 [remap]
 
 importer="texture"
-type="StreamTexture2D"
-path="res://.godot/imported/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.stex"
+type="CompressedTexture2D"
+uid="uid://dmposqqlg6e2m"
+path="res://.godot/imported/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
 source_file="res://art/forest.jpg"
-dest_files=["res://.godot/imported/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.stex"]
+dest_files=["res://.godot/imported/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.ctex"]
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
-compress/hdr_mode=0
+compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/2d/screen_space_shaders/art/mountains.jpg.import b/2d/screen_space_shaders/art/mountains.jpg.import
@@ -1,35 +1,34 @@
 [remap]
 
 importer="texture"
-type="StreamTexture2D"
-path="res://.godot/imported/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.stex"
+type="CompressedTexture2D"
+uid="uid://bj5ysvx4sbbw0"
+path="res://.godot/imported/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
 source_file="res://art/mountains.jpg"
-dest_files=["res://.godot/imported/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.stex"]
+dest_files=["res://.godot/imported/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.ctex"]
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
-compress/hdr_mode=0
+compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/2d/screen_space_shaders/art/platformer.jpg.import b/2d/screen_space_shaders/art/platformer.jpg.import
@@ -1,35 +1,34 @@
 [remap]
 
 importer="texture"
-type="StreamTexture2D"
-path="res://.godot/imported/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.stex"
+type="CompressedTexture2D"
+uid="uid://cjycbveqawf6o"
+path="res://.godot/imported/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
 source_file="res://art/platformer.jpg"
-dest_files=["res://.godot/imported/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.stex"]
+dest_files=["res://.godot/imported/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.ctex"]
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
-compress/hdr_mode=0
+compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/2d/screen_space_shaders/art/vignette.png.import b/2d/screen_space_shaders/art/vignette.png.import
@@ -1,9 +1,10 @@
 [remap]
 
 importer="texture"
-type="StreamTexture2D"
-path.s3tc="res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.stex"
-path.etc2="res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.stex"
+type="CompressedTexture2D"
+uid="uid://c7uiamx2smpx5"
+path.s3tc="res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.ctex"
+path.etc2="res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc", "etc2"],
 "vram_texture": true
@@ -12,26 +13,24 @@ metadata={
 [deps]
 
 source_file="res://art/vignette.png"
-dest_files=["res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.stex", "res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.stex"]
+dest_files=["res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.ctex", "res://.godot/imported/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.ctex"]
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
-compress/hdr_mode=0
+compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0
diff --git a/2d/screen_space_shaders/art/white.png.import b/2d/screen_space_shaders/art/white.png.import
@@ -1,35 +1,34 @@
 [remap]
 
 importer="texture"
-type="StreamTexture2D"
-path="res://.godot/imported/white.png-9cdc9524282ba2bce69b45edcd6ac827.stex"
+type="CompressedTexture2D"
+uid="uid://dxb6wr1r452am"
+path="res://.godot/imported/white.png-9cdc9524282ba2bce69b45edcd6ac827.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
 source_file="res://art/white.png"
-dest_files=["res://.godot/imported/white.png-9cdc9524282ba2bce69b45edcd6ac827.stex"]
+dest_files=["res://.godot/imported/white.png-9cdc9524282ba2bce69b45edcd6ac827.ctex"]
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
-compress/hdr_mode=0
+compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1