Skip to content

A
angle
Commit e7fcf1e3 by Geoff Lang
Options

Revert "Enable needed extensions in generated GLSL shaders and call them when possible."

This reverts commit 233b3342. Change-Id: Id99024b736324ad030ce63c5d0baae32b6d7f54b Reviewed-on: https://chromium-review.googlesource.com/311181Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 21f76c20
Showing with 93 additions and 275 deletions
src/compiler.gypi
...@@ -43,8 +43,6 @@ ...@@ -43,8 +43,6 @@
'compiler/translator/EmulatePrecision.cpp', 'compiler/translator/EmulatePrecision.cpp',
'compiler/translator/EmulatePrecision.h', 'compiler/translator/EmulatePrecision.h',
'compiler/translator/ExtensionBehavior.h', 'compiler/translator/ExtensionBehavior.h',
'compiler/translator/ExtensionGLSL.cpp',
'compiler/translator/ExtensionGLSL.h',
'compiler/translator/FlagStd140Structs.cpp', 'compiler/translator/FlagStd140Structs.cpp',
'compiler/translator/FlagStd140Structs.h', 'compiler/translator/FlagStd140Structs.h',
'compiler/translator/ForLoopUnroll.cpp', 'compiler/translator/ForLoopUnroll.cpp',
......
src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
...@@ -49,141 +49,117 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator ...@@ -49,141 +49,117 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
const TType *float2 = TCache::getType(EbtFloat, 2); const TType *float2 = TCache::getType(EbtFloat, 2);
const TType *uint1 = TCache::getType(EbtUInt); const TType *uint1 = TCache::getType(EbtUInt);
// clang-format off
emu->addEmulatedFunction(EOpPackSnorm2x16, float2, emu->addEmulatedFunction(EOpPackSnorm2x16, float2,
"uint webgl_packSnorm2x16_emu(vec2 v)\n" "uint webgl_packSnorm2x16_emu(vec2 v)\n"
"{\n" "{\n"
" #if GL_ARB_shading_language_packing\n" " int x = int(round(clamp(v.x, -1.0, 1.0) * 32767.0));\n"
" return packSnorm2x16(v);\n" " int y = int(round(clamp(v.y, -1.0, 1.0) * 32767.0));\n"
" #else\n" " return uint((y << 16) | (x & 0xFFFF));\n"
" int x = int(round(clamp(v.x, -1.0, 1.0) * 32767.0));\n"
" int y = int(round(clamp(v.y, -1.0, 1.0) * 32767.0));\n"
" return uint((y << 16) | (x & 0xFFFF));\n"
" #endif\n"
"}\n"); "}\n");
emu->addEmulatedFunction(EOpUnpackSnorm2x16, uint1, emu->addEmulatedFunction(EOpUnpackSnorm2x16, uint1,
"#if !GL_ARB_shading_language_packing\n" "float webgl_fromSnorm(uint x)\n"
" float webgl_fromSnorm(uint x)\n" "{\n"
" {\n" " int xi = (int(x) & 0x7FFF) - (int(x) & 0x8000);\n"
" int xi = (int(x) & 0x7FFF) - (int(x) & 0x8000);\n" " return clamp(float(xi) / 32767.0, -1.0, 1.0);\n"
" return clamp(float(xi) / 32767.0, -1.0, 1.0);\n" "}\n"
" }\n"
"#endif\n"
"\n" "\n"
"vec2 webgl_unpackSnorm2x16_emu(uint u)\n" "vec2 webgl_unpackSnorm2x16_emu(uint u)\n"
"{\n" "{\n"
" #if GL_ARB_shading_language_packing\n" " uint y = (u >> 16);\n"
" return unpackSnorm2x16(u);\n" " uint x = u;\n"
" #else\n" " return vec2(webgl_fromSnorm(x), webgl_fromSnorm(y));\n"
" uint y = (u >> 16);\n"
" uint x = u;\n"
" return vec2(webgl_fromSnorm(x), webgl_fromSnorm(y));\n"
" #endif\n"
"}\n"); "}\n");
// Functions uint webgl_f32tof16(float val) and float webgl_f16tof32(uint val) are // Functions uint webgl_f32tof16(float val) and float webgl_f16tof32(uint val) are
// based on the OpenGL redbook Appendix Session "Floating-Point Formats Used in OpenGL". // based on the OpenGL redbook Appendix Session "Floating-Point Formats Used in OpenGL".
emu->addEmulatedFunction(EOpPackHalf2x16, float2, emu->addEmulatedFunction(EOpPackHalf2x16, float2,
"#if !GL_ARB_shading_language_packing\n" "uint webgl_f32tof16(float val)\n"
" uint webgl_f32tof16(float val)\n" "{\n"
" uint f32 = floatBitsToUint(val);\n"
" uint f16 = 0u;\n"
" uint sign = (f32 >> 16) & 0x8000u;\n"
" int exponent = int((f32 >> 23) & 0xFFu) - 127;\n"
" uint mantissa = f32 & 0x007FFFFFu;\n"
" if (exponent == 128)\n"
" {\n" " {\n"
" uint f32 = floatBitsToUint(val);\n" " // Infinity or NaN\n"
" uint f16 = 0u;\n" " // NaN bits that are masked out by 0x3FF get discarded.\n"
" uint sign = (f32 >> 16) & 0x8000u;\n" " // This can turn some NaNs to infinity, but this is allowed by the spec.\n"
" int exponent = int((f32 >> 23) & 0xFFu) - 127;\n" " f16 = sign | (0x1Fu << 10);\n"
" uint mantissa = f32 & 0x007FFFFFu;\n" " f16 |= (mantissa & 0x3FFu);\n"
" if (exponent == 128)\n" " }\n"
" {\n" " else if (exponent > 15)\n"
" // Infinity or NaN\n" " {\n"
" // NaN bits that are masked out by 0x3FF get discarded.\n" " // Overflow - flush to Infinity\n"
" // This can turn some NaNs to infinity, but this is allowed by the spec.\n" " f16 = sign | (0x1Fu << 10);\n"
" f16 = sign | (0x1Fu << 10);\n" " }\n"
" f16 |= (mantissa & 0x3FFu);\n" " else if (exponent > -15)\n"
" }\n" " {\n"
" else if (exponent > 15)\n" " // Representable value\n"
" {\n" " exponent += 15;\n"
" // Overflow - flush to Infinity\n" " mantissa >>= 13;\n"
" f16 = sign | (0x1Fu << 10);\n" " f16 = sign | uint(exponent << 10) | mantissa;\n"
" }\n"
" else if (exponent > -15)\n"
" {\n"
" // Representable value\n"
" exponent += 15;\n"
" mantissa >>= 13;\n"
" f16 = sign | uint(exponent << 10) | mantissa;\n"
" }\n"
" else\n"
" {\n"
" f16 = sign;\n"
" }\n"
" return f16;\n"
" }\n" " }\n"
"#endif\n" " else\n"
" {\n"
" f16 = sign;\n"
" }\n"
" return f16;\n"
"}\n"
"\n" "\n"
"uint webgl_packHalf2x16_emu(vec2 v)\n" "uint webgl_packHalf2x16_emu(vec2 v)\n"
"{\n" "{\n"
" #if GL_ARB_shading_language_packing\n" " uint x = webgl_f32tof16(v.x);\n"
" return packHalf2x16(v);\n" " uint y = webgl_f32tof16(v.y);\n"
" #else\n" " return (y << 16) | x;\n"
" uint x = webgl_f32tof16(v.x);\n"
" uint y = webgl_f32tof16(v.y);\n"
" return (y << 16) | x;\n"
" #endif\n"
"}\n"); "}\n");
emu->addEmulatedFunction(EOpUnpackHalf2x16, uint1, emu->addEmulatedFunction(EOpUnpackHalf2x16, uint1,
"#if !GL_ARB_shading_language_packing\n" "float webgl_f16tof32(uint val)\n"
" float webgl_f16tof32(uint val)\n" "{\n"
" uint sign = (val & 0x8000u) << 16;\n"
" int exponent = int((val & 0x7C00u) >> 10);\n"
" uint mantissa = val & 0x03FFu;\n"
" float f32 = 0.0;\n"
" if(exponent == 0)\n"
" {\n" " {\n"
" uint sign = (val & 0x8000u) << 16;\n" " if (mantissa != 0u)\n"
" int exponent = int((val & 0x7C00u) >> 10);\n"
" uint mantissa = val & 0x03FFu;\n"
" float f32 = 0.0;\n"
" if(exponent == 0)\n"
" {\n"
" if (mantissa != 0u)\n"
" {\n"
" const float scale = 1.0 / (1 << 24);\n"
" f32 = scale * mantissa;\n"
" }\n"
" }\n"
" else if (exponent == 31)\n"
" {\n"
" return uintBitsToFloat(sign | 0x7F800000u | mantissa);\n"
" }\n"
" else\n"
" {\n"
" exponent -= 15;\n"
" float scale;\n"
" if(exponent < 0)\n"
" {\n"
" scale = 1.0 / (1 << -exponent);\n"
" }\n"
" else\n"
" {\n"
" scale = 1 << exponent;\n"
" }\n"
" float decimal = 1.0 + float(mantissa) / float(1 << 10);\n"
" f32 = scale * decimal;\n"
" }\n"
"\n"
" if (sign != 0u)\n"
" {\n" " {\n"
" f32 = -f32;\n" " const float scale = 1.0 / (1 << 24);\n"
" f32 = scale * mantissa;\n"
" }\n" " }\n"
" }\n"
" else if (exponent == 31)\n"
" {\n"
" return uintBitsToFloat(sign | 0x7F800000u | mantissa);\n"
" }\n"
" else\n"
" {\n"
" exponent -= 15;\n"
" float scale;\n"
" if(exponent < 0)\n"
" {\n"
" scale = 1.0 / (1 << -exponent);\n"
" }\n"
" else\n"
" {\n"
" scale = 1 << exponent;\n"
" }\n"
" float decimal = 1.0 + float(mantissa) / float(1 << 10);\n"
" f32 = scale * decimal;\n"
" }\n"
"\n" "\n"
" return f32;\n" " if (sign != 0u)\n"
" {\n"
" f32 = -f32;\n"
" }\n" " }\n"
"#endif\n" "\n"
" return f32;\n"
"}\n"
"\n" "\n"
"vec2 webgl_unpackHalf2x16_emu(uint u)\n" "vec2 webgl_unpackHalf2x16_emu(uint u)\n"
"{\n" "{\n"
" #if GL_ARB_shading_language_packing\n" " uint y = (u >> 16);\n"
" return unpackHalf2x16(u);\n" " uint x = u & 0xFFFFu;\n"
" #else\n" " return vec2(webgl_f16tof32(x), webgl_f16tof32(y));\n"
" uint y = (u >> 16);\n"
" uint x = u & 0xFFFFu;\n"
" return vec2(webgl_f16tof32(x), webgl_f16tof32(y));\n"
" #endif\n"
"}\n"); "}\n");
// clang-format on
} }
} }
src/compiler/translator/ExtensionGLSL.cpp deleted 100644 → 0
//
// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ExtensionGLSL.cpp: Implements the TExtensionGLSL class that tracks GLSL extension requirements
// of shaders.
#include "compiler/translator/ExtensionGLSL.h"
#include "compiler/translator/VersionGLSL.h"
TExtensionGLSL::TExtensionGLSL(ShShaderOutput output)
: TIntermTraverser(true, false, false), mTargetVersion(ShaderOutputTypeToGLSLVersion(output))
{
}
const std::set<std::string> &TExtensionGLSL::getEnabledExtensions() const
{
return mEnabledExtensions;
}
const std::set<std::string> &TExtensionGLSL::getRequiredExtensions() const
{
return mRequiredExtensions;
}
bool TExtensionGLSL::visitUnary(Visit, TIntermUnary *node)
{
checkOperator(node);
return true;
}
bool TExtensionGLSL::visitAggregate(Visit, TIntermAggregate *node)
{
checkOperator(node);
return true;
}
void TExtensionGLSL::checkOperator(TIntermOperator *node)
{
if (mTargetVersion < GLSL_VERSION_130)
{
return;
}
switch (node->getOp())
{
case EOpAbs:
break;
case EOpSign:
break;
case EOpMix:
break;
case EOpFloatBitsToInt:
case EOpFloatBitsToUint:
case EOpIntBitsToFloat:
case EOpUintBitsToFloat:
if (mTargetVersion < GLSL_VERSION_330)
{
// Bit conversion functions cannot be emulated.
mRequiredExtensions.insert("GL_ARB_shader_bit_encoding");
}
break;
case EOpPackSnorm2x16:
case EOpPackHalf2x16:
case EOpUnpackSnorm2x16:
case EOpUnpackHalf2x16:
if (mTargetVersion < GLSL_VERSION_420)
{
mEnabledExtensions.insert("GL_ARB_shading_language_packing");
if (mTargetVersion < GLSL_VERSION_330)
{
// floatBitsToUint and uintBitsToFloat are needed to emulate
// packHalf2x16 and unpackHalf2x16 respectively and cannot be
// emulated themselves.
mRequiredExtensions.insert("GL_ARB_shader_bit_encoding");
}
}
break;
case EOpPackUnorm2x16:
case EOpUnpackUnorm2x16:
if (mTargetVersion < GLSL_VERSION_410)
{
mEnabledExtensions.insert("GL_ARB_shading_language_packing");
}
break;
default:
break;
}
}
src/compiler/translator/ExtensionGLSL.h deleted 100644 → 0
//
// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ExtensionGLSL.h: Defines the TExtensionGLSL class that tracks GLSL extension requirements of
// shaders.
#ifndef COMPILER_TRANSLATOR_EXTENSIONGLSL_H_
#define COMPILER_TRANSLATOR_EXTENSIONGLSL_H_
#include <set>
#include <string>
#include "compiler/translator/IntermNode.h"
// Traverses the intermediate tree to determine which GLSL extensions are required
// to support the shader.
class TExtensionGLSL : public TIntermTraverser
{
public:
TExtensionGLSL(ShShaderOutput output);
const std::set<std::string> &getEnabledExtensions() const;
const std::set<std::string> &getRequiredExtensions() const;
bool visitUnary(Visit visit, TIntermUnary *node) override;
bool visitAggregate(Visit visit, TIntermAggregate *node) override;
private:
void checkOperator(TIntermOperator *node);
int mTargetVersion;
std::set<std::string> mEnabledExtensions;
std::set<std::string> mRequiredExtensions;
};
#endif // COMPILER_TRANSLATOR_EXTENSIONGLSL_H_
src/compiler/translator/TranslatorGLSL.cpp
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include "angle_gl.h" #include "angle_gl.h"
#include "compiler/translator/BuiltInFunctionEmulatorGLSL.h" #include "compiler/translator/BuiltInFunctionEmulatorGLSL.h"
#include "compiler/translator/EmulatePrecision.h" #include "compiler/translator/EmulatePrecision.h"
#include "compiler/translator/ExtensionGLSL.h"
#include "compiler/translator/OutputGLSL.h" #include "compiler/translator/OutputGLSL.h"
#include "compiler/translator/VersionGLSL.h" #include "compiler/translator/VersionGLSL.h"
...@@ -40,7 +39,7 @@ void TranslatorGLSL::translate(TIntermNode *root, int compileOptions) ...@@ -40,7 +39,7 @@ void TranslatorGLSL::translate(TIntermNode *root, int compileOptions)
writePragma(); writePragma();
// Write extension behaviour as needed // Write extension behaviour as needed
writeExtensionBehavior(root); writeExtensionBehavior();
bool precisionEmulation = getResources().WEBGL_debug_shader_precision && getPragma().debugShaderPrecision; bool precisionEmulation = getResources().WEBGL_debug_shader_precision && getPragma().debugShaderPrecision;
...@@ -157,35 +156,19 @@ void TranslatorGLSL::writeVersion(TIntermNode *root) ...@@ -157,35 +156,19 @@ void TranslatorGLSL::writeVersion(TIntermNode *root)
} }
} }
void TranslatorGLSL::writeExtensionBehavior(TIntermNode *root) void TranslatorGLSL::writeExtensionBehavior() {
{
TInfoSinkBase& sink = getInfoSink().obj; TInfoSinkBase& sink = getInfoSink().obj;
const TExtensionBehavior& extBehavior = getExtensionBehavior(); const TExtensionBehavior& extBehavior = getExtensionBehavior();
for (const auto &iter : extBehavior) for (TExtensionBehavior::const_iterator iter = extBehavior.begin();
{ iter != extBehavior.end(); ++iter) {
if (iter.second == EBhUndefined) if (iter->second == EBhUndefined)
{
continue; continue;
}
// For GLSL output, we don't need to emit most extensions explicitly, // For GLSL output, we don't need to emit most extensions explicitly,
// but some we need to translate. // but some we need to translate.
if (iter.first == "GL_EXT_shader_texture_lod") if (iter->first == "GL_EXT_shader_texture_lod") {
{ sink << "#extension GL_ARB_shader_texture_lod : "
sink << "#extension GL_ARB_shader_texture_lod : " << getBehaviorString(iter.second) << getBehaviorString(iter->second) << "\n";
<< "\n";
} }
} }
TExtensionGLSL extensionGLSL(getOutputType());
root->traverse(&extensionGLSL);
for (const auto &ext : extensionGLSL.getEnabledExtensions())
{
sink << "#extension " << ext << " : enable\n";
}
for (const auto &ext : extensionGLSL.getRequiredExtensions())
{
sink << "#extension " << ext << " : require\n";
}
} }
src/compiler/translator/TranslatorGLSL.h
...@@ -21,7 +21,7 @@ class TranslatorGLSL : public TCompiler ...@@ -21,7 +21,7 @@ class TranslatorGLSL : public TCompiler
private: private:
void writeVersion(TIntermNode *root); void writeVersion(TIntermNode *root);
void writeExtensionBehavior(TIntermNode *root); void writeExtensionBehavior();
}; };
#endif // COMPILER_TRANSLATOR_TRANSLATORGLSL_H_ #endif // COMPILER_TRANSLATOR_TRANSLATORGLSL_H_
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