Renamed the flag

Author: Przemog1

include/dxc/Support/HLSLOptions.td

@@ -602,5 +602,5 @@ def rw_decl_global_cb : Flag<["-", "/"], "decl-global-cb">, Group<hlslrewrite_Gr
 // Also removed: compress, decompress, /Gch (child effect), /Gpp (partial precision)
 // /Op - no support for preshaders.
 
-def devsh_disable_hlsl_intrinsics : Flag<["-"], "devsh-disable-hlsl-intrinsics">, Group<spirv_Group>, Flags<[CoreOption, DriverOption]>,
+def fvk_disable_hlsl_intrinsics : Flag<["-"], "fvk-disable-hlsl-intrinsics">, Group<spirv_Group>, Flags<[CoreOption, DriverOption]>,
   HelpText<"Disable HLSL intrinsics">;

include/dxc/Support/SPIRVOptions.h

@@ -38,7 +38,7 @@ enum class SpirvLayoutRule {
 };
 
 struct SpirvCodeGenOptions {
-  bool devshDisableHLSLIntrinsics;
+  bool disableHLSLIntrinsics;
   /// Disable legalization and optimization and emit raw SPIR-V
   bool codeGenHighLevel;
   bool debugInfoFile;

lib/DxcSupport/HLSLOptions.cpp

@@ -1074,8 +1074,8 @@ int ReadDxcOpts(const OptTable *optionTable, unsigned flagsToInclude,
 
   // SPIRV Change Starts
 #ifdef ENABLE_SPIRV_CODEGEN
-  opts.SpirvOptions.devshDisableHLSLIntrinsics =
-      Args.hasFlag(OPT_devsh_disable_hlsl_intrinsics, OPT_INVALID, false);
+  opts.SpirvOptions.disableHLSLIntrinsics =
+      Args.hasFlag(OPT_fvk_disable_hlsl_intrinsics, OPT_INVALID, false);
   opts.GenSPIRV = Args.hasFlag(OPT_spirv, OPT_INVALID, false);
   opts.SpirvOptions.invertY =
       Args.hasFlag(OPT_fvk_invert_y, OPT_INVALID, false);

tools/clang/tools/dxcompiler/dxcompilerobj.cpp

@@ -967,7 +967,7 @@ class DxcCompiler : public IDxcCompiler3,
         clang::EmitSpirvAction action;
         FrontendInputFile file(pUtf8SourceName, IK_HLSL);
         action.BeginSourceFile(
-            compiler, file, opts.SpirvOptions.devshDisableHLSLIntrinsics);
+            compiler, file, opts.SpirvOptions.disableHLSLIntrinsics);
         action.Execute();
         action.EndSourceFile();
         outStream.flush();