wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-27 01:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1354 - Cherry-pick ANGLE update for broken drivers that support

Browse source 
required indexing but not the extensions.
This commit is contained in:
wolfbeast 2020-01-16 01:31:47 +01:00 • committed by Roy Tam
commit 5b8610f989
2 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gfx/angle/src/compiler/translator/TranslatorGLSL.cpp
View file

@ -240,20 +240,14 @@ void TranslatorGLSL::writeExtensionBehavior(TIntermNode *root)
} }
// Need to enable gpu_shader5 to have index constant sampler array indexing // Need to enable gpu_shader5 to have index constant sampler array indexing
if (getOutputType() != SH_ESSL_OUTPUT && getOutputType() < SH_GLSL_400_CORE_OUTPUT) if (getOutputType() != SH_ESSL_OUTPUT && getOutputType() < SH_GLSL_400_CORE_OUTPUT &&
getShaderVersion() == 100)
{ {
sink << "#extension GL_ARB_gpu_shader5 : "; // Don't use "require" to avoid breaking WebGL 1 on drivers that silently
// support index constant sampler array indexing, but don't have the extension or
// Don't use "require" on WebGL 1 to avoid breaking WebGL on drivers that silently // on drivers that don't have the extension at all as it would break WebGL 1 for
// support index constant sampler array indexing, but don't have the extension. // some users.
if (getShaderVersion() >= 300) sink << "#extension GL_ARB_gpu_shader5 : enable\n";
{
sink << "require\n";
}
else
{
sink << "enable\n";
}
} }
TExtensionGLSL extensionGLSL(getOutputType()); TExtensionGLSL extensionGLSL(getOutputType());

15
gfx/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp
View file

@ -543,16 +543,11 @@ void GenerateCaps(const FunctionsGL *functions, gl::Caps *caps, gl::TextureCapsM
LimitVersion(maxSupportedESVersion, gl::Version(2, 0)); LimitVersion(maxSupportedESVersion, gl::Version(2, 0));
} }
// Check if index constant sampler array indexing is supported // Non-constant sampler array indexing is required for OpenGL ES 2 and OpenGL ES after 3.2.
if (!functions->isAtLeastGL(gl::Version(4, 0)) && // However having it available on OpenGL ES 2 is a specification bug, and using this
!functions->isAtLeastGLES(gl::Version(2, 0)) && // indexing in WebGL is undefined. Requiring this feature would break WebGL 1 for some users
!functions->hasExtension("GL_ARB_gpu_shader5")) // so we don't check for it. (it is present with ESSL 100, ESSL >= 320, GLSL >= 400 and
{ // GL_ARB_gpu_shader5)
// This should also be required for ES2 but there are some driver support index constant
// sampler array indexing without meeting the requirements above. Don't limit their ES
// version as it would break WebGL for some users.
LimitVersion(maxSupportedESVersion, gl::Version(2, 0));
}
// Check if sampler objects are supported // Check if sampler objects are supported
if (!functions->isAtLeastGL(gl::Version(3, 3)) && if (!functions->isAtLeastGL(gl::Version(3, 3)) &&