Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1684638 - Remove 'else' after 'return' in dom/canvas/WebGLShaderValidator.cpp. r=jgilbert

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D100645
This commit is contained in:
nirmay 2021-01-04 04:51:45 +00:00
parent 8dbf596048
commit f7895c0e34
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
dom/canvas/WebGLShaderValidator.cpp
View File

@ -101,39 +101,38 @@ static ShCompileOptions ChooseValidatorCompileOptions(
static ShShaderOutput ShaderOutput(gl::GLContext* gl) { static ShShaderOutput ShaderOutput(gl::GLContext* gl) {
if (gl->IsGLES()) { if (gl->IsGLES()) {
return SH_ESSL_OUTPUT; return SH_ESSL_OUTPUT;
} else { }
uint32_t version = gl->ShadingLanguageVersion(); uint32_t version = gl->ShadingLanguageVersion();
switch (version) { switch (version) {
case 100: case 100:
return SH_GLSL_COMPATIBILITY_OUTPUT; return SH_GLSL_COMPATIBILITY_OUTPUT;
case 120: case 120:
return SH_GLSL_COMPATIBILITY_OUTPUT; return SH_GLSL_COMPATIBILITY_OUTPUT;
case 130: case 130:
return SH_GLSL_130_OUTPUT; return SH_GLSL_130_OUTPUT;
case 140: case 140:
return SH_GLSL_140_OUTPUT; return SH_GLSL_140_OUTPUT;
case 150: case 150:
return SH_GLSL_150_CORE_OUTPUT; return SH_GLSL_150_CORE_OUTPUT;
case 330: case 330:
return SH_GLSL_330_CORE_OUTPUT; return SH_GLSL_330_CORE_OUTPUT;
case 400: case 400:
return SH_GLSL_400_CORE_OUTPUT; return SH_GLSL_400_CORE_OUTPUT;
case 410: case 410:
return SH_GLSL_410_CORE_OUTPUT; return SH_GLSL_410_CORE_OUTPUT;
case 420: case 420:
return SH_GLSL_420_CORE_OUTPUT; return SH_GLSL_420_CORE_OUTPUT;
case 430: case 430:
return SH_GLSL_430_CORE_OUTPUT; return SH_GLSL_430_CORE_OUTPUT;
case 440: case 440:
return SH_GLSL_440_CORE_OUTPUT; return SH_GLSL_440_CORE_OUTPUT;
default: default:
if (version >= 450) { if (version >= 450) {
// "OpenGL 4.6 is also guaranteed to support all previous versions of // "OpenGL 4.6 is also guaranteed to support all previous versions of
// the OpenGL Shading Language back to version 1.10." // the OpenGL Shading Language back to version 1.10."
return SH_GLSL_450_CORE_OUTPUT; return SH_GLSL_450_CORE_OUTPUT;
} }
gfxCriticalNote << "Unexpected GLSL version: " << version; gfxCriticalNote << "Unexpected GLSL version: " << version;
}
} }
return SH_GLSL_COMPATIBILITY_OUTPUT; return SH_GLSL_COMPATIBILITY_OUTPUT;