From f508d0017821905648958f0bde420b87c04ff23c Mon Sep 17 00:00:00 2001 From: roytam1 Date: Sun, 15 Oct 2023 22:22:41 +0800 Subject: [PATCH] ported from mozilla: Bug 1446548 - Treat all GLSL versions >=450 as 450. r=kvark, a=RyanVM (43f0d1060e) --- dom/canvas/WebGLShaderValidator.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dom/canvas/WebGLShaderValidator.cpp b/dom/canvas/WebGLShaderValidator.cpp index bf2df82f71..7ea9f11a70 100644 --- a/dom/canvas/WebGLShaderValidator.cpp +++ b/dom/canvas/WebGLShaderValidator.cpp @@ -9,6 +9,7 @@ #include "angle/ShaderLang.h" #include "gfxPrefs.h" #include "GLContext.h" +#include "mozilla/gfx/Logging.h" #include "mozilla/Preferences.h" #include "MurmurHash3.h" #include "nsPrintfCString.h" @@ -135,9 +136,13 @@ ShaderOutput(gl::GLContext* gl) case 420: return SH_GLSL_420_CORE_OUTPUT; case 430: return SH_GLSL_430_CORE_OUTPUT; case 440: return SH_GLSL_440_CORE_OUTPUT; - case 450: return SH_GLSL_450_CORE_OUTPUT; default: - MOZ_ASSERT(false, "GFX: Unexpected GLSL version."); + if (version >= 450) { + // "OpenGL 4.6 is also guaranteed to support all previous versions of the + // OpenGL Shading Language back to version 1.10." + return SH_GLSL_450_CORE_OUTPUT; + } + gfxCriticalNote << "Unexpected GLSL version: " << version; } }