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

Merge pull request #436 from dankbaker/master

Browse source 
HLSL: disabling dx9 attempt to parse dx9 style samplers
This commit is contained in:
John Kessenich 2016-08-05 17:29:43 -06:00 • committed by GitHub
commit 5c72a73971
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hlsl/hlslGrammar.cpp
View file

@ -274,8 +274,14 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& node)
TType type; TType type;
// DX9 sampler declaration use a different syntax // DX9 sampler declaration use a different syntax
if (acceptSamplerDeclarationDX9(type)) // DX9 shaders need to run through HLSL compiler (fxc) via a back compat mode, it isn't going to
return true; // be possible to simultanously compile D3D10+ style shaders and DX9 shaders. If we want to compile DX9
// HLSL shaders, this will have to be a master level switch
// As such, the sampler keyword in D3D10+ turns into an automatic sampler type, and is commonly used
// For that reason, this line is commented out
// if (acceptSamplerDeclarationDX9(type))
// return true;
// fully_specified_type // fully_specified_type
if (! acceptFullySpecifiedType(type)) if (! acceptFullySpecifiedType(type))