diff --git a/docs/SPIR-V.rst b/docs/SPIR-V.rst index 423262e15d..da5e914e3e 100644 --- a/docs/SPIR-V.rst +++ b/docs/SPIR-V.rst @@ -1420,11 +1420,11 @@ placed in the ``Uniform`` or ``UniformConstant`` storage class. - ``shared`` - - This is a hint to the compiler. It will be ingored. + - This is a hint to the compiler. It will be ignored. - ``volatile`` - - This is a hint to the compiler. It will be ingored. + - This is a hint to the compiler. It will be ignored. HLSL semantic and Vulkan ``Location`` ------------------------------------- diff --git a/include/dxc/Support/HLSLOptions.td b/include/dxc/Support/HLSLOptions.td index cd7dfb2f0c..ad7f82b6e5 100644 --- a/include/dxc/Support/HLSLOptions.td +++ b/include/dxc/Support/HLSLOptions.td @@ -277,7 +277,7 @@ def dump_dependencies : Flag<["-", "/"], "M">, Flags<[CoreOption, DriverOption]> def write_dependencies : Flag<["-", "/"], "MD">, Flags<[CoreOption, DriverOption]>, HelpText<"Write a file with .d extension that will contain the list of the compilation target dependencies.">; def write_dependencies_to : JoinedOrSeparate<["-", "/"], "MF">, MetaVarName<"">, Flags<[CoreOption, DriverOption]>, - HelpText<"Write the specfied file that will contain the list of the compilation target dependencies.">; + HelpText<"Write the specified file that will contain the list of the compilation target dependencies.">; def external_lib : Separate<["-", "/"], "external">, Group, Flags<[DriverOption, RewriteOption, HelpHidden]>, HelpText<"External DLL name to load for compiler support">; def external_fn : Separate<["-", "/"], "external-fn">, Group, Flags<[DriverOption, RewriteOption, HelpHidden]>, @@ -424,7 +424,7 @@ def fspv_use_unknown_image_format def fvk_auto_shift_bindings: Flag<["-"], "fvk-auto-shift-bindings">, Group, Flags<[CoreOption, DriverOption]>, HelpText<"Apply fvk-*-shift to resources without an explicit register assignment.">; def Wno_vk_ignored_features : Joined<["-"], "Wno-vk-ignored-features">, Group, Flags<[CoreOption, DriverOption, HelpHidden]>, - HelpText<"Do not emit warnings for ingored features resulting from no Vulkan support">; + HelpText<"Do not emit warnings for ignored features resulting from no Vulkan support">; def Wno_vk_emulated_features : Joined<["-"], "Wno-vk-emulated-features">, Group, Flags<[CoreOption, DriverOption, HelpHidden]>, HelpText<"Do not emit warnings for emulated features resulting from no direct mapping">; def fspv_print_all: Flag<["-"], "fspv-print-all">, Group, Flags<[CoreOption, DriverOption]>, @@ -564,9 +564,9 @@ def res_may_alias : Flag<["-", "/"], "res-may-alias">, Flags<[CoreOption]>, Grou def res_may_alias_ : Flag<["-", "/"], "res_may_alias">, Flags<[CoreOption, HelpHidden]>, Group, HelpText<"Assume that UAVs/SRVs may alias">; def all_resources_bound : Flag<["-", "/"], "all-resources-bound">, Flags<[CoreOption]>, Group, - HelpText<"Enables agressive flattening">; + HelpText<"Enables aggressive flattening">; def all_resources_bound_ : Flag<["-", "/"], "all_resources_bound">, Flags<[CoreOption, HelpHidden]>, Group, - HelpText<"Enables agressive flattening">; + HelpText<"Enables aggressive flattening">; def setprivate : JoinedOrSeparate<["-", "/"], "setprivate">, Flags<[CoreOption, DriverOption]>, MetaVarName<"">, Group, HelpText<"Private data to add to compiled shader blob">; diff --git a/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td b/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td index f2e2f7c4ed..750bbc1c35 100644 --- a/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -7733,7 +7733,7 @@ def err_hlsl_norm_float_only : Error< def err_hlsl_unsupported_conditional_syntax : Error< "x ?: y conditional operator syntax not supported in HLSL">; def err_hlsl_conditional_cond_typecheck : Error< - "conditional operator only supports condition with scalar, vector, or matrix types convertable to bool.">; + "conditional operator only supports condition with scalar, vector, or matrix types convertible to bool.">; def err_hlsl_conditional_result_typecheck : Error< "conditional operator only supports results with numeric scalar, vector, or matrix types.">; def err_hlsl_conditional_dimensions : Error< @@ -7952,7 +7952,7 @@ def err_hlsl_maxarraysize_template_arg : Error< def err_hlsl_maxrecord_attrs_on_same_arg : Error< "only one of MaxRecords or MaxRecordsSharedWith may be specified to the same parameter.">; def err_hlsl_maxrecordssharedwith_references_invalid_arg : Error< - "attribute MaxRecordsSharedWith must reference a valid ouput parameter name.">; + "attribute MaxRecordsSharedWith must reference a valid output parameter name.">; def err_hlsl_maxrecordssharedwith_references_itself : Error< "attribute MaxRecordsSharedWith must not reference the same parameter it is applied to.">; def err_hlsl_maxrecord_on_wrong_launch : Error< diff --git a/tools/clang/lib/CodeGen/CGHLSLMS.cpp b/tools/clang/lib/CodeGen/CGHLSLMS.cpp index 6b2d84d24e..1b806933e6 100644 --- a/tools/clang/lib/CodeGen/CGHLSLMS.cpp +++ b/tools/clang/lib/CodeGen/CGHLSLMS.cpp @@ -2450,7 +2450,7 @@ void CGMSHLSLRuntime::AddHLSLFunctionInfo(Function *F, const FunctionDecl *FD) { parmDecl->getLocation(), Diags.getCustomDiagID(DiagnosticsEngine::Error, "MaxRecordsSharedWith must reference a valid " - "ouput parameter name.")); + "output parameter name.")); } else if (ix == (int)outputNo) { Diags.Report( parmDecl->getLocation(), diff --git a/tools/clang/test/SemaHLSL/max_output_records_invalidref.hlsl b/tools/clang/test/SemaHLSL/max_output_records_invalidref.hlsl index f632d0a44e..fd6e72ddac 100644 --- a/tools/clang/test/SemaHLSL/max_output_records_invalidref.hlsl +++ b/tools/clang/test/SemaHLSL/max_output_records_invalidref.hlsl @@ -20,9 +20,9 @@ struct rec1 void InvalidRef( RWThreadNodeInputRecord InputyMcInputFace, // MaxRecordsSharedWith referencing non-existant parameter - [MaxRecordsSharedWith(Output7)] NodeOutput Output1, /* expected-error {{attribute MaxRecordsSharedWith must reference a valid ouput parameter name.}} */ + [MaxRecordsSharedWith(Output7)] NodeOutput Output1, /* expected-error {{attribute MaxRecordsSharedWith must reference a valid output parameter name.}} */ // MaxRecordsSharedWith referencing an input parameter - [MaxRecordsSharedWith(InputyMcInputFace)] NodeOutput Output2, /* expected-error {{attribute MaxRecordsSharedWith must reference a valid ouput parameter name.}} */ + [MaxRecordsSharedWith(InputyMcInputFace)] NodeOutput Output2, /* expected-error {{attribute MaxRecordsSharedWith must reference a valid output parameter name.}} */ // MaxRecordsSharedWith referencing its own parameter [MaxRecordsSharedWith(Output3)] NodeOutput Output3) /* expected-error {{attribute MaxRecordsSharedWith must not reference the same parameter it is applied to.}} */ { diff --git a/tools/clang/test/SemaHLSL/vector-conditional.hlsl b/tools/clang/test/SemaHLSL/vector-conditional.hlsl index aa4b1d23f6..004b7da20e 100644 --- a/tools/clang/test/SemaHLSL/vector-conditional.hlsl +++ b/tools/clang/test/SemaHLSL/vector-conditional.hlsl @@ -212,7 +212,7 @@ float4 main(float4 v0 : TEXCOORD) : SV_Target acc += T.Sample(S, v0.xy); // Texture object as condition - acc += T ? v0 : (v0 + 1.0F); /* expected-error {{conditional operator only supports condition with scalar, vector, or matrix types convertable to bool.}} fxc-error {{X3020: conditional must be numeric}} */ + acc += T ? v0 : (v0 + 1.0F); /* expected-error {{conditional operator only supports condition with scalar, vector, or matrix types convertible to bool.}} fxc-error {{X3020: conditional must be numeric}} */ Texture2D TOut1 = T1; Texture2D TOut2 = T2;