Merge pull request godotengine#102264 from akien-mga/betsy-doc-cleanup

Betsy: Consolidate documentation in module folder and cleanup SCsub

Author: Repiteo

COPYRIGHT.txt

@@ -61,6 +61,15 @@ Copyright: 2011, Ole Kniemeyer, MAXON, www.maxon.net
  2007-2014, Juan Linietsky, Ariel Manzur
 License: Expat and Zlib
 
+Files: modules/betsy/alpha_stitch.glsl
+ modules/betsy/bc1.glsl
+ modules/betsy/bc4.glsl
+ modules/betsy/bc6h.glsl
+ modules/betsy/CrossPlatformSettings_piece_all.glsl
+Comment: Betsy
+Copyright: 2020-2022, Matias N. Goldberg
+License: Expat
+
 Files: modules/godot_physics_2d/godot_joints_2d.cpp
 Comment: Chipmunk2D Joint Constraints
 Copyright: 2007, Scott Lembcke
@@ -179,11 +188,6 @@ Comment: Basis Universal
 Copyright: 2019-2024, Binomial LLC.
 License: Apache-2.0
 
-Files: thirdparty/betsy/*
-Comment: Betsy
-Copyright: 2020-2022, Matias N. Goldberg
-License: Expat
-
 Files: thirdparty/brotli/*
 Comment: Brotli
 Copyright: 2009, 2010, 2013-2016 by the Brotli Authors.

thirdparty/betsy/LICENSE.md modules/betsy/LICENSE.Betsy.mdthirdparty/betsy/LICENSE.md renamed to modules/betsy/LICENSE.Betsy.md

@@ -5,25 +5,14 @@ Import("env")
 Import("env_modules")
 
 env_betsy = env_modules.Clone()
+
+# Betsy shaders, originally from https://github.com/darksylinc/betsy
 env_betsy.GLSL_HEADER("bc6h.glsl")
 env_betsy.GLSL_HEADER("bc1.glsl")
 env_betsy.GLSL_HEADER("bc4.glsl")
 env_betsy.GLSL_HEADER("alpha_stitch.glsl")
-env_betsy.Depends(Glob("*.glsl.gen.h"), ["#glsl_builders.py"])
-
-# Thirdparty source files
-thirdparty_obj = []
-thirdparty_dir = "#thirdparty/betsy/"
-env_betsy.Prepend(CPPPATH=[thirdparty_dir])
 
-env_thirdparty = env_betsy.Clone()
-env_thirdparty.disable_warnings()
-env.modules_sources += thirdparty_obj
+env_betsy.Depends(Glob("*.glsl.gen.h"), ["#glsl_builders.py"])
 
 # Godot source files
-module_obj = []
-env_betsy.add_source_files(module_obj, "*.cpp")
-env.modules_sources += module_obj
-
-# Needed to force rebuilding the module files when the thirdparty library is updated.
-env.Depends(module_obj, thirdparty_obj)
+env_betsy.add_source_files(env.modules_sources, "*.cpp")

modules/betsy/SCsub

@@ -6,7 +6,6 @@
 #version 450
 
 #include "CrossPlatformSettings_piece_all.glsl"
-#include "UavCrossPlatform_piece_all.glsl"
 
 layout(local_size_x = 8, //
 		local_size_y = 8, //

modules/betsy/UavCrossPlatform_piece_all.glsl

@@ -7,7 +7,6 @@ dithered = "#define BC1_DITHER";
 #version 450
 
 #include "CrossPlatformSettings_piece_all.glsl"
-#include "UavCrossPlatform_piece_all.glsl"
 
 #define FLT_MAX 340282346638528859811704183484516925440.0f
 

modules/betsy/alpha_stitch.glsl

@@ -7,7 +7,6 @@ signed = "#define SNORM";
 #version 450
 
 #include "CrossPlatformSettings_piece_all.glsl"
-#include "UavCrossPlatform_piece_all.glsl"
 
 #VERSION_DEFINES
 

modules/betsy/bc1.glsl

@@ -7,7 +7,6 @@ unsigned = "#define QUALITY"; // The "Quality" preset causes artifacting on sign
 #version 450
 
 #include "CrossPlatformSettings_piece_all.glsl"
-#include "UavCrossPlatform_piece_all.glsl"
 
 #VERSION_DEFINES
 

modules/betsy/bc4.glsl

@@ -71,18 +71,6 @@ Files extracted from upstream source:
 Applied upstream PR https://github.com/BinomialLLC/basis_universal/pull/344 to
 fix build with our own copy of zstd (patch in `patches`).
 
-## betsy
-
-- Upstream: https://github.com/darksylinc/betsy
-- Version: git (cc723dcae9a6783ae572f64d12a90d60ef8d631a, 2022)
-- License: MIT
-
-Files extracted from upstream source:
-
-- `bc6h.glsl`, `bc1.glsl`, `bc4.glsl`, `CrossPlatformSettings_piece_all.glsl` and `UavCrossPlatform_piece_all.glsl`.
-- `LICENSE.md`
-
-
 ## brotli
 
 - Upstream: https://github.com/google/brotli