Commit f16fd9ea by Peng Huang Committed by Commit Bot

Only enable framebufferMultisample with framebufferBlitANGLE

Based on [1], GL_ANGLE_framebuffer_multisample requires GL_ANGLE_framebuffer_blit, so only enable framebufferMultisample with framebufferBlitANGLE. [1] https://www.khronos.org/registry/OpenGL/extensions/ANGLE/ANGLE_framebuffer_multisample.txt Bug: chromium:1192060 Change-Id: I44e8310d5a94578c0bb7e1d30a7276657965366c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2785394Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Peng Huang <penghuang@chromium.org>
parent 37d9a2f4
...@@ -1375,7 +1375,7 @@ void GenerateCaps(const FunctionsGL *functions, ...@@ -1375,7 +1375,7 @@ void GenerateCaps(const FunctionsGL *functions,
functions->hasGLESExtension("GL_NV_framebuffer_blit"); functions->hasGLESExtension("GL_NV_framebuffer_blit");
extensions->framebufferBlitANGLE = extensions->framebufferBlitANGLE =
extensions->framebufferBlitNV || functions->hasGLESExtension("GL_ANGLE_framebuffer_blit"); extensions->framebufferBlitNV || functions->hasGLESExtension("GL_ANGLE_framebuffer_blit");
extensions->framebufferMultisample = caps->maxSamples > 0; extensions->framebufferMultisample = extensions->framebufferBlitANGLE && caps->maxSamples > 0;
extensions->standardDerivativesOES = functions->isAtLeastGL(gl::Version(2, 0)) || extensions->standardDerivativesOES = functions->isAtLeastGL(gl::Version(2, 0)) ||
functions->hasGLExtension("GL_ARB_fragment_shader") || functions->hasGLExtension("GL_ARB_fragment_shader") ||
functions->hasGLESExtension("GL_OES_standard_derivatives"); functions->hasGLESExtension("GL_OES_standard_derivatives");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment