Title: [269318] branches/safari-610-branch/Source/ThirdParty/ANGLE
- Revision
- 269318
- Author
- [email protected]
- Date
- 2020-11-03 11:14:14 -0800 (Tue, 03 Nov 2020)
Log Message
Cherry-pick r267770. rdar://problem/70970346
Fix EXT_color_buffer_half_float on iOS
https://bugs.webkit.org/show_bug.cgi?id=217107
Reviewed by Kenneth Russell.
* src/libANGLE/Context.cpp:
(gl::Context::generateSupportedExtensions const):
* src/libANGLE/renderer/gl/renderergl_utils.cpp:
(rx::nativegl_gl::GenerateTextureFormatCaps):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267770 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610-branch/Source/ThirdParty/ANGLE/ChangeLog (269317 => 269318)
--- branches/safari-610-branch/Source/ThirdParty/ANGLE/ChangeLog 2020-11-03 19:14:11 UTC (rev 269317)
+++ branches/safari-610-branch/Source/ThirdParty/ANGLE/ChangeLog 2020-11-03 19:14:14 UTC (rev 269318)
@@ -1,5 +1,34 @@
2020-11-02 Alan Coon <[email protected]>
+ Cherry-pick r267770. rdar://problem/70970346
+
+ Fix EXT_color_buffer_half_float on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=217107
+
+ Reviewed by Kenneth Russell.
+
+ * src/libANGLE/Context.cpp:
+ (gl::Context::generateSupportedExtensions const):
+ * src/libANGLE/renderer/gl/renderergl_utils.cpp:
+ (rx::nativegl_gl::GenerateTextureFormatCaps):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267770 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-09-29 James Darpinian <[email protected]>
+
+ Fix EXT_color_buffer_half_float on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=217107
+
+ Reviewed by Kenneth Russell.
+
+ * src/libANGLE/Context.cpp:
+ (gl::Context::generateSupportedExtensions const):
+ * src/libANGLE/renderer/gl/renderergl_utils.cpp:
+ (rx::nativegl_gl::GenerateTextureFormatCaps):
+
+2020-11-02 Alan Coon <[email protected]>
+
Cherry-pick r266364. rdar://problem/70970205
Implement WEBGL_compressed_texture_s3tc_srgb extension
Modified: branches/safari-610-branch/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp (269317 => 269318)
--- branches/safari-610-branch/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp 2020-11-03 19:14:11 UTC (rev 269317)
+++ branches/safari-610-branch/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp 2020-11-03 19:14:14 UTC (rev 269318)
@@ -3192,7 +3192,7 @@
// We require colorBufferFloat to be present in order to enable colorBufferHalfFloat, so
// that blitting is always allowed if the requested formats are exposed and have the correct
// feature capabilities
- if (!supportedExtensions.colorBufferFloat)
+ if (!supportedExtensions.colorBufferFloat && !mWebGLContext)
{
supportedExtensions.colorBufferHalfFloat = false;
}
Modified: branches/safari-610-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp (269317 => 269318)
--- branches/safari-610-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp 2020-11-03 19:14:11 UTC (rev 269317)
+++ branches/safari-610-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp 2020-11-03 19:14:14 UTC (rev 269318)
@@ -288,6 +288,18 @@
textureCaps.blendable = textureCaps.renderbuffer || textureCaps.textureAttachment;
// Do extra renderability validation for some formats.
+ if (internalFormat == GL_R16F || internalFormat == GL_RG16F || internalFormat == GL_RGB16F)
+ {
+ // SupportRequirement can't currently express a condition of the form (version && extension)
+ // || other extensions, so do the (version && extension) part here.
+ if (functions->isAtLeastGLES(gl::Version(3, 0)) &&
+ functions->hasGLESExtension("GL_EXT_color_buffer_half_float"))
+ {
+ textureCaps.textureAttachment = true;
+ textureCaps.renderbuffer = true;
+ }
+ }
+
// We require GL_RGBA16F is renderable to expose EXT_color_buffer_half_float but we can't know
// if the format is supported unless we try to create a framebuffer.
if (internalFormat == GL_RGBA16F)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
