From 0b4d43b9a1c2919ff81958586efd14513d4baa8b Mon Sep 17 00:00:00 2001
From: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 01:21:18 +0000
Subject: [PATCH] chore: update patches
---
patches/angle/cherry-pick-cafe56b591ed.patch | 55 ++++++++++----------
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/patches/angle/cherry-pick-cafe56b591ed.patch b/patches/angle/cherry-pick-cafe56b591ed.patch
index dd9c556cc0..ab054a787f 100644
--- a/patches/angle/cherry-pick-cafe56b591ed.patch
+++ b/patches/angle/cherry-pick-cafe56b591ed.patch
@@ -1,7 +1,7 @@
-From cafe56b591edb77f041be70b58cac3a61565644a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Geoff Lang <geofflang@chromium.org>
Date: Fri, 23 Jun 2023 14:46:28 -0400
-Subject: [PATCH] M116: GL: Ensure all instanced attributes have a buffer with data
+Subject: M116: GL: Ensure all instanced attributes have a buffer with data
Apple OpenGL drivers sometimes crash when given an instanced draw with
a buffer that has never been given data.
@@ -17,13 +17,12 @@ Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
(cherry picked from commit 4e6124dae892690204f8e5996aeaad14f45e0a97)
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4727452
----
diff --git a/include/platform/FeaturesGL_autogen.h b/include/platform/FeaturesGL_autogen.h
-index aa0565c..2f6e094 100644
+index aa0565c61eed026e8def60dcb403dfbf0129ab50..2f6e094f332b662283c32bd03200e1cd21464f18 100644
--- a/include/platform/FeaturesGL_autogen.h
+++ b/include/platform/FeaturesGL_autogen.h
-@@ -501,6 +501,12 @@
+@@ -501,6 +501,12 @@ struct FeaturesGL : FeatureSetBase
"supportsShaderPixelLocalStorageEXT", FeatureCategory::OpenGLFeatures,
"Backend GL context supports EXT_shader_pixel_local_storage extension", &members,
"http://anglebug.com/7279"};
@@ -37,7 +36,7 @@ index aa0565c..2f6e094 100644
inline FeaturesGL::FeaturesGL() = default;
diff --git a/include/platform/gl_features.json b/include/platform/gl_features.json
-index 032f29a..b358cea 100644
+index 032f29a01b38ee8c4af0a431fe89942d6e44f350..b358cea8b918f951b6506d5e39a25025ab7d3feb 100644
--- a/include/platform/gl_features.json
+++ b/include/platform/gl_features.json
@@ -699,6 +699,14 @@
@@ -56,7 +55,7 @@ index 032f29a..b358cea 100644
]
}
diff --git a/scripts/code_generation_hashes/ANGLE_features.json b/scripts/code_generation_hashes/ANGLE_features.json
-index d4576c2..503001c 100644
+index d4576c29adb3a8a744c4cd10d74b4c0ed58fc2ba..503001c1efd277e1854f3f681a6e4713c3d0db0f 100644
--- a/scripts/code_generation_hashes/ANGLE_features.json
+++ b/scripts/code_generation_hashes/ANGLE_features.json
@@ -2,7 +2,7 @@
@@ -87,10 +86,10 @@ index d4576c2..503001c 100644
}
\ No newline at end of file
diff --git a/src/libANGLE/renderer/gl/BufferGL.cpp b/src/libANGLE/renderer/gl/BufferGL.cpp
-index c99fd5d..9651838 100644
+index c99fd5dc75365a5dd2c76588350e4ca350a14d55..9651838b8196c20209b73eeb3330564923e6ffa7 100644
--- a/src/libANGLE/renderer/gl/BufferGL.cpp
+++ b/src/libANGLE/renderer/gl/BufferGL.cpp
-@@ -296,6 +296,11 @@
+@@ -296,6 +296,11 @@ angle::Result BufferGL::getIndexRange(const gl::Context *context,
return angle::Result::Continue;
}
@@ -103,10 +102,10 @@ index c99fd5d..9651838 100644
{
return mBufferID;
diff --git a/src/libANGLE/renderer/gl/BufferGL.h b/src/libANGLE/renderer/gl/BufferGL.h
-index 7b57594..fe9138e 100644
+index 7b57594580de2fc6946343417b3bca94402472b3..fe9138e8163ef2917411c87df3294a32d87f25b1 100644
--- a/src/libANGLE/renderer/gl/BufferGL.h
+++ b/src/libANGLE/renderer/gl/BufferGL.h
-@@ -56,6 +56,7 @@
+@@ -56,6 +56,7 @@ class BufferGL : public BufferImpl
bool primitiveRestartEnabled,
gl::IndexRange *outRange) override;
@@ -115,10 +114,10 @@ index 7b57594..fe9138e 100644
private:
diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
-index dc981de..fda9099 100644
+index dc981dee0dabffe19f6a098ff5a6a1fdb180b4e7..fda90999209f44a3afe386916c3b91b9ad76bec3 100644
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
-@@ -646,6 +646,7 @@
+@@ -646,6 +646,7 @@ angle::Result VertexArrayGL::updateAttribEnabled(const gl::Context *context, siz
angle::Result VertexArrayGL::updateAttribPointer(const gl::Context *context, size_t attribIndex)
{
@@ -126,7 +125,7 @@ index dc981de..fda9099 100644
const VertexAttribute &attrib = mState.getVertexAttribute(attribIndex);
-@@ -687,8 +688,16 @@
+@@ -687,8 +688,16 @@ angle::Result VertexArrayGL::updateAttribPointer(const gl::Context *context, siz
// is not NULL.
StateManagerGL *stateManager = GetStateManagerGL(context);
@@ -145,10 +144,10 @@ index dc981de..fda9099 100644
binding.getStride(), binding.getOffset()));
diff --git a/src/libANGLE/renderer/gl/renderergl_utils.cpp b/src/libANGLE/renderer/gl/renderergl_utils.cpp
-index 6911247..ab2a608 100644
+index 691124720f0a446442ead3efcc2607aa3227424d..ab2a608bb11f016ba9e689ee8a2e5caf39c045ac 100644
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
-@@ -2465,6 +2465,9 @@
+@@ -2465,6 +2465,9 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
// EXT_shader_pixel_local_storage
ANGLE_FEATURE_CONDITION(features, supportsShaderPixelLocalStorageEXT,
functions->hasGLESExtension("GL_EXT_shader_pixel_local_storage"));
@@ -159,7 +158,7 @@ index 6911247..ab2a608 100644
void InitializeFrontendFeatures(const FunctionsGL *functions, angle::FrontendFeatures *features)
diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
-index 59ec7c2..44ff3e4 100644
+index 59ec7c2fb8103f43b79f4d8bb548c2bfbeb17823..44ff3e4b7a5356d0fd22e5245d0f620d791bf308 100644
--- a/src/tests/angle_end2end_tests_expectations.txt
+++ b/src/tests/angle_end2end_tests_expectations.txt
@@ -380,6 +380,7 @@
@@ -171,10 +170,10 @@ index 59ec7c2..44ff3e4 100644
// Android
6095 ANDROID GLES : GLSLTest_ES3.InitGlobalComplexConstant/* = SKIP
diff --git a/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-index 7dc56cd..bd7ecd1 100644
+index 64287af5834607f6819f1197e2eed1a56f712ffe..b8c942bd9bbbd08ae8f368ba949987e8cfa87695 100644
--- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-@@ -1632,10 +1632,10 @@
+@@ -1632,10 +1632,10 @@ void main()
constexpr GLuint kMaxIntAsGLuint = static_cast<GLuint>(std::numeric_limits<GLint>::max());
constexpr GLuint kIndexData[] = {
@@ -189,7 +188,7 @@ index 7dc56cd..bd7ecd1 100644
};
GLBuffer indexBuffer;
-@@ -3687,8 +3687,8 @@
+@@ -3687,8 +3687,8 @@ TEST_P(WebGLCompatibilityTest, R16FTextures)
constexpr float readPixelsData[] = {-5000.0f, 0.0f, 0.0f, 1.0f};
const GLushort textureData[] = {
@@ -200,7 +199,7 @@ index 7dc56cd..bd7ecd1 100644
for (auto extension : FloatingPointTextureExtensions)
{
-@@ -3748,8 +3748,8 @@
+@@ -3748,8 +3748,8 @@ TEST_P(WebGLCompatibilityTest, RG16FTextures)
constexpr float readPixelsData[] = {7108.0f, -10.0f, 0.0f, 1.0f};
const GLushort textureData[] = {
@@ -211,7 +210,7 @@ index 7dc56cd..bd7ecd1 100644
for (auto extension : FloatingPointTextureExtensions)
{
-@@ -3811,8 +3811,8 @@
+@@ -3811,8 +3811,8 @@ TEST_P(WebGLCompatibilityTest, RGB16FTextures)
constexpr float readPixelsData[] = {7000.0f, 100.0f, 33.0f, 1.0f};
const GLushort textureData[] = {
@@ -222,7 +221,7 @@ index 7dc56cd..bd7ecd1 100644
for (auto extension : FloatingPointTextureExtensions)
{
-@@ -3874,8 +3874,8 @@
+@@ -3874,8 +3874,8 @@ TEST_P(WebGLCompatibilityTest, RGBA16FTextures)
constexpr float readPixelsData[] = {7000.0f, 100.0f, 33.0f, -1.0f};
const GLushort textureData[] = {
@@ -233,7 +232,7 @@ index 7dc56cd..bd7ecd1 100644
for (auto extension : FloatingPointTextureExtensions)
{
-@@ -5803,6 +5803,26 @@
+@@ -5901,6 +5901,26 @@ TEST_P(WebGL2CompatibilityTest, HalfFloatOesType)
}
}
@@ -261,10 +260,10 @@ index 7dc56cd..bd7ecd1 100644
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(WebGL2CompatibilityTest);
diff --git a/util/angle_features_autogen.cpp b/util/angle_features_autogen.cpp
-index adb9610..a060dd2 100644
+index adb9610863b30490bda329e1153f1f915ee83e9f..a060dd2a7c1b60d28abbb4fafbe250e8e3cc4d0b 100644
--- a/util/angle_features_autogen.cpp
+++ b/util/angle_features_autogen.cpp
-@@ -118,6 +118,7 @@
+@@ -118,6 +118,7 @@ constexpr PackedEnumMap<Feature, const char *> kFeatureNames = {{
{Feature::EnablePrecisionQualifiers, "enablePrecisionQualifiers"},
{Feature::EnablePreRotateSurfaces, "enablePreRotateSurfaces"},
{Feature::EnableProgramBinaryForCapture, "enableProgramBinaryForCapture"},
@@ -273,10 +272,10 @@ index adb9610..a060dd2 100644
{Feature::ExplicitlyEnablePerSampleShading, "explicitlyEnablePerSampleShading"},
{Feature::ExposeNonConformantExtensionsAndVersions, "exposeNonConformantExtensionsAndVersions"},
diff --git a/util/angle_features_autogen.h b/util/angle_features_autogen.h
-index 3d8c47f..4064425 100644
+index 3d8c47f9a1b438e0783d12b1fbfcfa6dc67675f7..4064425c3c9ad5a6296b79810d68ff74399f681d 100644
--- a/util/angle_features_autogen.h
+++ b/util/angle_features_autogen.h
-@@ -112,6 +112,7 @@
+@@ -112,6 +112,7 @@ enum class Feature
EnablePrecisionQualifiers,
EnablePreRotateSurfaces,
EnableProgramBinaryForCapture,
--
GitLab