Skip to content

G
glslang
Unverified Commit ca279340 by John Kessenich Committed by GitHub
Options

Merge pull request #1284 from amdrexu/bugfix

Allow --hlsl-enable-16bit-types to be used without AMD_EXTENSIONS
parents a5152505 7798aaf1
Showing with 1 addition and 11 deletions
hlsl/hlslGrammar.cpp
...@@ -1377,9 +1377,7 @@ bool HlslGrammar::acceptType(TType& type) ...@@ -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) ...@@ -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.
......
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