Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/SPIR-V.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``
-------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions include/dxc/Support/HLSLOptions.td
Original file line number Diff line number Diff line change
Expand Up @@ -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<"<file>">, 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<hlslcore_Group>, Flags<[DriverOption, RewriteOption, HelpHidden]>,
HelpText<"External DLL name to load for compiler support">;
def external_fn : Separate<["-", "/"], "external-fn">, Group<hlslcore_Group>, Flags<[DriverOption, RewriteOption, HelpHidden]>,
Expand Down Expand Up @@ -424,7 +424,7 @@ def fspv_use_unknown_image_format
def fvk_auto_shift_bindings: Flag<["-"], "fvk-auto-shift-bindings">, Group<spirv_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<spirv_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<spirv_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<spirv_Group>, Flags<[CoreOption, DriverOption]>,
Expand Down Expand Up @@ -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<hlslcomp_Group>,
HelpText<"Assume that UAVs/SRVs may alias">;
def all_resources_bound : Flag<["-", "/"], "all-resources-bound">, Flags<[CoreOption]>, Group<hlslcomp_Group>,
HelpText<"Enables agressive flattening">;
HelpText<"Enables aggressive flattening">;
def all_resources_bound_ : Flag<["-", "/"], "all_resources_bound">, Flags<[CoreOption, HelpHidden]>, Group<hlslcomp_Group>,
HelpText<"Enables agressive flattening">;
HelpText<"Enables aggressive flattening">;

def setprivate : JoinedOrSeparate<["-", "/"], "setprivate">, Flags<[CoreOption, DriverOption]>, MetaVarName<"<file>">, Group<hlslutil_Group>,
HelpText<"Private data to add to compiled shader blob">;
Expand Down
4 changes: 2 additions & 2 deletions tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
Original file line number Diff line number Diff line change
Expand Up @@ -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<
Expand Down Expand Up @@ -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<
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/lib/CodeGen/CGHLSLMS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
4 changes: 2 additions & 2 deletions tools/clang/test/SemaHLSL/max_output_records_invalidref.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ struct rec1
void InvalidRef(
RWThreadNodeInputRecord<rec0> InputyMcInputFace,
// MaxRecordsSharedWith referencing non-existant parameter
[MaxRecordsSharedWith(Output7)] NodeOutput<rec1> Output1, /* expected-error {{attribute MaxRecordsSharedWith must reference a valid ouput parameter name.}} */
[MaxRecordsSharedWith(Output7)] NodeOutput<rec1> Output1, /* expected-error {{attribute MaxRecordsSharedWith must reference a valid output parameter name.}} */
// MaxRecordsSharedWith referencing an input parameter
[MaxRecordsSharedWith(InputyMcInputFace)] NodeOutput<rec1> Output2, /* expected-error {{attribute MaxRecordsSharedWith must reference a valid ouput parameter name.}} */
[MaxRecordsSharedWith(InputyMcInputFace)] NodeOutput<rec1> Output2, /* expected-error {{attribute MaxRecordsSharedWith must reference a valid output parameter name.}} */
// MaxRecordsSharedWith referencing its own parameter
[MaxRecordsSharedWith(Output3)] NodeOutput<rec1> Output3) /* expected-error {{attribute MaxRecordsSharedWith must not reference the same parameter it is applied to.}} */
{
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/SemaHLSL/vector-conditional.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down