Skip to content

A
angle
Commit 2a1e8f95 by Olli Etuaho Committed by Commit Bot
Options

Refer to GLSL extensions through TExtension enum

Extensions are now referred to by enum values instead of strings most of the time. This gets rid of unnecessary copying of strings. The code is easier to work with than before as typoing the extension enum names will be caught by the compiler. BUG=angleproject:2147 TEST=angle_unittests Change-Id: Ifa61b9f86ef03211188fc23bc23a5ce4e4d8c390 Reviewed-on: https://chromium-review.googlesource.com/571002 Commit-Queue: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent ad17d2a0
Showing with 284 additions and 143 deletions
src/compiler.gypi
......@@ -57,6 +57,7 @@
'compiler/translator/EmulatePrecision.h',
'compiler/translator/ExpandIntegerPowExpressions.cpp',
'compiler/translator/ExpandIntegerPowExpressions.h',
'compiler/translator/ExtensionBehavior.cpp',
'compiler/translator/ExtensionBehavior.h',
'compiler/translator/FindMain.cpp',
'compiler/translator/FindMain.h',
......
src/compiler/translator/CollectVariables.cpp
......@@ -475,7 +475,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
{
OutputVariable info;
setBuiltInInfoFromSymbolTable("gl_FragData", &info);
if (!::IsExtensionEnabled(mExtensionBehavior, "GL_EXT_draw_buffers"))
if (!IsExtensionEnabled(mExtensionBehavior, TExtension::EXT_draw_buffers))
{
info.arraySize = 1;
}
......@@ -527,7 +527,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
else
{
ASSERT(mShaderType == GL_VERTEX_SHADER &&
IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview"));
IsExtensionEnabled(mExtensionBehavior, TExtension::OVR_multiview));
}
break;
default:
......
src/compiler/translator/Compiler.cpp
......@@ -430,7 +430,8 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
arrayBoundsClamper.MarkIndirectArrayBoundsForClamping(root);
if (success && (compileOptions & SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW) &&
parseContext.isMultiviewExtensionEnabled() && getShaderType() != GL_COMPUTE_SHADER)
parseContext.isExtensionEnabled(TExtension::OVR_multiview) &&
getShaderType() != GL_COMPUTE_SHADER)
{
DeclareAndInitBuiltinsForInstancedMultiview(root, mNumViews, shaderType, compileOptions,
outputType, &symbolTable);
......@@ -514,7 +515,7 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
if (success && shaderType == GL_FRAGMENT_SHADER && shaderVersion == 100 &&
compileResources.EXT_draw_buffers && compileResources.MaxDrawBuffers > 1 &&
IsExtensionEnabled(extensionBehavior, "GL_EXT_draw_buffers"))
IsExtensionEnabled(extensionBehavior, TExtension::EXT_draw_buffers))
{
EmulateGLFragColorBroadcast(root, compileResources.MaxDrawBuffers, &outputVariables,
&symbolTable, shaderVersion);
......
src/compiler/translator/DirectiveHandler.cpp
......@@ -162,7 +162,7 @@ void TDirectiveHandler::handleExtension(const pp::SourceLocation &loc,
return;
}
TExtensionBehavior::iterator iter = mExtensionBehavior.find(name);
TExtensionBehavior::iterator iter = mExtensionBehavior.find(GetExtensionByName(name.c_str()));
if (iter != mExtensionBehavior.end())
{
iter->second = behaviorVal;
......
src/compiler/translator/ExtensionBehavior.cpp 0 → 100644
//
// Copyright (c) 2017 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.
//
// ExtensionBehavior.cpp: Extension name enumeration and data structures for storing extension
// behavior.
#include "compiler/translator/ExtensionBehavior.h"
#include "common/debug.h"
#define LIST_EXTENSIONS(OP) \
OP(ARB_texture_rectangle) \
OP(ARM_shader_framebuffer_fetch) \
OP(EXT_blend_func_extended) \
OP(EXT_draw_buffers) \
OP(EXT_frag_depth) \
OP(EXT_shader_framebuffer_fetch) \
OP(EXT_shader_texture_lod) \
OP(EXT_YUV_target) \
OP(NV_EGL_stream_consumer_external) \
OP(NV_shader_framebuffer_fetch) \
OP(OES_EGL_image_external) \
OP(OES_EGL_image_external_essl3) \
OP(OES_geometry_shader) \
OP(OES_standard_derivatives) \
OP(OVR_multiview)
namespace sh
{
#define RETURN_EXTENSION_NAME_CASE(ext) \
case TExtension::ext: \
return "GL_" #ext;
const char *GetExtensionNameString(TExtension extension)
{
switch (extension)
{
LIST_EXTENSIONS(RETURN_EXTENSION_NAME_CASE)
default:
UNREACHABLE();
return "";
}
}
#define RETURN_EXTENSION_IF_NAME_MATCHES(ext) \
if (strcmp(extWithoutGLPrefix, #ext) == 0) \
{ \
return TExtension::ext; \
}
TExtension GetExtensionByName(const char *extension)
{
// If first characters of the extension don't equal "GL_", early out.
if (strncmp(extension, "GL_", 3) != 0)
{
return TExtension::UNDEFINED;
}
const char *extWithoutGLPrefix = extension + 3;
LIST_EXTENSIONS(RETURN_EXTENSION_IF_NAME_MATCHES)
return TExtension::UNDEFINED;
}
const char *GetBehaviorString(TBehavior b)
{
switch (b)
{
case EBhRequire:
return "require";
case EBhEnable:
return "enable";
case EBhWarn:
return "warn";
case EBhDisable:
return "disable";
default:
return nullptr;
}
}
bool IsExtensionEnabled(const TExtensionBehavior &extBehavior, TExtension extension)
{
ASSERT(extension != TExtension::UNDEFINED);
auto iter = extBehavior.find(extension);
return iter != extBehavior.end() && (iter->second == EBhEnable || iter->second == EBhRequire);
}
} // namespace sh
src/compiler/translator/ExtensionBehavior.h
......@@ -3,39 +3,57 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ExtensionBehavior.h: Extension name enumeration and data structures for storing extension
// behavior.
#ifndef COMPILER_TRANSLATOR_EXTENSIONBEHAVIOR_H_
#define COMPILER_TRANSLATOR_EXTENSIONBEHAVIOR_H_
#include <map>
#include <string>
typedef enum { EBhRequire, EBhEnable, EBhWarn, EBhDisable, EBhUndefined } TBehavior;
namespace sh
{
inline const char *getBehaviorString(TBehavior b)
enum class TExtension
{
switch (b)
{
case EBhRequire:
return "require";
case EBhEnable:
return "enable";
case EBhWarn:
return "warn";
case EBhDisable:
return "disable";
default:
return nullptr;
}
}
// Mapping between extension name and behavior.
typedef std::map<std::string, TBehavior> TExtensionBehavior;
inline bool IsExtensionEnabled(const TExtensionBehavior &extBehavior, const char *extension)
UNDEFINED, // Special value used to indicate no extension.
ARB_texture_rectangle,
ARM_shader_framebuffer_fetch,
EXT_blend_func_extended,
EXT_draw_buffers,
EXT_frag_depth,
EXT_shader_framebuffer_fetch,
EXT_shader_texture_lod,
EXT_YUV_target,
NV_EGL_stream_consumer_external,
NV_shader_framebuffer_fetch,
OES_EGL_image_external,
OES_EGL_image_external_essl3,
OES_geometry_shader,
OES_standard_derivatives,
OVR_multiview
};
enum TBehavior
{
auto iter = extBehavior.find(extension);
return iter != extBehavior.end() && (iter->second == EBhEnable || iter->second == EBhRequire);
}
EBhRequire,
EBhEnable,
EBhWarn,
EBhDisable,
EBhUndefined
};
const char *GetExtensionNameString(TExtension extension);
TExtension GetExtensionByName(const char *extension);
const char *GetBehaviorString(TBehavior b);
// Mapping between extension id and behavior.
typedef std::map<TExtension, TBehavior> TExtensionBehavior;
bool IsExtensionEnabled(const TExtensionBehavior &extBehavior, TExtension extension);
} // namespace sh
#endif // COMPILER_TRANSLATOR_EXTENSIONBEHAVIOR_H_
src/compiler/translator/InitializeVariables.cpp
......@@ -107,7 +107,7 @@ void InsertInitCode(TIntermSequence *mainBody,
{
initializedSymbol = ReferenceBuiltInVariable(name, symbolTable, shaderVersion);
if (initializedSymbol->getQualifier() == EvqFragData &&
!IsExtensionEnabled(extensionBehavior, "GL_EXT_draw_buffers"))
!IsExtensionEnabled(extensionBehavior, TExtension::EXT_draw_buffers))
{
// If GL_EXT_draw_buffers is disabled, only the 0th index of gl_FragData can be
// written to.
......
src/compiler/translator/OutputHLSL.cpp
......@@ -130,7 +130,8 @@ OutputHLSL::OutputHLSL(sh::GLenum shaderType,
mUsesFrontFacing = false;
mUsesPointSize = false;
mUsesInstanceID = false;
mHasMultiviewExtensionEnabled = IsExtensionEnabled(mExtensionBehavior, "GL_OVR_multiview");
mHasMultiviewExtensionEnabled =
IsExtensionEnabled(mExtensionBehavior, TExtension::OVR_multiview);
mUsesViewID = false;
mUsesVertexID = false;
mUsesFragDepth = false;
......@@ -417,9 +418,8 @@ void OutputHLSL::header(TInfoSinkBase &out, const BuiltInFunctionEmulator *built
if (mShaderType == GL_FRAGMENT_SHADER)
{
TExtensionBehavior::const_iterator iter = mExtensionBehavior.find("GL_EXT_draw_buffers");
const bool usingMRTExtension = (iter != mExtensionBehavior.end() &&
(iter->second == EBhEnable || iter->second == EBhRequire));
const bool usingMRTExtension =
IsExtensionEnabled(mExtensionBehavior, TExtension::EXT_draw_buffers);
out << "// Varyings\n";
out << varyings;
......
src/compiler/translator/ParseContext.h
......@@ -138,7 +138,7 @@ class TParseContext : angle::NonCopyable
void checkIsParameterQualifierValid(const TSourceLoc &line,
const TTypeQualifierBuilder &typeQualifierBuilder,
TType *type);
bool checkCanUseExtension(const TSourceLoc &line, const TString &extension);
bool checkCanUseExtension(const TSourceLoc &line, TExtension extension);
// Done for all declarations, whether empty or not.
void declarationQualifierErrorCheck(const sh::TQualifier qualifier,
......@@ -168,12 +168,8 @@ class TParseContext : angle::NonCopyable
{
return mDirectiveHandler.extensionBehavior();
}
bool supportsExtension(const char *extension);
bool isExtensionEnabled(const char *extension) const;
bool isMultiviewExtensionEnabled() const
{
return mMultiviewAvailable && isExtensionEnabled("GL_OVR_multiview");
}
bool supportsExtension(TExtension extension);
bool isExtensionEnabled(TExtension extension) const;
void handleExtensionDirective(const TSourceLoc &loc, const char *extName, const char *behavior);
void handlePragmaDirective(const TSourceLoc &loc,
const char *name,
......@@ -580,8 +576,6 @@ class TParseContext : angle::NonCopyable
int mMinProgramTexelOffset;
int mMaxProgramTexelOffset;
bool mMultiviewAvailable;
// keep track of local group size declared in layout. It should be declared only once.
bool mComputeShaderLocalSizeDeclared;
sh::WorkGroupSize mComputeShaderLocalSize;
......
src/compiler/translator/SymbolTable.cpp
......@@ -43,7 +43,7 @@ int TSymbolUniqueId::get() const
}
TSymbol::TSymbol(TSymbolTable *symbolTable, const TString *n)
: uniqueId(symbolTable->nextUniqueId()), name(n)
: uniqueId(symbolTable->nextUniqueId()), name(n), extension(TExtension::UNDEFINED)
{
}
......@@ -300,7 +300,7 @@ TInterfaceBlockName *TSymbolTable::declareInterfaceBlockName(const TString *name
}
TInterfaceBlockName *TSymbolTable::insertInterfaceBlockNameExt(ESymbolLevel level,
const char *ext,
TExtension ext,
const TString *name)
{
TInterfaceBlockName *blockNameSymbol = new TInterfaceBlockName(this, name);
......@@ -332,7 +332,7 @@ TVariable *TSymbolTable::insertVariable(ESymbolLevel level, const TString *name,
}
TVariable *TSymbolTable::insertVariableExt(ESymbolLevel level,
const char *ext,
TExtension ext,
const char *name,
const TType &type)
{
......@@ -361,7 +361,7 @@ TVariable *TSymbolTable::insertStructType(ESymbolLevel level, TStructure *str)
void TSymbolTable::insertBuiltIn(ESymbolLevel level,
TOperator op,
const char *ext,
TExtension ext,
const TType *rvalue,
const char *name,
const TType *ptype1,
......@@ -530,12 +530,13 @@ void TSymbolTable::insertBuiltInOp(ESymbolLevel level,
const char *name = GetOperatorString(op);
ASSERT(strlen(name) > 0);
insertUnmangledBuiltInName(name, level);
insertBuiltIn(level, op, "", rvalue, name, ptype1, ptype2, ptype3, ptype4, ptype5);
insertBuiltIn(level, op, TExtension::UNDEFINED, rvalue, name, ptype1, ptype2, ptype3, ptype4,
ptype5);
}
void TSymbolTable::insertBuiltInOp(ESymbolLevel level,
TOperator op,
const char *ext,
TExtension ext,
const TType *rvalue,
const TType *ptype1,
const TType *ptype2,
......@@ -558,7 +559,7 @@ void TSymbolTable::insertBuiltInFunctionNoParameters(ESymbolLevel level,
}
void TSymbolTable::insertBuiltInFunctionNoParametersExt(ESymbolLevel level,
const char *ext,
TExtension ext,
TOperator op,
const TType *rvalue,
const char *name)
......
src/compiler/translator/SymbolTable.h
......@@ -35,6 +35,7 @@
#include <set>
#include "common/angleutils.h"
#include "compiler/translator/ExtensionBehavior.h"
#include "compiler/translator/InfoSink.h"
#include "compiler/translator/IntermNode.h"
......@@ -74,13 +75,13 @@ class TSymbol : angle::NonCopyable
virtual bool isFunction() const { return false; }
virtual bool isVariable() const { return false; }
int getUniqueId() const { return uniqueId; }
void relateToExtension(const TString &ext) { extension = ext; }
const TString &getExtension() const { return extension; }
void relateToExtension(TExtension ext) { extension = ext; }
TExtension getExtension() const { return extension; }
private:
const int uniqueId;
const TString *name;
TString extension;
TExtension extension;
};
// Variable, meaning a symbol that's not a function.
......@@ -165,8 +166,8 @@ class TFunction : public TSymbol
TFunction(TSymbolTable *symbolTable,
const TString *name,
const TType *retType,
TOperator tOp = EOpNull,
const char *ext = "")
TOperator tOp = EOpNull,
TExtension ext = TExtension::UNDEFINED)
: TSymbol(symbolTable, name),
returnType(retType),
mangledName(nullptr),
......@@ -343,12 +344,12 @@ class TSymbolTable : angle::NonCopyable
// declaration failed due to redefinition.
TVariable *insertVariable(ESymbolLevel level, const char *name, const TType &type);
TVariable *insertVariableExt(ESymbolLevel level,
const char *ext,
TExtension ext,
const char *name,
const TType &type);
TVariable *insertStructType(ESymbolLevel level, TStructure *str);
TInterfaceBlockName *insertInterfaceBlockNameExt(ESymbolLevel level,
const char *ext,
TExtension ext,
const TString *name);
bool insertConstInt(ESymbolLevel level, const char *name, int value, TPrecision precision)
......@@ -362,7 +363,7 @@ class TSymbolTable : angle::NonCopyable
}
bool insertConstIntExt(ESymbolLevel level,
const char *ext,
TExtension ext,
const char *name,
int value,
TPrecision precision)
......@@ -395,7 +396,7 @@ class TSymbolTable : angle::NonCopyable
void insertBuiltIn(ESymbolLevel level,
TOperator op,
const char *ext,
TExtension ext,
const TType *rvalue,
const char *name,
const TType *ptype1,
......@@ -414,11 +415,12 @@ class TSymbolTable : angle::NonCopyable
const TType *ptype5 = 0)
{
insertUnmangledBuiltInName(name, level);
insertBuiltIn(level, EOpNull, "", rvalue, name, ptype1, ptype2, ptype3, ptype4, ptype5);
insertBuiltIn(level, EOpNull, TExtension::UNDEFINED, rvalue, name, ptype1, ptype2, ptype3,
ptype4, ptype5);
}
void insertBuiltIn(ESymbolLevel level,
const char *ext,
TExtension ext,
const TType *rvalue,
const char *name,
const TType *ptype1,
......@@ -442,7 +444,7 @@ class TSymbolTable : angle::NonCopyable
void insertBuiltInOp(ESymbolLevel level,
TOperator op,
const char *ext,
TExtension ext,
const TType *rvalue,
const TType *ptype1,
const TType *ptype2 = 0,
......@@ -456,7 +458,7 @@ class TSymbolTable : angle::NonCopyable
const char *name);
void insertBuiltInFunctionNoParametersExt(ESymbolLevel level,
const char *ext,
TExtension ext,
TOperator op,
const TType *rvalue,
const char *name);
......@@ -524,7 +526,7 @@ class TSymbolTable : angle::NonCopyable
bool insert(ESymbolLevel level, TSymbol *symbol) { return table[level]->insert(symbol); }
bool insert(ESymbolLevel level, const char *ext, TSymbol *symbol)
bool insert(ESymbolLevel level, TExtension ext, TSymbol *symbol)
{
symbol->relateToExtension(ext);
return table[level]->insert(symbol);
......
src/compiler/translator/TranslatorESSL.cpp
......@@ -136,16 +136,16 @@ void TranslatorESSL::writeExtensionBehavior(ShCompileOptions compileOptions)
{
if (iter->second != EBhUndefined)
{
const bool isMultiview = (iter->first == "GL_OVR_multiview");
const bool isMultiview = (iter->first == TExtension::OVR_multiview);
if (getResources().NV_shader_framebuffer_fetch &&
iter->first == "GL_EXT_shader_framebuffer_fetch")
iter->first == TExtension::EXT_shader_framebuffer_fetch)
{
sink << "#extension GL_NV_shader_framebuffer_fetch : "
<< getBehaviorString(iter->second) << "\n";
<< GetBehaviorString(iter->second) << "\n";
}
else if (getResources().NV_draw_buffers && iter->first == "GL_EXT_draw_buffers")
else if (getResources().NV_draw_buffers && iter->first == TExtension::EXT_draw_buffers)
{
sink << "#extension GL_NV_draw_buffers : " << getBehaviorString(iter->second)
sink << "#extension GL_NV_draw_buffers : " << GetBehaviorString(iter->second)
<< "\n";
}
else if (isMultiview && isMultiviewExtEmulated)
......@@ -159,13 +159,13 @@ void TranslatorESSL::writeExtensionBehavior(ShCompileOptions compileOptions)
sink << "#extension GL_NV_viewport_array2 : require\n";
}
}
else if (iter->first == "GL_OES_geometry_shader")
else if (iter->first == TExtension::OES_geometry_shader)
{
sink << "#ifdef GL_OES_geometry_shader\n"
<< "#extension GL_OES_geometry_shader : " << getBehaviorString(iter->second)
<< "#extension GL_OES_geometry_shader : " << GetBehaviorString(iter->second)
<< "\n"
<< "#elif defined GL_EXT_geometry_shader\n"
<< "#extension GL_EXT_geometry_shader : " << getBehaviorString(iter->second)
<< "#extension GL_EXT_geometry_shader : " << GetBehaviorString(iter->second)
<< "\n";
if (iter->second == EBhRequire)
{
......@@ -177,8 +177,8 @@ void TranslatorESSL::writeExtensionBehavior(ShCompileOptions compileOptions)
}
else
{
sink << "#extension " << iter->first << " : " << getBehaviorString(iter->second)
<< "\n";
sink << "#extension " << GetExtensionNameString(iter->first) << " : "
<< GetBehaviorString(iter->second) << "\n";
}
}
}
......
src/compiler/translator/TranslatorGLSL.cpp
......@@ -130,7 +130,7 @@ void TranslatorGLSL::translate(TIntermBlock *root, ShCompileOptions compileOptio
if (getShaderType() == GL_FRAGMENT_SHADER)
{
const bool mayHaveESSL1SecondaryOutputs =
IsExtensionEnabled(getExtensionBehavior(), "GL_EXT_blend_func_extended") &&
IsExtensionEnabled(getExtensionBehavior(), TExtension::EXT_blend_func_extended) &&
getShaderVersion() == 100;
const bool declareGLFragmentOutputs = IsGLSL130OrNewer(getOutputType());
......@@ -264,26 +264,26 @@ void TranslatorGLSL::writeExtensionBehavior(TIntermNode *root, ShCompileOptions
{
// For GLSL output, we don't need to emit most extensions explicitly,
// but some we need to translate in GL compatibility profile.
if (iter.first == "GL_EXT_shader_texture_lod")
if (iter.first == TExtension::EXT_shader_texture_lod)
{
sink << "#extension GL_ARB_shader_texture_lod : " << getBehaviorString(iter.second)
sink << "#extension GL_ARB_shader_texture_lod : " << GetBehaviorString(iter.second)
<< "\n";
}
if (iter.first == "GL_EXT_draw_buffers")
if (iter.first == TExtension::EXT_draw_buffers)
{
sink << "#extension GL_ARB_draw_buffers : " << getBehaviorString(iter.second)
sink << "#extension GL_ARB_draw_buffers : " << GetBehaviorString(iter.second)
<< "\n";
}
if (iter.first == "GL_OES_geometry_shader")
if (iter.first == TExtension::OES_geometry_shader)
{
sink << "#extension GL_ARB_geometry_shader4 : " << getBehaviorString(iter.second)
sink << "#extension GL_ARB_geometry_shader4 : " << GetBehaviorString(iter.second)
<< "\n";
}
}
const bool isMultiview = (iter.first == "GL_OVR_multiview");
const bool isMultiview = (iter.first == TExtension::OVR_multiview);
if (isMultiview && getShaderType() == GL_VERTEX_SHADER &&
(compileOptions & SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER) != 0u)
{
......
src/compiler/translator/ValidateOutputs.cpp
......@@ -51,7 +51,7 @@ ValidateOutputsTraverser::ValidateOutputsTraverser(const TExtensionBehavior &ext
: TIntermTraverser(true, false, false),
mMaxDrawBuffers(maxDrawBuffers),
mAllowUnspecifiedOutputLocationResolution(
IsExtensionEnabled(extBehavior, "GL_EXT_blend_func_extended")),
IsExtensionEnabled(extBehavior, TExtension::EXT_blend_func_extended)),
mUsesFragDepth(false)
{
}
......
src/compiler/translator/glslang.l
......@@ -80,7 +80,7 @@ static int ES2_ident_ES3_keyword_multiview_keyword(TParseContext *context, int t
static int ES2_ident_ES3_reserved_ES3_1_keyword(TParseContext *context, int token);
static int ES2_and_ES3_reserved_ES3_1_keyword(TParseContext *context, int token);
static int ES2_and_ES3_ident_ES3_1_keyword(TParseContext *context, int token);
static int ES3_extension_keyword_else_ident(TParseContext *context, const char *extension, int token);
static int ES3_extension_keyword_else_ident(TParseContext *context, TExtension extension, int token);
static int uint_constant(TParseContext *context);
static int int_constant(TParseContext *context);
static int float_constant(yyscan_t yyscanner);
......@@ -198,13 +198,13 @@ O [0-7]
"sampler2DShadow" { return ES2_reserved_ES3_keyword(context, SAMPLER2DSHADOW); }
"samplerCubeShadow" { return ES2_ident_ES3_keyword(context, SAMPLERCUBESHADOW); }
"sampler2DArrayShadow" { return ES2_ident_ES3_keyword(context, SAMPLER2DARRAYSHADOW); }
"__samplerExternal2DY2YEXT" { return ES3_extension_keyword_else_ident(context, "GL_EXT_YUV_target", SAMPLEREXTERNAL2DY2YEXT); }
"__samplerExternal2DY2YEXT" { return ES3_extension_keyword_else_ident(context, TExtension::EXT_YUV_target, SAMPLEREXTERNAL2DY2YEXT); }
"struct" { return STRUCT; }
"layout" { return ES2_ident_ES3_keyword_multiview_keyword(context, LAYOUT); }
"yuvCscStandardEXT" { return ES3_extension_keyword_else_ident(context, "GL_EXT_YUV_target", YUVCSCSTANDARDEXT); }
"yuvCscStandardEXT" { return ES3_extension_keyword_else_ident(context, TExtension::EXT_YUV_target, YUVCSCSTANDARDEXT); }
"itu_601" { return yuvcscstandardext_constant(context); }
"itu_601_full_range" { return yuvcscstandardext_constant(context); }
"itu_709" { return yuvcscstandardext_constant(context); }
......@@ -523,7 +523,7 @@ int ES2_ident_ES3_keyword_multiview_keyword(TParseContext *context, int token)
// not a reserved word in GLSL ES 1.00, so could be used as an identifier/type name
// except when multiview extension is enabled
if (context->getShaderVersion() < 300 && !context->isMultiviewExtensionEnabled())
if (context->getShaderVersion() < 300 && !context->isExtensionEnabled(TExtension::OVR_multiview))
{
yylval->lex.string = NewPoolTString(yytext);
return check_type(yyscanner);
......@@ -559,7 +559,7 @@ int ES2_and_ES3_ident_ES3_1_keyword(TParseContext *context, int token)
return token;
}
int ES3_extension_keyword_else_ident(TParseContext *context, const char* extension, int token)
int ES3_extension_keyword_else_ident(TParseContext *context, TExtension extension, int token)
{
struct yyguts_t* yyg = (struct yyguts_t*) context->getScanner();
yyscan_t yyscanner = (yyscan_t) context->getScanner();
......@@ -641,7 +641,7 @@ int yuvcscstandardext_constant(TParseContext *context)
yyscan_t yyscanner = (yyscan_t) context->getScanner();
// a reserved word in GLSL ES 3.00 with enabled extension, otherwise could be used as an identifier/type name
if (context->getShaderVersion() >= 300 && context->isExtensionEnabled("GL_EXT_YUV_target"))
if (context->getShaderVersion() >= 300 && context->isExtensionEnabled(TExtension::EXT_YUV_target))
{
yylval->lex.string = NewPoolTString(yytext);
return YUVCSCSTANDARDEXTCONSTANT;
......@@ -686,7 +686,7 @@ int glslang_scan(size_t count, const char* const string[], const int length[],
const TExtensionBehavior& extBehavior = context->extensionBehavior();
for (TExtensionBehavior::const_iterator iter = extBehavior.begin();
iter != extBehavior.end(); ++iter) {
preprocessor->predefineMacro(iter->first.c_str(), 1);
preprocessor->predefineMacro(GetExtensionNameString(iter->first), 1);
}
if (context->getFragmentPrecisionHigh())
preprocessor->predefineMacro("GL_FRAGMENT_PRECISION_HIGH", 1);
......
src/compiler/translator/glslang.y
......@@ -146,7 +146,7 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, void *scanner, cons
}
#define ES3_OR_NEWER_OR_MULTIVIEW(TOKEN, LINE, REASON) { \
if (context->getShaderVersion() < 300 && !context->isMultiviewExtensionEnabled()) { \
if (context->getShaderVersion() < 300 && !context->isExtensionEnabled(TExtension::OVR_multiview)) { \
context->error(LINE, REASON " supported in GLSL ES 3.00 and above only", TOKEN); \
} \
}
......@@ -279,7 +279,7 @@ primary_expression
$$ = context->addScalarLiteral(unionArray, @1);
}
| YUVCSCSTANDARDEXTCONSTANT {
if (!context->isExtensionEnabled("GL_EXT_YUV_target")) {
if (!context->isExtensionEnabled(TExtension::EXT_YUV_target)) {
context->error(@1, "unsupported value", $1.string->c_str());
}
TConstantUnion *unionArray = new TConstantUnion[1];
......@@ -1049,7 +1049,7 @@ type_specifier_nonarray
$$.setMatrix(4, 3);
}
| YUVCSCSTANDARDEXT {
if (!context->isExtensionEnabled("GL_EXT_YUV_target")) {
if (!context->isExtensionEnabled(TExtension::EXT_YUV_target)) {
context->error(@1, "unsupported type", "yuvCscStandardEXT");
}
$$.initialize(EbtYuvCscStandardEXT, @1);
......@@ -1109,20 +1109,20 @@ type_specifier_nonarray
$$.initialize(EbtSampler2DArrayShadow, @1);
}
| SAMPLER_EXTERNAL_OES {
if (!context->supportsExtension("GL_OES_EGL_image_external") &&
!context->supportsExtension("GL_NV_EGL_stream_consumer_external")) {
if (!context->supportsExtension(TExtension::OES_EGL_image_external) &&
!context->supportsExtension(TExtension::NV_EGL_stream_consumer_external)) {
context->error(@1, "unsupported type", "samplerExternalOES");
}
$$.initialize(EbtSamplerExternalOES, @1);
}
| SAMPLEREXTERNAL2DY2YEXT {
if (!context->isExtensionEnabled("GL_EXT_YUV_target")) {
if (!context->isExtensionEnabled(TExtension::EXT_YUV_target)) {
context->error(@1, "unsupported type", "__samplerExternal2DY2YEXT");
}
$$.initialize(EbtSamplerExternal2DY2YEXT, @1);
}
| SAMPLER2DRECT {
if (!context->supportsExtension("GL_ARB_texture_rectangle")) {
if (!context->supportsExtension(TExtension::ARB_texture_rectangle)) {
context->error(@1, "unsupported type", "sampler2DRect");
}
$$.initialize(EbtSampler2DRect, @1);
......
src/compiler/translator/glslang_lex.cpp
......@@ -63,13 +63,37 @@
#define yyget_lval yyget_lval
#define yyset_lval yyset_lval
#ifdef yyget_lval
#define yyget_lval_ALREADY_DEFINED
#else
#define yyget_lval yyget_lval
#endif
#ifdef yyset_lval
#define yyset_lval_ALREADY_DEFINED
#else
#define yyset_lval yyset_lval
#endif
#define yyget_lloc yyget_lloc
#define yyset_lloc yyset_lloc
#ifdef yyget_lloc
#define yyget_lloc_ALREADY_DEFINED
#else
#define yyget_lloc yyget_lloc
#endif
#ifdef yyset_lloc
#define yyset_lloc_ALREADY_DEFINED
#else
#define yyset_lloc yyset_lloc
#endif
......@@ -1195,7 +1219,7 @@ static int ES2_ident_ES3_keyword_multiview_keyword(TParseContext *context, int t
static int ES2_ident_ES3_reserved_ES3_1_keyword(TParseContext *context, int token);
static int ES2_and_ES3_reserved_ES3_1_keyword(TParseContext *context, int token);
static int ES2_and_ES3_ident_ES3_1_keyword(TParseContext *context, int token);
static int ES3_extension_keyword_else_ident(TParseContext *context, const char *extension, int token);
static int ES3_extension_keyword_else_ident(TParseContext *context, TExtension extension, int token);
static int uint_constant(TParseContext *context);
static int int_constant(TParseContext *context);
static int float_constant(yyscan_t yyscanner);
......@@ -1995,7 +2019,7 @@ YY_RULE_SETUP
YY_BREAK
case 82:
YY_RULE_SETUP
{ return ES3_extension_keyword_else_ident(context, "GL_EXT_YUV_target", SAMPLEREXTERNAL2DY2YEXT); }
{ return ES3_extension_keyword_else_ident(context, TExtension::EXT_YUV_target, SAMPLEREXTERNAL2DY2YEXT); }
YY_BREAK
case 83:
YY_RULE_SETUP
......@@ -2007,7 +2031,7 @@ YY_RULE_SETUP
YY_BREAK
case 85:
YY_RULE_SETUP
{ return ES3_extension_keyword_else_ident(context, "GL_EXT_YUV_target", YUVCSCSTANDARDEXT); }
{ return ES3_extension_keyword_else_ident(context, TExtension::EXT_YUV_target, YUVCSCSTANDARDEXT); }
YY_BREAK
case 86:
YY_RULE_SETUP
......@@ -2736,6 +2760,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
/* "- 2" to take care of EOB's */
YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
}
yyg->yy_n_chars += number_to_move;
......@@ -3853,7 +3879,7 @@ int ES2_ident_ES3_keyword_multiview_keyword(TParseContext *context, int token)
// not a reserved word in GLSL ES 1.00, so could be used as an identifier/type name
// except when multiview extension is enabled
if (context->getShaderVersion() < 300 && !context->isMultiviewExtensionEnabled())
if (context->getShaderVersion() < 300 && !context->isExtensionEnabled(TExtension::OVR_multiview))
{
yylval->lex.string = NewPoolTString(yytext);
return check_type(yyscanner);
......@@ -3889,7 +3915,7 @@ int ES2_and_ES3_ident_ES3_1_keyword(TParseContext *context, int token)
return token;
}
int ES3_extension_keyword_else_ident(TParseContext *context, const char* extension, int token)
int ES3_extension_keyword_else_ident(TParseContext *context, TExtension extension, int token)
{
struct yyguts_t* yyg = (struct yyguts_t*) context->getScanner();
yyscan_t yyscanner = (yyscan_t) context->getScanner();
......@@ -3971,7 +3997,7 @@ int yuvcscstandardext_constant(TParseContext *context)
yyscan_t yyscanner = (yyscan_t) context->getScanner();
// a reserved word in GLSL ES 3.00 with enabled extension, otherwise could be used as an identifier/type name
if (context->getShaderVersion() >= 300 && context->isExtensionEnabled("GL_EXT_YUV_target"))
if (context->getShaderVersion() >= 300 && context->isExtensionEnabled(TExtension::EXT_YUV_target))
{
yylval->lex.string = NewPoolTString(yytext);
return YUVCSCSTANDARDEXTCONSTANT;
......@@ -4016,7 +4042,7 @@ int glslang_scan(size_t count, const char* const string[], const int length[],
const TExtensionBehavior& extBehavior = context->extensionBehavior();
for (TExtensionBehavior::const_iterator iter = extBehavior.begin();
iter != extBehavior.end(); ++iter) {
preprocessor->predefineMacro(iter->first.c_str(), 1);
preprocessor->predefineMacro(GetExtensionNameString(iter->first), 1);
}
if (context->getFragmentPrecisionHigh())
preprocessor->predefineMacro("GL_FRAGMENT_PRECISION_HIGH", 1);
......
src/compiler/translator/glslang_tab.cpp
......@@ -416,7 +416,7 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, void *scanner, cons
}
#define ES3_OR_NEWER_OR_MULTIVIEW(TOKEN, LINE, REASON) { \
if (context->getShaderVersion() < 300 && !context->isMultiviewExtensionEnabled()) { \
if (context->getShaderVersion() < 300 && !context->isExtensionEnabled(TExtension::OVR_multiview)) { \
context->error(LINE, REASON " supported in GLSL ES 3.00 and above only", TOKEN); \
} \
}
......@@ -2586,7 +2586,7 @@ yyreduce:
case 10:
{
if (!context->isExtensionEnabled("GL_EXT_YUV_target")) {
if (!context->isExtensionEnabled(TExtension::EXT_YUV_target)) {
context->error((yylsp[0]), "unsupported value", (yyvsp[0].lex).string->c_str());
}
TConstantUnion *unionArray = new TConstantUnion[1];
......@@ -4089,7 +4089,7 @@ yyreduce:
case 189:
{
if (!context->isExtensionEnabled("GL_EXT_YUV_target")) {
if (!context->isExtensionEnabled(TExtension::EXT_YUV_target)) {
context->error((yylsp[0]), "unsupported type", "yuvCscStandardEXT");
}
(yyval.interm.typeSpecifierNonArray).initialize(EbtYuvCscStandardEXT, (yylsp[0]));
......@@ -4244,8 +4244,8 @@ yyreduce:
case 208:
{
if (!context->supportsExtension("GL_OES_EGL_image_external") &&
!context->supportsExtension("GL_NV_EGL_stream_consumer_external")) {
if (!context->supportsExtension(TExtension::OES_EGL_image_external) &&
!context->supportsExtension(TExtension::NV_EGL_stream_consumer_external)) {
context->error((yylsp[0]), "unsupported type", "samplerExternalOES");
}
(yyval.interm.typeSpecifierNonArray).initialize(EbtSamplerExternalOES, (yylsp[0]));
......@@ -4256,7 +4256,7 @@ yyreduce:
case 209:
{
if (!context->isExtensionEnabled("GL_EXT_YUV_target")) {
if (!context->isExtensionEnabled(TExtension::EXT_YUV_target)) {
context->error((yylsp[0]), "unsupported type", "__samplerExternal2DY2YEXT");
}
(yyval.interm.typeSpecifierNonArray).initialize(EbtSamplerExternal2DY2YEXT, (yylsp[0]));
......@@ -4267,7 +4267,7 @@ yyreduce:
case 210:
{
if (!context->supportsExtension("GL_ARB_texture_rectangle")) {
if (!context->supportsExtension(TExtension::ARB_texture_rectangle)) {
context->error((yylsp[0]), "unsupported type", "sampler2DRect");
}
(yyval.interm.typeSpecifierNonArray).initialize(EbtSampler2DRect, (yylsp[0]));
......
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