Commit 80b3385a: add new patch

add new patch

80b3385a

Levin Li

committed Feb 7, 2024

main

succeeded

Files

Details



	build.sh
	variable_rasterization_rate_map.patch +

build.sh

/build.sh

View

git apply ../flip_y.patch --ignore-whitespace --whitespace=nowarn

check_success

echo "Apply Variable Rasterization Rate Map ANGLE patch"

git apply ../variable_rasterization_rate_map.patch --ignore-whitespace --whitespace=nowarn

check_success

echo "Apply visionOS ANGLE patch"

git apply ../angle.visionos.patch --ignore-whitespace --whitespace=nowarn

check_success

variable_rasterization_rate_map.patch

+1772

/variable_rasterization_rate_map.patch

View

Displayed content is truncated due to maximum viewable content limit.

diff --git a/doc/ExtensionSupport.md b/doc/ExtensionSupport.md

index 98cb52e1e5..2164dc8826 100644

--- a/doc/ExtensionSupport.md

+++ b/doc/ExtensionSupport.md

@@ -251,6 +251,7 @@ using data from registry_xml.py and gl.xml.

| [GL_ANGLE_texture_external_update](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_texture_external_update.txt) | | | | | | | |

| [GL_ANGLE_texture_multisample](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_texture_multisample.txt) | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |

| [GL_ANGLE_texture_rectangle](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_texture_rectangle.txt) | | | | | | | |

+| [GL_ANGLE_variable_rasterization_rate_metal](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_variable_rasterization_rate_metal.txt) | | | | | | | |

| [GL_ANGLE_vulkan_image](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_vulkan_image.txt) | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |

| [GL_ANGLE_webgl_compatibility](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_webgl_compatibility.txt) | | | | | | | |

| [GL_ANGLE_yuv_internal_format](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_yuv_internal_format.txt) | ✔ | | ✔ | ✔ | ✔ | ✔ | ✔ |

diff --git a/extensions/ANGLE_variable_rasterization_rate_metal.txt b/extensions/ANGLE_variable_rasterization_rate_metal.txt

new file mode 100644

index 0000000000..661d204d57

--- /dev/null

+++ b/extensions/ANGLE_variable_rasterization_rate_metal.txt

@@ -0,0 +1,95 @@

+Name

+ ANGLE_variable_rasterization_rate_metal

+Name Strings

+ GL_ANGLE_variable_rasterization_rate_metal

+Contributors

+ Dan Glastonbury, Apple Inc.

+Contact

+ Dan Glastonbury, Apple Inc. (djg 'at' apple 'dot' com)

+Status

+ Incomplete

+Version

+ Last Modified Date: May 5, 2023

+ Author Revision: 1

+Number

+ OpenGL ES Extension XX

+Dependencies

+Overview

+IP Status

+ No known IP claims.

+New Types

+ /*

+ * GLMTLRasterizationRateMapANGLE is an opaque handle to an id<MTLRasterizationRateMap>

+ */

+ typedef void* GLMTLRasterizationRateMapANGLE;

+New Procedures and Functions

+ void BindMetalRasterizationRateMapANGLE(GLMTLRasterizationRateMapANGLE map);

+New Tokens

+ Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by the

+ <target> parameter of Enablei, Disablei, IsEnabledi, GetBooleani_v, GetIntegeri_v, GetInteger64i_v, and by the <pname> parameter

+ of GetBooleanv, GetIntegerv, GetInteger64v, GetFloatv,

+ VARIABLE_RASTERIZATION_RATE_ANGLE 0x96BC

+ Accepted by the <pname> parameter of GetPointerv:

+ METAL_RASTERIZATION_RATE_MAP_BINDING_ANGLE 0x96BD

+Issues

+ 1) Specify behavior of BindMetalRaterizationRateMap(...)

+ - Though this extension's incomplete and being prototyped, would you

+ like to mention anything about the semantics of this new binding

+ point?

+ - Should this define ownership of the MTLRasterizationRateMap?

+ - MTLRasterizationRateMap needs to define multiple layer maps if

+ performing layered rendering - which I assume would mean using

+ multiple draw buffers in OpenGL ES semantics.

+ - Should this mention errors, for example that subsequent draw calls

+ will fail with INVALID_OPERATION if the number of color attachments on

+ the bound framebuffer doesn't match the number of layer maps in the

+ rasterization rate map?

+ - Does passing nullptr restore the GL state to its original value?

+ - Does binding a rasterization rate map created with a different Metal

+ device to that of ANGLE cause an error? If not, should it?

+ 2) Specify behavior of glEnable(GL_VARIABLE_RASTERIZATION_RATE_ANGLE)

+ - What happens if GL_VARIABLE_RASTERIZATION_RATE_ANGLE is enabled, but

+ no rasterization rate map is bound?

+ In the current implementation, if the feature is enable but no map is

+ bound the GL renders as normal and no error is generated.

+ 3) Does this feature require a GLSL extension to allow access to

+ rasterization_rate_map_decoder when rendering with an enabled map? Should

+ gl_FragCoord automatically be adjusted when rendering with a map?

diff --git a/include/GLES2/gl2ext_angle.h b/include/GLES2/gl2ext_angle.h

index 7e08b1cbbd..9cb77e9a18 100644

--- a/include/GLES2/gl2ext_angle.h

+++ b/include/GLES2/gl2ext_angle.h

@@ -731,4 +731,16 @@ GL_APICALL void GL_APIENTRY glLogicOpANGLE (GLenum);

#endif

#endif /* GL_ANGLE_logic_op */

+#ifndef GL_ANGLE_variable_rasterization_rate_metal

+#define GL_ANGLE_variable_rasterization_rate_metal 1

+#define GL_VARIABLE_RASTERIZATION_RATE_ANGLE 0x96BC

+#define GL_METAL_RASTERIZATION_RATE_MAP_BINDING_ANGLE 0x96BD

+typedef void *GLMTLRasterizationRateMapANGLE;

+typedef void (GL_APIENTRYP PFNGLBINDMETALRASTERIZATIONRATEMAPANGLEPROC) (GLMTLRasterizationRateMapANGLE);

+#ifdef GL_GLEXT_PROTOTYPES

+GL_APICALL void GL_APIENTRY glBindMetalRasterizationRateMapANGLE(GLMTLRasterizationRateMapANGLE map);

+#endif

+#endif /* GL_ANGLE_variable_rasterization_rate_metal */

#endif // INCLUDE_GLES2_GL2EXT_ANGLE_H_

diff --git a/include/platform/autogen/FeaturesMtl_autogen.h b/include/platform/autogen/FeaturesMtl_autogen.h

index 3f09fa4c4e..441b5b5770 100644

--- a/include/platform/autogen/FeaturesMtl_autogen.h

+++ b/include/platform/autogen/FeaturesMtl_autogen.h

@@ -83,6 +83,13 @@ struct FeaturesMtl : FeatureSetBase

&members,

};

+ FeatureInfo hasVariableRasterizationRate = {

+ "hasVariableRasterizationRate",

+ FeatureCategory::MetalFeatures,

+ "The renderer supports variable rasterization rate",

+ &members,

+ };

FeatureInfo allowInlineConstVertexData = {

"allowInlineConstVertexData",

FeatureCategory::MetalFeatures,

diff --git a/include/platform/mtl_features.json b/include/platform/mtl_features.json

index a636c5e777..d1624a7c49 100644

--- a/include/platform/mtl_features.json

+++ b/include/platform/mtl_features.json

@@ -70,6 +70,13 @@

"The renderer supports MTL(Shared)Event"

]

+ {

+ "name": "has_variable_rasterization_rate",

+ "category": "Features",

+ "description": [

+ "The renderer supports variable rasterization rate"

+ ]

+ },

{

"name": "allow_inline_const_vertex_data",

"category": "Features",

diff --git a/scripts/generate_entry_points.py b/scripts/generate_entry_points.py

index aeb978aeb1..cca12812be 100755

--- a/scripts/generate_entry_points.py

+++ b/scripts/generate_entry_points.py

@@ -988,6 +988,7 @@ FORMAT_DICT = {

"GLfloat": "%f",

"GLint": "%d",

"GLintptr": UNSIGNED_LONG_LONG_FORMAT,

+ "GLMTLRasterizationRateMapANGLE": POINTER_FORMAT,

"GLshort": "%d",

"GLsizei": "%d",

"GLsizeiptr": UNSIGNED_LONG_LONG_FORMAT,

diff --git a/scripts/gl_angle_ext.xml b/scripts/gl_angle_ext.xml

index 914c5075b2..1e0c3807ca 100644

--- a/scripts/gl_angle_ext.xml

+++ b/scripts/gl_angle_ext.xml

@@ -9,6 +9,11 @@

Includes data used to auto-generate ANGLE classes.

</comment>

+

+ <types>

+ <type>typedef void *<name>GLMTLRasterizationRateMapANGLE</name>;</type>

+ </types>

@@ -1036,6 +1041,10 @@

<proto>void <name>glLogicOpANGLE</name></proto>

<param group="LogicOp"><ptype>GLenum</ptype> <name>opcode</name></param>

</command>

+ <command>

+ <proto>void <name>glBindMetalRasterizationRateMapANGLE</name></proto>

+ <param><ptype>GLMTLRasterizationRateMapANGLE</ptype> <name>map</name></param>

+ </command>

</commands>

@@ -1348,6 +1357,13 @@

</require>

</extension>

+ <extension name="GL_ANGLE_variable_rasterization_rate_metal" supported="gles2">

+ <require>

+ <enum name="GL_VARIABLE_RASTERIZATION_RATE_ANGLE"/>

+ <enum name="GL_METAL_RASTERIZATION_RATE_MAP_BINDING_ANGLE"/>

+ <command name="glBindMetalRasterizationRateMapANGLE"/>

+ </require>

+ </extension>

</extensions>

@@ -1473,4 +1489,9 @@

</enums>

+ <enums namespace="GL" start="0x96BC" end="0x96BD" vendor="ANGLE">

+ <enum value="0x96BC" name="GL_VARIABLE_RASTERIZATION_RATE_ANGLE"/>

+ <enum value="0x96BD" name="GL_METAL_RASTERIZATION_RATE_MAP_BINDING_ANGLE"/>

+ </enums>

</registry>

diff --git a/scripts/registry_xml.py b/scripts/registry_xml.py

index 15d5895510..1baada9206 100644

--- a/scripts/registry_xml.py

+++ b/scripts/registry_xml.py

@@ -73,6 +73,7 @@ angle_requestable_extensions = [

"GL_ANGLE_texture_compression_dxt5",

"GL_ANGLE_texture_external_update",

"GL_ANGLE_texture_multisample",

+ "GL_ANGLE_variable_rasterization_rate_metal",

"GL_ANGLE_vulkan_image",

"GL_ANGLE_yuv_internal_format",

"GL_CHROMIUM_color_buffer_float_rgb",

diff --git a/src/common/entry_points_enum_autogen.cpp b/src/common/entry_points_enum_autogen.cpp

index b67bc6aefa..f633d17cc1 100644

--- a/src/common/entry_points_enum_autogen.cpp

+++ b/src/common/entry_points_enum_autogen.cpp

@@ -538,6 +538,8 @@ const char *GetEntryPointName(EntryPoint ep)

return "glBindImageTexture";

case EntryPoint::GLBindImageTextures:

return "glBindImageTextures";

+ case EntryPoint::GLBindMetalRasterizationRateMapANGLE:

+ return "glBindMetalRasterizationRateMapANGLE";

case EntryPoint::GLBindProgramPipeline:

return "glBindProgramPipeline";

case EntryPoint::GLBindProgramPipelineEXT:

diff --git a/src/common/entry_points_enum_autogen.h b/src/common/entry_points_enum_autogen.h

index 70bbb9cf22..c93f217582 100644

--- a/src/common/entry_points_enum_autogen.h

+++ b/src/common/entry_points_enum_autogen.h

@@ -275,6 +275,7 @@ enum class EntryPoint

GLBindFramebufferOES,

GLBindImageTexture,

GLBindImageTextures,

+ GLBindMetalRasterizationRateMapANGLE,

GLBindProgramPipeline,

GLBindProgramPipelineEXT,

GLBindRenderbuffer,

diff --git a/src/common/frame_capture_utils_autogen.cpp b/src/common/frame_capture_utils_autogen.cpp

index f356982285..9f601fc824 100644

--- a/src/common/frame_capture_utils_autogen.cpp

+++ b/src/common/frame_capture_utils_autogen.cpp

@@ -222,6 +222,10 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa

WriteParamValueReplay<ParamType::TGLDEBUGPROCKHR>(os, call,

param.value.GLDEBUGPROCKHRVal);

break;

+ case ParamType::TGLMTLRasterizationRateMapANGLE:

+ WriteParamValueReplay<ParamType::TGLMTLRasterizationRateMapANGLE>(

+ os, call, param.value.GLMTLRasterizationRateMapANGLEVal);

+ break;

case ParamType::TGLbitfield:

WriteParamValueReplay<ParamType::TGLbitfield>(os, call, param.value.GLbitfieldVal);

break;

@@ -768,6 +772,8 @@ const char *ParamTypeToString(ParamType paramType)

return "GLDEBUGPROC";

case ParamType::TGLDEBUGPROCKHR:

return "GLDEBUGPROCKHR";

+ case ParamType::TGLMTLRasterizationRateMapANGLE:

+ return "GLMTLRasterizationRateMapANGLE";

case ParamType::TGLbitfield:

return "GLbitfield";

case ParamType::TGLboolean:

diff --git a/src/common/frame_capture_utils_autogen.h b/src/common/frame_capture_utils_autogen.h

index e68affb0e0..88a18830e8 100644

--- a/src/common/frame_capture_utils_autogen.h

+++ b/src/common/frame_capture_utils_autogen.h

@@ -74,6 +74,7 @@ enum class ParamType

TFramebufferIDPointer,

TGLDEBUGPROC,

TGLDEBUGPROCKHR,

+ TGLMTLRasterizationRateMapANGLE,

TGLbitfield,

TGLboolean,

TGLbooleanConstPointer,

@@ -191,7 +192,7 @@ enum class ParamType

TvoidPointerPointer,

};

-constexpr uint32_t kParamTypeCount = 172;

+constexpr uint32_t kParamTypeCount = 173;

union ParamValue

{

@@ -252,6 +253,7 @@ union ParamValue

gl::FramebufferID *FramebufferIDPointerVal;

GLDEBUGPROC GLDEBUGPROCVal;

GLDEBUGPROCKHR GLDEBUGPROCKHRVal;

+ GLMTLRasterizationRateMapANGLE GLMTLRasterizationRateMapANGLEVal;

GLbitfield GLbitfieldVal;

GLboolean GLbooleanVal;

const GLboolean *GLbooleanConstPointerVal;

@@ -745,6 +747,14 @@ inline GLDEBUGPROCKHR GetParamVal<ParamType::TGLDEBUGPROCKHR, GLDEBUGPROCKHR>(

return value.GLDEBUGPROCKHRVal;

}

+template <>

+inline GLMTLRasterizationRateMapANGLE

+GetParamVal<ParamType::TGLMTLRasterizationRateMapANGLE, GLMTLRasterizationRateMapANGLE>(

+ const ParamValue &value)

+ return value.GLMTLRasterizationRateMapANGLEVal;

template <>

inline GLbitfield GetParamVal<ParamType::TGLbitfield, GLbitfield>(const ParamValue &value)

{

@@ -1629,6 +1639,8 @@ T AccessParamValue(ParamType paramType, const ParamValue &value)

return GetParamVal<ParamType::TGLDEBUGPROC, T>(value);

case ParamType::TGLDEBUGPROCKHR:

return GetParamVal<ParamType::TGLDEBUGPROCKHR, T>(value);

+ case ParamType::TGLMTLRasterizationRateMapANGLE:

+ return GetParamVal<ParamType::TGLMTLRasterizationRateMapANGLE, T>(value);

case ParamType::TGLbitfield:

return GetParamVal<ParamType::TGLbitfield, T>(value);

case ParamType::TGLboolean:

@@ -2227,6 +2239,14 @@ inline void SetParamVal<ParamType::TGLDEBUGPROCKHR>(GLDEBUGPROCKHR valueIn, Para

valueOut->GLDEBUGPROCKHRVal = valueIn;

}

+template <>

+inline void SetParamVal<ParamType::TGLMTLRasterizationRateMapANGLE>(

+ GLMTLRasterizationRateMapANGLE valueIn,

+ ParamValue *valueOut)

+ valueOut->GLMTLRasterizationRateMapANGLEVal = valueIn;

template <>

inline void SetParamVal<ParamType::TGLbitfield>(GLbitfield valueIn, ParamValue *valueOut)

{

@@ -3149,6 +3169,9 @@ void InitParamValue(ParamType paramType, T valueIn, ParamValue *valueOut)

case ParamType::TGLDEBUGPROCKHR:

SetParamVal<ParamType::TGLDEBUGPROCKHR>(valueIn, valueOut);

break;

+ case ParamType::TGLMTLRasterizationRateMapANGLE:

+ SetParamVal<ParamType::TGLMTLRasterizationRateMapANGLE>(valueIn, valueOut);

+ break;

case ParamType::TGLbitfield:

SetParamVal<ParamType::TGLbitfield>(valueIn, valueOut);

break;

diff --git a/src/common/gl_enum_utils_autogen.cpp b/src/common/gl_enum_utils_autogen.cpp

index 73806ab5bc..374ea29ae1 100644

--- a/src/common/gl_enum_utils_autogen.cpp

+++ b/src/common/gl_enum_utils_autogen.cpp

@@ -2754,6 +2754,10 @@ const char *GLenumToString(GLESEnum enumGroup, unsigned int value)

return "GL_SHADING_RATE_4X2_PIXELS_QCOM";

case 0x96AE:

return "GL_SHADING_RATE_4X4_PIXELS_QCOM";

+ case 0x96BC:

+ return "GL_VARIABLE_RASTERIZATION_RATE_ANGLE";

+ case 0x96BD:

+ return "GL_METAL_RASTERIZATION_RATE_MAP_BINDING_ANGLE";

case 0x96E0:

return "GL_MAX_PIXEL_LOCAL_STORAGE_PLANES_ANGLE";

case 0x96E1:

@@ -21945,6 +21949,7 @@ static StringEnumEntry g_stringEnumTable[] = {

{"GL_MESH_SUBROUTINE_UNIFORM_NV", 0x957E},

{"GL_MESH_VERTICES_OUT_NV", 0x9579},

{"GL_MESH_WORK_GROUP_SIZE_NV", 0x953E},

+ {"GL_METAL_RASTERIZATION_RATE_MAP_BINDING_ANGLE", 0x96BD},

{"GL_MIN", 0x8007},

{"GL_MINMAX", 0x802E},

{"GL_MINMAX_EXT", 0x802E},

@@ -24579,6 +24584,7 @@ static StringEnumEntry g_stringEnumTable[] = {

{"GL_VARIABLE_E_NV", 0x8527},

{"GL_VARIABLE_F_NV", 0x8528},

{"GL_VARIABLE_G_NV", 0x8529},

+ {"GL_VARIABLE_RASTERIZATION_RATE_ANGLE", 0x96BC},

{"GL_VARIANT_ARRAY_EXT", 0x87E8},

{"GL_VARIANT_ARRAY_POINTER_EXT", 0x87E9},

{"GL_VARIANT_ARRAY_STRIDE_EXT", 0x87E6},

diff --git a/src/common/utilities.cpp b/src/common/utilities.cpp

index 34826b4755..2e03a110de 100644

--- a/src/common/utilities.cpp

+++ b/src/common/utilities.cpp

@@ -6,6 +6,12 @@

// utilities.cpp: Conversion functions and other utility routines.

+// Older clang versions have a false positive on this warning here.

+// TODO(dino): Is this still necessary?

+#if defined(__clang__)

+# pragma clang diagnostic ignored "-Wglobal-constructors"

+#endif

#include "common/utilities.h"

#include "GLES3/gl3.h"

#include "common/mathutil.h"

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp

index 5dd9065894..1f7012ce63 100644

--- a/src/libANGLE/Context.cpp

+++ b/src/libANGLE/Context.cpp

@@ -9903,6 +9903,12 @@ void Context::textureFoveationParameters(TextureID texturePacked,

state::ExtendedDirtyBitType::EXTENDED_DIRTY_BIT_FOVEATED_RENDERING);

}

+void Context::bindMetalRasterizationRateMap(GLMTLRasterizationRateMapANGLE map)

+ ANGLE_CONTEXT_TRY(mImplementation->bindMetalRasterizationRateMap(this, map));

+ getMutablePrivateState()->setVariableRasterizationRateMap(map);

// ErrorSet implementation.

ErrorSet::ErrorSet(Debug *debug,

const angle::FrontendFeatures &frontendFeatures,

diff --git a/src/libANGLE/Context_gles_ext_autogen.h b/src/libANGLE/Context_gles_ext_autogen.h

index 8fb78d9035..112e232672 100644

--- a/src/libANGLE/Context_gles_ext_autogen.h

+++ b/src/libANGLE/Context_gles_ext_autogen.h

@@ -617,6 +617,8 @@

void invalidateTexture(TextureType targetPacked); \

/* GL_ANGLE_texture_multisample */ \

/* GL_ANGLE_texture_rectangle */ \

+ /* GL_ANGLE_variable_rasterization_rate_metal */ \

+ void bindMetalRasterizationRateMap(GLMTLRasterizationRateMapANGLE map); \

/* GL_ANGLE_vulkan_image */ \

void acquireTextures(GLuint numTextures, const TextureID *texturesPacked, \

const GLenum *layouts); \

diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp

index 6b0adeba62..e88b156487 100644

--- a/src/libANGLE/State.cpp

+++ b/src/libANGLE/State.cpp

@@ -6,6 +6,9 @@

// State.cpp: Implements the State class, encapsulating raw GL state.

+// Older clang versions have a false positive on this warning here.

+#pragma clang diagnostic ignored "-Wglobal-constructors"

#include "libANGLE/State.h"

#include <string.h>

@@ -369,6 +372,8 @@ PrivateState::PrivateState(const EGLenum clientType,

mLogicOp(LogicalOperation::Copy),

mPatchVertices(3),

mPixelLocalStorageActivePlanes(0),

+ mVariableRasterizationRateEnabled(false),

+ mVariableRasterizationRateMap(nullptr),

mNoSimultaneousConstantColorAndAlphaBlendFunc(false),

mSetBlendIndexedInvoked(false),

mSetBlendFactorsIndexedInvoked(false),

@@ -1231,6 +1236,26 @@ void PrivateState::setLogicOp(LogicalOperation opcode)

}

+void PrivateState::setVariableRasterizationRateEnabled(bool enabled)

+ if (mVariableRasterizationRateEnabled != enabled)

+ {

+ mVariableRasterizationRateEnabled = enabled;

+ mDirtyBits.set(state::DIRTY_BIT_EXTENDED);

+ mExtendedDirtyBits.set(state::EXTENDED_DIRTY_BIT_VARIABLE_RASTERIZATION_RATE);

+ }

+void PrivateState::setVariableRasterizationRateMap(GLMTLRasterizationRateMapANGLE map)

+ if (mVariableRasterizationRateMap != map)

+ {

+ mVariableRasterizationRateMap = map;

+ mDirtyBits.set(state::DIRTY_BIT_EXTENDED);

+ mExtendedDirtyBits.set(state::EXTENDED_DIRTY_BIT_VARIABLE_RASTERIZATION_RATE);

+ }

void PrivateState::setVertexAttribf(GLuint index, const GLfloat values[4])

{