Skip to content

A
angle
Commit c634a637 by Olli Etuaho Committed by Commit Bot
Options

Remove webgl_ prefix from emulated function names

The prefix is unnecessary now that user-defined names are prefixed in both GLSL and HLSL output. Removing the prefix makes compiler output a bit simpler to read. BUG=angleproject:2038 TEST=angle_unittests Change-Id: I9ffc508f50d6146a2d85798875c88e2c385b83fe Reviewed-on: https://chromium-review.googlesource.com/508730Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent af11b53a
Showing with 74 additions and 74 deletions
src/compiler/translator/BuiltInFunctionEmulator.cpp
...@@ -45,7 +45,7 @@ class BuiltInFunctionEmulator::BuiltInFunctionEmulationMarker : public TIntermTr ...@@ -45,7 +45,7 @@ class BuiltInFunctionEmulator::BuiltInFunctionEmulationMarker : public TIntermTr
} }
const TIntermSequence &sequence = *(node->getSequence()); const TIntermSequence &sequence = *(node->getSequence());
bool needToEmulate = false; bool needToEmulate = false;
// Right now we only handle built-in functions with two or three parameters. // Right now we only handle built-in functions with two to four parameters.
if (sequence.size() == 2) if (sequence.size() == 2)
{ {
TIntermTyped *param1 = sequence[0]->getAsTyped(); TIntermTyped *param1 = sequence[0]->getAsTyped();
...@@ -281,7 +281,7 @@ void BuiltInFunctionEmulator::addFunctionMap(BuiltinQueryFunc queryFunc) ...@@ -281,7 +281,7 @@ void BuiltInFunctionEmulator::addFunctionMap(BuiltinQueryFunc queryFunc)
void BuiltInFunctionEmulator::WriteEmulatedFunctionName(TInfoSinkBase &out, const char *name) void BuiltInFunctionEmulator::WriteEmulatedFunctionName(TInfoSinkBase &out, const char *name)
{ {
ASSERT(name[strlen(name) - 1] != '('); ASSERT(name[strlen(name) - 1] != '(');
out << "webgl_" << name << "_emu"; out << name << "_emu";
} }
FunctionId::FunctionId() FunctionId::FunctionId()
......
src/compiler/translator/BuiltInFunctionEmulator.h
...@@ -99,7 +99,7 @@ class BuiltInFunctionEmulator ...@@ -99,7 +99,7 @@ class BuiltInFunctionEmulator
void cleanup(); void cleanup();
// "name" gets written as "webgl_name_emu". // "name" gets written as "name_emu".
static void WriteEmulatedFunctionName(TInfoSinkBase &out, const char *name); static void WriteEmulatedFunctionName(TInfoSinkBase &out, const char *name);
bool isOutputEmpty() const; bool isOutputEmpty() const;
......
src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
...@@ -20,7 +20,7 @@ void InitBuiltInAbsFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator *e ...@@ -20,7 +20,7 @@ void InitBuiltInAbsFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator *e
if (shaderType == GL_VERTEX_SHADER) if (shaderType == GL_VERTEX_SHADER)
{ {
const TType *int1 = TCache::getType(EbtInt); const TType *int1 = TCache::getType(EbtInt);
emu->addEmulatedFunction(EOpAbs, int1, "int webgl_abs_emu(int x) { return x * sign(x); }"); emu->addEmulatedFunction(EOpAbs, int1, "int abs_emu(int x) { return x * sign(x); }");
} }
} }
...@@ -39,10 +39,10 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator ...@@ -39,10 +39,10 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator
// !(x > 0.0 || x < 0.0 || x == 0.0) will be optimized and always equal to false. // !(x > 0.0 || x < 0.0 || x == 0.0) will be optimized and always equal to false.
emu->addEmulatedFunction( emu->addEmulatedFunction(
EOpIsNan, float1, EOpIsNan, float1,
"bool webgl_isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? false : x != 0.0; }"); "bool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? false : x != 0.0; }");
emu->addEmulatedFunction( emu->addEmulatedFunction(
EOpIsNan, float2, EOpIsNan, float2,
"bvec2 webgl_isnan_emu(vec2 x)\n" "bvec2 isnan_emu(vec2 x)\n"
"{\n" "{\n"
" bvec2 isnan;\n" " bvec2 isnan;\n"
" for (int i = 0; i < 2; i++)\n" " for (int i = 0; i < 2; i++)\n"
...@@ -53,7 +53,7 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator ...@@ -53,7 +53,7 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator
"}\n"); "}\n");
emu->addEmulatedFunction( emu->addEmulatedFunction(
EOpIsNan, float3, EOpIsNan, float3,
"bvec3 webgl_isnan_emu(vec3 x)\n" "bvec3 isnan_emu(vec3 x)\n"
"{\n" "{\n"
" bvec3 isnan;\n" " bvec3 isnan;\n"
" for (int i = 0; i < 3; i++)\n" " for (int i = 0; i < 3; i++)\n"
...@@ -64,7 +64,7 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator ...@@ -64,7 +64,7 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator
"}\n"); "}\n");
emu->addEmulatedFunction( emu->addEmulatedFunction(
EOpIsNan, float4, EOpIsNan, float4,
"bvec4 webgl_isnan_emu(vec4 x)\n" "bvec4 isnan_emu(vec4 x)\n"
"{\n" "{\n"
" bvec4 isnan;\n" " bvec4 isnan;\n"
" for (int i = 0; i < 4; i++)\n" " for (int i = 0; i < 4; i++)\n"
...@@ -80,7 +80,7 @@ void InitBuiltInAtanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator * ...@@ -80,7 +80,7 @@ void InitBuiltInAtanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator *
const TType *float1 = TCache::getType(EbtFloat); const TType *float1 = TCache::getType(EbtFloat);
auto floatFuncId = emu->addEmulatedFunction( auto floatFuncId = emu->addEmulatedFunction(
EOpAtan, float1, float1, EOpAtan, float1, float1,
"webgl_emu_precision float webgl_atan_emu(webgl_emu_precision float y, webgl_emu_precision " "emu_precision float atan_emu(emu_precision float y, emu_precision "
"float x)\n" "float x)\n"
"{\n" "{\n"
" if (x > 0.0) return atan(y / x);\n" " if (x > 0.0) return atan(y / x);\n"
...@@ -92,14 +92,14 @@ void InitBuiltInAtanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator * ...@@ -92,14 +92,14 @@ void InitBuiltInAtanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator *
{ {
const TType *floatVec = TCache::getType(EbtFloat, static_cast<unsigned char>(dim)); const TType *floatVec = TCache::getType(EbtFloat, static_cast<unsigned char>(dim));
std::stringstream ss; std::stringstream ss;
ss << "webgl_emu_precision vec" << dim << " webgl_atan_emu(webgl_emu_precision vec" << dim ss << "emu_precision vec" << dim << " atan_emu(emu_precision vec" << dim
<< " y, webgl_emu_precision vec" << dim << " x)\n" << " y, emu_precision vec" << dim << " x)\n"
"{\n" << "{\n"
" return vec" " return vec"
<< dim << "("; << dim << "(";
for (int i = 0; i < dim; ++i) for (int i = 0; i < dim; ++i)
{ {
ss << "webgl_atan_emu(y[" << i << "], x[" << i << "])"; ss << "atan_emu(y[" << i << "], x[" << i << "])";
if (i < dim - 1) if (i < dim - 1)
{ {
ss << ", "; ss << ", ";
...@@ -125,7 +125,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator ...@@ -125,7 +125,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
// clang-format off // clang-format off
emu->addEmulatedFunction(EOpPackUnorm2x16, float2, emu->addEmulatedFunction(EOpPackUnorm2x16, float2,
"uint webgl_packUnorm2x16_emu(vec2 v)\n" "uint packUnorm2x16_emu(vec2 v)\n"
"{\n" "{\n"
" int x = int(round(clamp(v.x, 0.0, 1.0) * 65535.0));\n" " int x = int(round(clamp(v.x, 0.0, 1.0) * 65535.0));\n"
" int y = int(round(clamp(v.y, 0.0, 1.0) * 65535.0));\n" " int y = int(round(clamp(v.y, 0.0, 1.0) * 65535.0));\n"
...@@ -133,7 +133,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator ...@@ -133,7 +133,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
"}\n"); "}\n");
emu->addEmulatedFunction(EOpUnpackUnorm2x16, uint1, emu->addEmulatedFunction(EOpUnpackUnorm2x16, uint1,
"vec2 webgl_unpackUnorm2x16_emu(uint u)\n" "vec2 unpackUnorm2x16_emu(uint u)\n"
"{\n" "{\n"
" float x = float(u & 0xFFFFu) / 65535.0;\n" " float x = float(u & 0xFFFFu) / 65535.0;\n"
" float y = float(u >> 16) / 65535.0;\n" " float y = float(u >> 16) / 65535.0;\n"
...@@ -151,7 +151,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator ...@@ -151,7 +151,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
// clang-format off // clang-format off
emu->addEmulatedFunction(EOpPackSnorm2x16, float2, emu->addEmulatedFunction(EOpPackSnorm2x16, float2,
"uint webgl_packSnorm2x16_emu(vec2 v)\n" "uint packSnorm2x16_emu(vec2 v)\n"
"{\n" "{\n"
" #if defined(GL_ARB_shading_language_packing)\n" " #if defined(GL_ARB_shading_language_packing)\n"
" return packSnorm2x16(v);\n" " return packSnorm2x16(v);\n"
...@@ -163,28 +163,28 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator ...@@ -163,28 +163,28 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
"}\n"); "}\n");
emu->addEmulatedFunction(EOpUnpackSnorm2x16, uint1, emu->addEmulatedFunction(EOpUnpackSnorm2x16, uint1,
"#if !defined(GL_ARB_shading_language_packing)\n" "#if !defined(GL_ARB_shading_language_packing)\n"
" float webgl_fromSnorm(uint x)\n" " float 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" "#endif\n"
"\n" "\n"
"vec2 webgl_unpackSnorm2x16_emu(uint u)\n" "vec2 unpackSnorm2x16_emu(uint u)\n"
"{\n" "{\n"
" #if defined(GL_ARB_shading_language_packing)\n" " #if defined(GL_ARB_shading_language_packing)\n"
" return unpackSnorm2x16(u);\n" " return unpackSnorm2x16(u);\n"
" #else\n" " #else\n"
" uint y = (u >> 16);\n" " uint y = (u >> 16);\n"
" uint x = u;\n" " uint x = u;\n"
" return vec2(webgl_fromSnorm(x), webgl_fromSnorm(y));\n" " return vec2(fromSnorm(x), fromSnorm(y));\n"
" #endif\n" " #endif\n"
"}\n"); "}\n");
// Functions uint webgl_f32tof16(float val) and float webgl_f16tof32(uint val) are // Functions uint f32tof16(float val) and float 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 !defined(GL_ARB_shading_language_packing)\n" "#if !defined(GL_ARB_shading_language_packing)\n"
" uint webgl_f32tof16(float val)\n" " uint f32tof16(float val)\n"
" {\n" " {\n"
" uint f32 = floatBitsToUint(val);\n" " uint f32 = floatBitsToUint(val);\n"
" uint f16 = 0u;\n" " uint f16 = 0u;\n"
...@@ -219,19 +219,19 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator ...@@ -219,19 +219,19 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
" }\n" " }\n"
"#endif\n" "#endif\n"
"\n" "\n"
"uint webgl_packHalf2x16_emu(vec2 v)\n" "uint packHalf2x16_emu(vec2 v)\n"
"{\n" "{\n"
" #if defined(GL_ARB_shading_language_packing)\n" " #if defined(GL_ARB_shading_language_packing)\n"
" return packHalf2x16(v);\n" " return packHalf2x16(v);\n"
" #else\n" " #else\n"
" uint x = webgl_f32tof16(v.x);\n" " uint x = f32tof16(v.x);\n"
" uint y = webgl_f32tof16(v.y);\n" " uint y = f32tof16(v.y);\n"
" return (y << 16) | x;\n" " return (y << 16) | x;\n"
" #endif\n" " #endif\n"
"}\n"); "}\n");
emu->addEmulatedFunction(EOpUnpackHalf2x16, uint1, emu->addEmulatedFunction(EOpUnpackHalf2x16, uint1,
"#if !defined(GL_ARB_shading_language_packing)\n" "#if !defined(GL_ARB_shading_language_packing)\n"
" float webgl_f16tof32(uint val)\n" " float f16tof32(uint val)\n"
" {\n" " {\n"
" uint sign = (val & 0x8000u) << 16;\n" " uint sign = (val & 0x8000u) << 16;\n"
" int exponent = int((val & 0x7C00u) >> 10);\n" " int exponent = int((val & 0x7C00u) >> 10);\n"
...@@ -276,14 +276,14 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator ...@@ -276,14 +276,14 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
" }\n" " }\n"
"#endif\n" "#endif\n"
"\n" "\n"
"vec2 webgl_unpackHalf2x16_emu(uint u)\n" "vec2 unpackHalf2x16_emu(uint u)\n"
"{\n" "{\n"
" #if defined(GL_ARB_shading_language_packing)\n" " #if defined(GL_ARB_shading_language_packing)\n"
" return unpackHalf2x16(u);\n" " return unpackHalf2x16(u);\n"
" #else\n" " #else\n"
" uint y = (u >> 16);\n" " uint y = (u >> 16);\n"
" uint x = u & 0xFFFFu;\n" " uint x = u & 0xFFFFu;\n"
" return vec2(webgl_f16tof32(x), webgl_f16tof32(y));\n" " return vec2(f16tof32(x), f16tof32(y));\n"
" #endif\n" " #endif\n"
"}\n"); "}\n");
// clang-format on // clang-format on
......
src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
...@@ -28,7 +28,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator ...@@ -28,7 +28,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator
TType *float4 = new TType(EbtFloat, 4); TType *float4 = new TType(EbtFloat, 4);
emu->addEmulatedFunction(EOpIsNan, float1, emu->addEmulatedFunction(EOpIsNan, float1,
"bool webgl_isnan_emu(float x)\n" "bool isnan_emu(float x)\n"
"{\n" "{\n"
" return (x > 0.0 || x < 0.0) ? false : x != 0.0;\n" " return (x > 0.0 || x < 0.0) ? false : x != 0.0;\n"
"}\n" "}\n"
...@@ -36,7 +36,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator ...@@ -36,7 +36,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator
emu->addEmulatedFunction( emu->addEmulatedFunction(
EOpIsNan, float2, EOpIsNan, float2,
"bool2 webgl_isnan_emu(float2 x)\n" "bool2 isnan_emu(float2 x)\n"
"{\n" "{\n"
" bool2 isnan;\n" " bool2 isnan;\n"
" for (int i = 0; i < 2; i++)\n" " for (int i = 0; i < 2; i++)\n"
...@@ -48,7 +48,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator ...@@ -48,7 +48,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator
emu->addEmulatedFunction( emu->addEmulatedFunction(
EOpIsNan, float3, EOpIsNan, float3,
"bool3 webgl_isnan_emu(float3 x)\n" "bool3 isnan_emu(float3 x)\n"
"{\n" "{\n"
" bool3 isnan;\n" " bool3 isnan;\n"
" for (int i = 0; i < 3; i++)\n" " for (int i = 0; i < 3; i++)\n"
...@@ -60,7 +60,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator ...@@ -60,7 +60,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator
emu->addEmulatedFunction( emu->addEmulatedFunction(
EOpIsNan, float4, EOpIsNan, float4,
"bool4 webgl_isnan_emu(float4 x)\n" "bool4 isnan_emu(float4 x)\n"
"{\n" "{\n"
" bool4 isnan;\n" " bool4 isnan;\n"
" for (int i = 0; i < 4; i++)\n" " for (int i = 0; i < 4; i++)\n"
...@@ -89,7 +89,7 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu) ...@@ -89,7 +89,7 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu)
// a <= 0xffff, d <= 0xffff, ((a * c) >> 16) <= 0xffff and 0xffff * 0xffff + 0xffff = 0xffff0000 // a <= 0xffff, d <= 0xffff, ((a * c) >> 16) <= 0xffff and 0xffff * 0xffff + 0xffff = 0xffff0000
FunctionId umulExtendedUint1 = emu->addEmulatedFunction( FunctionId umulExtendedUint1 = emu->addEmulatedFunction(
EOpUmulExtended, uint1, uint1, uint1, uint1, EOpUmulExtended, uint1, uint1, uint1, uint1,
"void webgl_umulExtended_emu(uint x, uint y, out uint msb, out uint lsb)\n" "void umulExtended_emu(uint x, uint y, out uint msb, out uint lsb)\n"
"{\n" "{\n"
" lsb = x * y;\n" " lsb = x * y;\n"
" uint a = (x & 0xffffu);\n" " uint a = (x & 0xffffu);\n"
...@@ -103,27 +103,27 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu) ...@@ -103,27 +103,27 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu)
"}\n"); "}\n");
emu->addEmulatedFunctionWithDependency( emu->addEmulatedFunctionWithDependency(
umulExtendedUint1, EOpUmulExtended, uint2, uint2, uint2, uint2, umulExtendedUint1, EOpUmulExtended, uint2, uint2, uint2, uint2,
"void webgl_umulExtended_emu(uint2 x, uint2 y, out uint2 msb, out uint2 lsb)\n" "void umulExtended_emu(uint2 x, uint2 y, out uint2 msb, out uint2 lsb)\n"
"{\n" "{\n"
" webgl_umulExtended_emu(x.x, y.x, msb.x, lsb.x);\n" " umulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
" webgl_umulExtended_emu(x.y, y.y, msb.y, lsb.y);\n" " umulExtended_emu(x.y, y.y, msb.y, lsb.y);\n"
"}\n"); "}\n");
emu->addEmulatedFunctionWithDependency( emu->addEmulatedFunctionWithDependency(
umulExtendedUint1, EOpUmulExtended, uint3, uint3, uint3, uint3, umulExtendedUint1, EOpUmulExtended, uint3, uint3, uint3, uint3,
"void webgl_umulExtended_emu(uint3 x, uint3 y, out uint3 msb, out uint3 lsb)\n" "void umulExtended_emu(uint3 x, uint3 y, out uint3 msb, out uint3 lsb)\n"
"{\n" "{\n"
" webgl_umulExtended_emu(x.x, y.x, msb.x, lsb.x);\n" " umulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
" webgl_umulExtended_emu(x.y, y.y, msb.y, lsb.y);\n" " umulExtended_emu(x.y, y.y, msb.y, lsb.y);\n"
" webgl_umulExtended_emu(x.z, y.z, msb.z, lsb.z);\n" " umulExtended_emu(x.z, y.z, msb.z, lsb.z);\n"
"}\n"); "}\n");
emu->addEmulatedFunctionWithDependency( emu->addEmulatedFunctionWithDependency(
umulExtendedUint1, EOpUmulExtended, uint4, uint4, uint4, uint4, umulExtendedUint1, EOpUmulExtended, uint4, uint4, uint4, uint4,
"void webgl_umulExtended_emu(uint4 x, uint4 y, out uint4 msb, out uint4 lsb)\n" "void umulExtended_emu(uint4 x, uint4 y, out uint4 msb, out uint4 lsb)\n"
"{\n" "{\n"
" webgl_umulExtended_emu(x.x, y.x, msb.x, lsb.x);\n" " umulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
" webgl_umulExtended_emu(x.y, y.y, msb.y, lsb.y);\n" " umulExtended_emu(x.y, y.y, msb.y, lsb.y);\n"
" webgl_umulExtended_emu(x.z, y.z, msb.z, lsb.z);\n" " umulExtended_emu(x.z, y.z, msb.z, lsb.z);\n"
" webgl_umulExtended_emu(x.w, y.w, msb.w, lsb.w);\n" " umulExtended_emu(x.w, y.w, msb.w, lsb.w);\n"
"}\n"); "}\n");
// The imul emulation does two's complement negation on the lsb and msb manually in case the // The imul emulation does two's complement negation on the lsb and msb manually in case the
...@@ -132,12 +132,12 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu) ...@@ -132,12 +132,12 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu)
// -2^31. abs(-2^31) is undefined. // -2^31. abs(-2^31) is undefined.
FunctionId imulExtendedInt1 = emu->addEmulatedFunctionWithDependency( FunctionId imulExtendedInt1 = emu->addEmulatedFunctionWithDependency(
umulExtendedUint1, EOpImulExtended, int1, int1, int1, int1, umulExtendedUint1, EOpImulExtended, int1, int1, int1, int1,
"void webgl_imulExtended_emu(int x, int y, out int msb, out int lsb)\n" "void imulExtended_emu(int x, int y, out int msb, out int lsb)\n"
"{\n" "{\n"
" uint unsignedMsb;\n" " uint unsignedMsb;\n"
" uint unsignedLsb;\n" " uint unsignedLsb;\n"
" bool negative = (x < 0) != (y < 0);\n" " bool negative = (x < 0) != (y < 0);\n"
" webgl_umulExtended_emu(uint(abs(x)), uint(abs(y)), unsignedMsb, unsignedLsb);\n" " umulExtended_emu(uint(abs(x)), uint(abs(y)), unsignedMsb, unsignedLsb);\n"
" lsb = asint(unsignedLsb);\n" " lsb = asint(unsignedLsb);\n"
" msb = asint(unsignedMsb);\n" " msb = asint(unsignedMsb);\n"
" if (negative)\n" " if (negative)\n"
...@@ -157,27 +157,27 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu) ...@@ -157,27 +157,27 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu)
"}\n"); "}\n");
emu->addEmulatedFunctionWithDependency( emu->addEmulatedFunctionWithDependency(
imulExtendedInt1, EOpImulExtended, int2, int2, int2, int2, imulExtendedInt1, EOpImulExtended, int2, int2, int2, int2,
"void webgl_imulExtended_emu(int2 x, int2 y, out int2 msb, out int2 lsb)\n" "void imulExtended_emu(int2 x, int2 y, out int2 msb, out int2 lsb)\n"
"{\n" "{\n"
" webgl_imulExtended_emu(x.x, y.x, msb.x, lsb.x);\n" " imulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
" webgl_imulExtended_emu(x.y, y.y, msb.y, lsb.y);\n" " imulExtended_emu(x.y, y.y, msb.y, lsb.y);\n"
"}\n"); "}\n");
emu->addEmulatedFunctionWithDependency( emu->addEmulatedFunctionWithDependency(
imulExtendedInt1, EOpImulExtended, int3, int3, int3, int3, imulExtendedInt1, EOpImulExtended, int3, int3, int3, int3,
"void webgl_imulExtended_emu(int3 x, int3 y, out int3 msb, out int3 lsb)\n" "void imulExtended_emu(int3 x, int3 y, out int3 msb, out int3 lsb)\n"
"{\n" "{\n"
" webgl_imulExtended_emu(x.x, y.x, msb.x, lsb.x);\n" " imulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
" webgl_imulExtended_emu(x.y, y.y, msb.y, lsb.y);\n" " imulExtended_emu(x.y, y.y, msb.y, lsb.y);\n"
" webgl_imulExtended_emu(x.z, y.z, msb.z, lsb.z);\n" " imulExtended_emu(x.z, y.z, msb.z, lsb.z);\n"
"}\n"); "}\n");
emu->addEmulatedFunctionWithDependency( emu->addEmulatedFunctionWithDependency(
imulExtendedInt1, EOpImulExtended, int4, int4, int4, int4, imulExtendedInt1, EOpImulExtended, int4, int4, int4, int4,
"void webgl_imulExtended_emu(int4 x, int4 y, out int4 msb, out int4 lsb)\n" "void imulExtended_emu(int4 x, int4 y, out int4 msb, out int4 lsb)\n"
"{\n" "{\n"
" webgl_imulExtended_emu(x.x, y.x, msb.x, lsb.x);\n" " imulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
" webgl_imulExtended_emu(x.y, y.y, msb.y, lsb.y);\n" " imulExtended_emu(x.y, y.y, msb.y, lsb.y);\n"
" webgl_imulExtended_emu(x.z, y.z, msb.z, lsb.z);\n" " imulExtended_emu(x.z, y.z, msb.z, lsb.z);\n"
" webgl_imulExtended_emu(x.w, y.w, msb.w, lsb.w);\n" " imulExtended_emu(x.w, y.w, msb.w, lsb.w);\n"
"}\n"); "}\n");
} }
......
src/compiler/translator/TranslatorESSL.cpp
...@@ -71,14 +71,14 @@ void TranslatorESSL::translate(TIntermBlock *root, ShCompileOptions compileOptio ...@@ -71,14 +71,14 @@ void TranslatorESSL::translate(TIntermBlock *root, ShCompileOptions compileOptio
if (getShaderType() == GL_FRAGMENT_SHADER) if (getShaderType() == GL_FRAGMENT_SHADER)
{ {
sink << "#if defined(GL_FRAGMENT_PRECISION_HIGH)\n" sink << "#if defined(GL_FRAGMENT_PRECISION_HIGH)\n"
<< "#define webgl_emu_precision highp\n" << "#define emu_precision highp\n"
<< "#else\n" << "#else\n"
<< "#define webgl_emu_precision mediump\n" << "#define emu_precision mediump\n"
<< "#endif\n\n"; << "#endif\n\n";
} }
else else
{ {
sink << "#define webgl_emu_precision highp\n"; sink << "#define emu_precision highp\n";
} }
getBuiltInFunctionEmulator().outputEmulatedFunctions(sink); getBuiltInFunctionEmulator().outputEmulatedFunctions(sink);
......
src/compiler/translator/TranslatorGLSL.cpp
...@@ -117,7 +117,7 @@ void TranslatorGLSL::translate(TIntermBlock *root, ShCompileOptions compileOptio ...@@ -117,7 +117,7 @@ void TranslatorGLSL::translate(TIntermBlock *root, ShCompileOptions compileOptio
if (!getBuiltInFunctionEmulator().isOutputEmpty()) if (!getBuiltInFunctionEmulator().isOutputEmpty())
{ {
sink << "// BEGIN: Generated code for built-in function emulation\n\n"; sink << "// BEGIN: Generated code for built-in function emulation\n\n";
sink << "#define webgl_emu_precision\n\n"; sink << "#define emu_precision\n\n";
getBuiltInFunctionEmulator().outputEmulatedFunctions(sink); getBuiltInFunctionEmulator().outputEmulatedFunctions(sink);
sink << "// END: Generated code for built-in function emulation\n\n"; sink << "// END: Generated code for built-in function emulation\n\n";
} }
......
src/compiler/translator/gen_emulated_builtin_function_tables.py
...@@ -105,7 +105,7 @@ def gen_emulated_function(data): ...@@ -105,7 +105,7 @@ def gen_emulated_function(data):
if 'comment' in data: if 'comment' in data:
func += "".join([ "// " + line + "\n" for line in data['comment'] ]) func += "".join([ "// " + line + "\n" for line in data['comment'] ])
sig = data['return_type'] + ' webgl_' + data['op'] + '_emu(' + ', '.join(data['args']) + ')' sig = data['return_type'] + ' ' + data['op'] + '_emu(' + ', '.join(data['args']) + ')'
body = [ sig, '{' ] + [' ' + line for line in data['body']] + ['}'] body = [ sig, '{' ] + [' ' + line for line in data['body']] + ['}']
func += "{\n" func += "{\n"
......
src/tests/compiler_tests/DebugShaderPrecision_test.cpp
...@@ -720,7 +720,7 @@ TEST_F(DebugShaderPrecisionTest, BuiltInMathFunctionRounding) ...@@ -720,7 +720,7 @@ TEST_F(DebugShaderPrecisionTest, BuiltInMathFunctionRounding)
ASSERT_TRUE(foundInHLSLCode("v6 = angle_frm(asin(angle_frm(_u1)))")); ASSERT_TRUE(foundInHLSLCode("v6 = angle_frm(asin(angle_frm(_u1)))"));
ASSERT_TRUE(foundInHLSLCode("v7 = angle_frm(acos(angle_frm(_u1)))")); ASSERT_TRUE(foundInHLSLCode("v7 = angle_frm(acos(angle_frm(_u1)))"));
ASSERT_TRUE(foundInHLSLCode("v8 = angle_frm(atan(angle_frm(_u1)))")); ASSERT_TRUE(foundInHLSLCode("v8 = angle_frm(atan(angle_frm(_u1)))"));
ASSERT_TRUE(foundInHLSLCode("v9 = angle_frm(webgl_atan_emu(angle_frm(_u1), angle_frm(_u2)))")); ASSERT_TRUE(foundInHLSLCode("v9 = angle_frm(atan_emu(angle_frm(_u1), angle_frm(_u2)))"));
ASSERT_TRUE(foundInHLSLCode("v10 = angle_frm(pow(angle_frm(_u1), angle_frm(_u2)))")); ASSERT_TRUE(foundInHLSLCode("v10 = angle_frm(pow(angle_frm(_u1), angle_frm(_u2)))"));
ASSERT_TRUE(foundInHLSLCode("v11 = angle_frm(exp(angle_frm(_u1)))")); ASSERT_TRUE(foundInHLSLCode("v11 = angle_frm(exp(angle_frm(_u1)))"));
ASSERT_TRUE(foundInHLSLCode("v12 = angle_frm(log(angle_frm(_u1)))")); ASSERT_TRUE(foundInHLSLCode("v12 = angle_frm(log(angle_frm(_u1)))"));
...@@ -733,8 +733,8 @@ TEST_F(DebugShaderPrecisionTest, BuiltInMathFunctionRounding) ...@@ -733,8 +733,8 @@ TEST_F(DebugShaderPrecisionTest, BuiltInMathFunctionRounding)
ASSERT_TRUE(foundInHLSLCode("v19 = angle_frm(floor(angle_frm(_u1)))")); ASSERT_TRUE(foundInHLSLCode("v19 = angle_frm(floor(angle_frm(_u1)))"));
ASSERT_TRUE(foundInHLSLCode("v20 = angle_frm(ceil(angle_frm(_u1)))")); ASSERT_TRUE(foundInHLSLCode("v20 = angle_frm(ceil(angle_frm(_u1)))"));
ASSERT_TRUE(foundInHLSLCode("v21 = angle_frm(frac(angle_frm(_u1)))")); ASSERT_TRUE(foundInHLSLCode("v21 = angle_frm(frac(angle_frm(_u1)))"));
ASSERT_TRUE(foundInHLSLCode("v22 = angle_frm(webgl_mod_emu(angle_frm(_u1), angle_frm(_uf)))")); ASSERT_TRUE(foundInHLSLCode("v22 = angle_frm(mod_emu(angle_frm(_u1), angle_frm(_uf)))"));
ASSERT_TRUE(foundInHLSLCode("v23 = angle_frm(webgl_mod_emu(angle_frm(_u1), angle_frm(_u2)))")); ASSERT_TRUE(foundInHLSLCode("v23 = angle_frm(mod_emu(angle_frm(_u1), angle_frm(_u2)))"));
ASSERT_TRUE(foundInHLSLCode("v24 = angle_frm(min(angle_frm(_u1), angle_frm(_uf)))")); ASSERT_TRUE(foundInHLSLCode("v24 = angle_frm(min(angle_frm(_u1), angle_frm(_uf)))"));
ASSERT_TRUE(foundInHLSLCode("v25 = angle_frm(min(angle_frm(_u1), angle_frm(_u2)))")); ASSERT_TRUE(foundInHLSLCode("v25 = angle_frm(min(angle_frm(_u1), angle_frm(_u2)))"));
ASSERT_TRUE(foundInHLSLCode("v26 = angle_frm(max(angle_frm(_u1), angle_frm(_uf)))")); ASSERT_TRUE(foundInHLSLCode("v26 = angle_frm(max(angle_frm(_u1), angle_frm(_uf)))"));
...@@ -755,7 +755,7 @@ TEST_F(DebugShaderPrecisionTest, BuiltInMathFunctionRounding) ...@@ -755,7 +755,7 @@ TEST_F(DebugShaderPrecisionTest, BuiltInMathFunctionRounding)
"v35 = angle_frm(smoothstep(angle_frm(_uf), angle_frm(_uf2), angle_frm(_u1)))")); "v35 = angle_frm(smoothstep(angle_frm(_uf), angle_frm(_uf2), angle_frm(_u1)))"));
ASSERT_TRUE(foundInHLSLCode("v36 = angle_frm(normalize(angle_frm(_u1)))")); ASSERT_TRUE(foundInHLSLCode("v36 = angle_frm(normalize(angle_frm(_u1)))"));
ASSERT_TRUE(foundInHLSLCode( ASSERT_TRUE(foundInHLSLCode(
"v37 = angle_frm(webgl_faceforward_emu(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))")); "v37 = angle_frm(faceforward_emu(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))"));
ASSERT_TRUE(foundInHLSLCode("v38 = angle_frm(reflect(angle_frm(_u1), angle_frm(_u2)))")); ASSERT_TRUE(foundInHLSLCode("v38 = angle_frm(reflect(angle_frm(_u1), angle_frm(_u2)))"));
ASSERT_TRUE(foundInHLSLCode( ASSERT_TRUE(foundInHLSLCode(
"v39 = angle_frm(refract(angle_frm(_u1), angle_frm(_u2), angle_frm(_uf)))")); "v39 = angle_frm(refract(angle_frm(_u1), angle_frm(_u2), angle_frm(_uf)))"));
......
src/tests/compiler_tests/Pack_Unpack_test.cpp
...@@ -36,7 +36,7 @@ TEST_F(PackUnpackTest, PackSnorm2x16Emulation) ...@@ -36,7 +36,7 @@ TEST_F(PackUnpackTest, PackSnorm2x16Emulation)
" fragColor = vec4(0.0);\n" " fragColor = vec4(0.0);\n"
"}\n"; "}\n";
compile(shaderString); compile(shaderString);
ASSERT_TRUE(foundInCode("uint webgl_packSnorm2x16_emu(vec2 v)")); ASSERT_TRUE(foundInCode("uint packSnorm2x16_emu(vec2 v)"));
} }
// Check if UnpackSnorm2x16 Emulation for GLSL < 4.2 compile correctly. // Check if UnpackSnorm2x16 Emulation for GLSL < 4.2 compile correctly.
...@@ -52,7 +52,7 @@ TEST_F(PackUnpackTest, UnpackSnorm2x16Emulation) ...@@ -52,7 +52,7 @@ TEST_F(PackUnpackTest, UnpackSnorm2x16Emulation)
" fragColor = vec4(0.0);\n" " fragColor = vec4(0.0);\n"
"}\n"; "}\n";
compile(shaderString); compile(shaderString);
ASSERT_TRUE(foundInCode("vec2 webgl_unpackSnorm2x16_emu(uint u)")); ASSERT_TRUE(foundInCode("vec2 unpackSnorm2x16_emu(uint u)"));
} }
// Check if PackUnorm2x16 Emulation for GLSL < 4.1 compiles correctly. // Check if PackUnorm2x16 Emulation for GLSL < 4.1 compiles correctly.
...@@ -68,7 +68,7 @@ TEST_F(PackUnpackTest, PackUnorm2x16Emulation) ...@@ -68,7 +68,7 @@ TEST_F(PackUnpackTest, PackUnorm2x16Emulation)
" fragColor = vec4(0.0);\n" " fragColor = vec4(0.0);\n"
"}\n"; "}\n";
compile(shaderString); compile(shaderString);
ASSERT_TRUE(foundInCode("uint webgl_packUnorm2x16_emu(vec2 v)")); ASSERT_TRUE(foundInCode("uint packUnorm2x16_emu(vec2 v)"));
} }
// Check if UnpackSnorm2x16 Emulation for GLSL < 4.1 compiles correctly. // Check if UnpackSnorm2x16 Emulation for GLSL < 4.1 compiles correctly.
...@@ -84,7 +84,7 @@ TEST_F(PackUnpackTest, UnpackUnorm2x16Emulation) ...@@ -84,7 +84,7 @@ TEST_F(PackUnpackTest, UnpackUnorm2x16Emulation)
" fragColor = vec4(0.0);\n" " fragColor = vec4(0.0);\n"
"}\n"; "}\n";
compile(shaderString); compile(shaderString);
ASSERT_TRUE(foundInCode("vec2 webgl_unpackUnorm2x16_emu(uint u)")); ASSERT_TRUE(foundInCode("vec2 unpackUnorm2x16_emu(uint u)"));
} }
// Check if PackHalf2x16 Emulation for GLSL < 4.2 compiles correctly. // Check if PackHalf2x16 Emulation for GLSL < 4.2 compiles correctly.
...@@ -100,7 +100,7 @@ TEST_F(PackUnpackTest, PackHalf2x16Emulation) ...@@ -100,7 +100,7 @@ TEST_F(PackUnpackTest, PackHalf2x16Emulation)
" fragColor = vec4(0.0);\n" " fragColor = vec4(0.0);\n"
"}\n"; "}\n";
compile(shaderString); compile(shaderString);
ASSERT_TRUE(foundInCode("uint webgl_packHalf2x16_emu(vec2 v)")); ASSERT_TRUE(foundInCode("uint packHalf2x16_emu(vec2 v)"));
} }
// Check if UnpackHalf2x16 Emulation for GLSL < 4.2 compiles correctly. // Check if UnpackHalf2x16 Emulation for GLSL < 4.2 compiles correctly.
...@@ -116,7 +116,7 @@ TEST_F(PackUnpackTest, UnpackHalf2x16Emulation) ...@@ -116,7 +116,7 @@ TEST_F(PackUnpackTest, UnpackHalf2x16Emulation)
" fragColor = vec4(0.0);\n" " fragColor = vec4(0.0);\n"
"}\n"; "}\n";
compile(shaderString); compile(shaderString);
ASSERT_TRUE(foundInCode("vec2 webgl_unpackHalf2x16_emu(uint u)")); ASSERT_TRUE(foundInCode("vec2 unpackHalf2x16_emu(uint u)"));
} }
} // namespace } // namespace
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