update-angle fails when due to program version id update when upstrea…

…m files are renamed

https://bugs.webkit.org/show_bug.cgi?id=259774
rdar://113324930

Unreviewed, to be reviewed by Dan Glastonbury.

angle_code_affecting_program_serialize.xcfilelist would have manually
curated files that affects the program version. In practice, this was
set to be just all the compiled ANGLE files. Since this list was
manually compiled, this would break frequently due to upstread renames.

Instead, compile the list with `find`.

Move generated files ANGLEShaderProgramVersion.h and angle_commit.h to
WebKit/ directory, so that they do not appear in changes.diff exclusion
list when generating the diff.

Clean up the parameters of the script and remove some redundant
printout.

* Source/ThirdParty/ANGLE/WebKit/ANGLEShaderProgramVersion.h: Added.
* Source/ThirdParty/ANGLE/WebKit/angle_commit.h: Renamed from Source/ThirdParty/ANGLE/src/angle_commit.h.
* Source/ThirdParty/ANGLE/changes.diff:
* Source/ThirdParty/ANGLE/src/angle_code_affecting_program_serialize.xcfilelist: Removed.
* Source/ThirdParty/ANGLE/src/common/ANGLEShaderProgramVersion.h: Removed.
* Tools/Scripts/update-angle:

Canonical link: https://commits.webkit.org/266571@main

Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj

@@ -402,6 +402,8 @@
 		7B76083F289832BD000012A1 /* TransformFeedbackImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B76083A289832BD000012A1 /* TransformFeedbackImpl.cpp */; };
 		7B81955B28CF63D800C7ABCD /* MemoryShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B81955928CF63D800C7ABCD /* MemoryShaderCache.cpp */; };
 		7B81955C28CF63D800C7ABCD /* MemoryShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B81955A28CF63D800C7ABCD /* MemoryShaderCache.h */; };
+		7BC689152A7BD3AE0022260B /* angle_commit.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC689132A7BD3AE0022260B /* angle_commit.h */; };
+		7BC689162A7BD3AE0022260B /* ANGLEShaderProgramVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC689142A7BD3AE0022260B /* ANGLEShaderProgramVersion.h */; };
 		7BCF49C528AD1C8C0090D34A /* apple_platform_utils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7BCF49C228AD1C8C0090D34A /* apple_platform_utils.mm */; };
 		7BCF49C628AD1C8C0090D34A /* CircularBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BCF49C328AD1C8C0090D34A /* CircularBuffer.h */; };
 		7BCF49C728AD1C8C0090D34A /* apple_platform_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BCF49C428AD1C8C0090D34A /* apple_platform_utils.h */; };
@@ -1473,6 +1475,8 @@
 		7B76083A289832BD000012A1 /* TransformFeedbackImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformFeedbackImpl.cpp; sourceTree = "<group>"; };
 		7B81955928CF63D800C7ABCD /* MemoryShaderCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryShaderCache.cpp; sourceTree = "<group>"; };
 		7B81955A28CF63D800C7ABCD /* MemoryShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryShaderCache.h; sourceTree = "<group>"; };
+		7BC689132A7BD3AE0022260B /* angle_commit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = angle_commit.h; path = WebKit/angle_commit.h; sourceTree = "<group>"; };
+		7BC689142A7BD3AE0022260B /* ANGLEShaderProgramVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ANGLEShaderProgramVersion.h; path = WebKit/ANGLEShaderProgramVersion.h; sourceTree = "<group>"; };
 		7BCF49C228AD1C8C0090D34A /* apple_platform_utils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = apple_platform_utils.mm; sourceTree = "<group>"; };
 		7BCF49C328AD1C8C0090D34A /* CircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularBuffer.h; sourceTree = "<group>"; };
 		7BCF49C428AD1C8C0090D34A /* apple_platform_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = apple_platform_utils.h; sourceTree = "<group>"; };
@@ -2854,6 +2858,8 @@
 		7B037F8E29E98CDC00D23E74 /* WebKit */ = {
 			isa = PBXGroup;
 			children = (
+				7BC689132A7BD3AE0022260B /* angle_commit.h */,
+				7BC689142A7BD3AE0022260B /* ANGLEShaderProgramVersion.h */,
 				7B037F9129E98CF100D23E74 /* SourcesCGL-mm.mm */,
 				7B037F9329E98CF100D23E74 /* SourcesCGL.cpp */,
 				7B037F8F29E98CF100D23E74 /* SourcesEAGL.cpp */,
@@ -3250,8 +3256,10 @@
 				FFD00237274497C4002BE3BC /* AddAndTrueToLoopCondition.h in Headers */,
 				31CDFF5C2491848C00486F27 /* aligned_memory.h in Headers */,
 				7B19599326C3C22000C09322 /* android_util.h in Headers */,
+				7BC689152A7BD3AE0022260B /* angle_commit.h in Headers */,
 				31CDFE11249183F000486F27 /* angle_gl.h in Headers */,
 				FFD0029827449E12002BE3BC /* angle_version_info.h in Headers */,
+				7BC689162A7BD3AE0022260B /* ANGLEShaderProgramVersion.h in Headers */,
 				31CD007F249184FD00486F27 /* angletypes.h in Headers */,
 				31CDFF542491848C00486F27 /* angleutils.h in Headers */,
 				7BCF49C728AD1C8C0090D34A /* apple_platform_utils.h in Headers */,

Source/ThirdParty/ANGLE/CMakeLists.txt

@@ -57,6 +57,7 @@ set(EGL_LIBRARY_TYPE STATIC)
 # + angle_(renderer) (Backend and OS specific)
 
 set(ANGLE_PRIVATE_INCLUDE_DIRECTORIES
+    "${CMAKE_CURRENT_SOURCE_DIR}/WebKit"
     "${CMAKE_CURRENT_SOURCE_DIR}/include"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/KHR"
     "${CMAKE_CURRENT_SOURCE_DIR}/src"

Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig

@@ -20,7 +20,7 @@ DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_
 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
 
-HEADER_SEARCH_PATHS = ${DERIVED_FILES_DIR} include src src/common/base src/common/third_party/xxhash third_party/zlib/google;
+HEADER_SEARCH_PATHS = ${DERIVED_FILES_DIR} WebKit include src src/common/base src/common/third_party/xxhash third_party/zlib/google;
 
 ANGLE_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/ANGLE;
 

Source/ThirdParty/ANGLE/WebKit/ANGLEShaderProgramVersion.h

@@ -0,0 +1,2 @@
+#define ANGLE_PROGRAM_VERSION "d4ff4abd913793336c767b8343bb1f33"
+#define ANGLE_PROGRAM_VERSION_HASH_SIZE 16