BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change disabled-by-default DISABLE_HLSL option to enabled-by-default ENABLE_HLSL.

Browse source 
Matches existing options.
This commit is contained in:
Alex Szpakowski 2017-01-09 18:10:14 -04:00
parent 84eabf7ea7
commit ff21a25bc8
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
glslang/MachineIndependent/ShaderLang.cpp
View file

@ -50,7 +50,7 @@
#include "Scan.h"
#include "ScanContext.h"
#ifndef DISABLE_HLSL
#ifdef ENABLE_HLSL
#include "../../hlsl/hlslParseHelper.h"
#include "../../hlsl/hlslParseables.h"
#include "../../hlsl/hlslScanContext.h"
@ -76,7 +76,7 @@ TBuiltInParseables* CreateBuiltInParseables(TInfoSink& infoSink, EShSource sourc
{
switch (source) {
case EShSourceGlsl: return new TBuiltIns(); // GLSL builtIns
#ifndef DISABLE_HLSL
#ifdef ENABLE_HLSL
case EShSourceHlsl: return new TBuiltInParseablesHlsl(); // HLSL intrinsics
#endif
@ -93,7 +93,7 @@ TParseContextBase* CreateParseContext(TSymbolTable& symbolTable, TIntermediate&
SpvVersion spvVersion, bool forwardCompatible, EShMessages messages,
bool parsingBuiltIns, const std::string sourceEntryPointName = "")
{
#ifdef DISABLE_HLSL
#ifndef ENABLE_HLSL
(void)sourceEntryPointName; // Unused argument.
#endif
@ -103,7 +103,7 @@ TParseContextBase* CreateParseContext(TSymbolTable& symbolTable, TIntermediate&
return new TParseContext(symbolTable, intermediate, parsingBuiltIns, version, profile, spvVersion,
language, infoSink, forwardCompatible, messages);
#ifndef DISABLE_HLSL
#ifdef ENABLE_HLSL
case EShSourceHlsl:
return new HlslParseContext(symbolTable, intermediate, parsingBuiltIns, version, profile, spvVersion,
language, infoSink, sourceEntryPointName.c_str(), forwardCompatible, messages);
@ -1096,7 +1096,7 @@ int ShInitialize()
PerProcessGPA = new TPoolAllocator();
glslang::TScanContext::fillInKeywordMap();
#ifndef DISABLE_HLSL
#ifdef ENABLE_HLSL
glslang::HlslScanContext::fillInKeywordMap();
#endif
@ -1191,7 +1191,7 @@ int __fastcall ShFinalize()
}
glslang::TScanContext::deleteKeywordMap();
#ifndef DISABLE_HLSL
#ifdef ENABLE_HLSL
glslang::HlslScanContext::deleteKeywordMap();
#endif