Merge pull request #436 from dankbaker/master

hlsl/hlslGrammar.cpp

@@ -274,8 +274,14 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& node)
     TType type;
 
     // DX9 sampler declaration use a different syntax
-    if (acceptSamplerDeclarationDX9(type))
-        return true;
+	// DX9 shaders need to run through HLSL compiler (fxc) via a back compat mode, it isn't going to
+	// 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
     if (! acceptFullySpecifiedType(type))