mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1284 from amdrexu/bugfix

Browse Source 
Allow --hlsl-enable-16bit-types to be used without AMD_EXTENSIONS
This commit is contained in:
John Kessenich 2018-03-08 10:24:32 -07:00 committed by GitHub
commit ca2793403a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hlsl/hlslGrammar.cpp
View File

@ -1377,9 +1377,7 @@ bool HlslGrammar::acceptType(TType& type)
} }
bool HlslGrammar::acceptType(TType& type, TIntermNode*& nodeList) bool HlslGrammar::acceptType(TType& type, TIntermNode*& nodeList)
{ {
// Basic types for min* types, broken out here in case of future // Basic types for min* types, use native halfs if the option allows them.
// changes, e.g, to use native halfs.
#ifdef AMD_EXTENSIONS
bool enable16BitTypes = parseContext.hlslEnable16BitTypes(); bool enable16BitTypes = parseContext.hlslEnable16BitTypes();
const TBasicType min16float_bt = enable16BitTypes ? EbtFloat16 : EbtFloat; const TBasicType min16float_bt = enable16BitTypes ? EbtFloat16 : EbtFloat;
@ -1388,14 +1386,6 @@ bool HlslGrammar::acceptType(TType& type, TIntermNode*& nodeList)
const TBasicType min16int_bt = enable16BitTypes ? EbtInt16 : EbtInt; const TBasicType min16int_bt = enable16BitTypes ? EbtInt16 : EbtInt;
const TBasicType min12int_bt = enable16BitTypes ? EbtInt16 : EbtInt; const TBasicType min12int_bt = enable16BitTypes ? EbtInt16 : EbtInt;
const TBasicType min16uint_bt = enable16BitTypes ? EbtUint16 : EbtUint; const TBasicType min16uint_bt = enable16BitTypes ? EbtUint16 : EbtUint;
#else
static const TBasicType min16float_bt = EbtFloat;
static const TBasicType min10float_bt = EbtFloat;
static const TBasicType half_bt = EbtFloat;
static const TBasicType min16int_bt = EbtInt;
static const TBasicType min12int_bt = EbtInt;
static const TBasicType min16uint_bt = EbtUint;
#endif
// Some types might have turned into identifiers. Take the hit for checking // Some types might have turned into identifiers. Take the hit for checking
// when this has happened. // when this has happened.