Skip to content

Fix vk::BufferPointer for non-SPIR-V builds #7305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dneto0 wants to merge 2 commits into from
Closed

Fix vk::BufferPointer for non-SPIR-V builds #7305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4cd822
Fix vk::BufferPointer for non-SPIR-V builds
dneto0 Apr 3, 2025
b828e5c
chore: autopublish 2025-04-03T18:57:59Z
github-actions[bot] Apr 3, 2025
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
5 changes: 5 additions & 0 deletions include/dxc/dxcapi.internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,14 @@ enum LEGAL_INTRINSIC_COMPTYPES {

LICOMPTYPE_HIT_OBJECT = 51,

#ifdef ENABLE_SPIRV_CODEGEN
LICOMPTYPE_VK_BUFFER_POINTER = 52,

LICOMPTYPE_COUNT = 53
#else // ENABLE_SPIRV_CODEGEN

LICOMPTYPE_COUNT = 52
#endif // ENABLE_SPIRV_CODEGEN
};

static const BYTE IA_SPECIAL_BASE = 0xf0;
Expand Down
21 changes: 19 additions & 2 deletions tools/clang/lib/Sema/SemaHLSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,8 +1237,10 @@ static const ArBasicKind g_AnyOutputRecordCT[] = {
static const ArBasicKind g_DxHitObjectCT[] = {AR_OBJECT_HIT_OBJECT,
AR_BASIC_UNKNOWN};

#ifdef ENABLE_SPIRV_CODEGEN
static const ArBasicKind g_VKBufferPointerCT[] = {AR_OBJECT_VK_BUFFER_POINTER,
AR_BASIC_UNKNOWN};
#endif // ENABLE_SPIRV_CODEGEN

// Basic kinds, indexed by a LEGAL_INTRINSIC_COMPTYPES value.
const ArBasicKind *g_LegalIntrinsicCompTypes[] = {
Expand Down Expand Up @@ -1295,7 +1297,9 @@ const ArBasicKind *g_LegalIntrinsicCompTypes[] = {
g_GroupNodeOutputRecordsCT, // LICOMPTYPE_GROUP_NODE_OUTPUT_RECORDS
g_ThreadNodeOutputRecordsCT, // LICOMPTYPE_THREAD_NODE_OUTPUT_RECORDS
g_DxHitObjectCT, // LICOMPTYPE_HIT_OBJECT
g_VKBufferPointerCT, // LICOMPTYPE_VK_BUFFER_POINTER
#ifdef ENABLE_SPIRV_CODEGEN
g_VKBufferPointerCT, // LICOMPTYPE_VK_BUFFER_POINTER
#endif // ENABLE_SPIRV_CODEGEN
};
static_assert(
ARRAYSIZE(g_LegalIntrinsicCompTypes) == LICOMPTYPE_COUNT,
Expand Down Expand Up @@ -3587,6 +3591,7 @@ class HLSLExternalSource : public ExternalSemaSource {
case LICOMPTYPE_HIT_OBJECT:
paramTypes.push_back(GetBasicKindType(AR_OBJECT_HIT_OBJECT));
break;
#ifdef ENABLE_SPIRV_CODEGEN
case LICOMPTYPE_VK_BUFFER_POINTER: {
const ArBasicKind *match =
std::find(g_ArBasicKindsAsTypes,
Expand All @@ -3600,6 +3605,7 @@ class HLSLExternalSource : public ExternalSemaSource {
m_sema->getASTContext().getTypeDeclType(m_objectTypeDecls[index]));
break;
}
#endif // ENABLE_SPIRV_CODEGEN
default:
DXASSERT(false, "Argument type of intrinsic function is not "
"supported");
Expand Down Expand Up @@ -4856,7 +4862,10 @@ class HLSLExternalSource : public ExternalSemaSource {
case AR_OBJECT_EMPTY_NODE_OUTPUT_ARRAY:
case AR_OBJECT_THREAD_NODE_OUTPUT_RECORDS:
case AR_OBJECT_GROUP_NODE_OUTPUT_RECORDS:
case AR_OBJECT_VK_BUFFER_POINTER: {
#ifdef ENABLE_SPIRV_CODEGEN
case AR_OBJECT_VK_BUFFER_POINTER:
#endif
{
const ArBasicKind *match = std::find(
g_ArBasicKindsAsTypes,
&g_ArBasicKindsAsTypes[_countof(g_ArBasicKindsAsTypes)], kind);
Expand Down Expand Up @@ -5372,8 +5381,10 @@ class HLSLExternalSource : public ExternalSemaSource {
<< type << GetMatrixOrVectorElementType(type);
}
return valid;
#ifdef ENABLED_SPIRV_CODEGEN
} else if (hlsl::IsVKBufferPointerType(qt)) {
return true;
#endif // ENABLED_SPIRV_CODEGEN
} else if (qt->isStructureOrClassType()) {
const RecordType *recordType = qt->getAs<RecordType>();
objectKind = ClassifyRecordType(recordType);
Expand Down Expand Up @@ -9751,10 +9762,12 @@ bool HLSLExternalSource::CanConvert(SourceLocation loc, Expr *sourceExpr,
return false;
}

#ifdef ENABLE_SPIRV_CODEGEN
// Cast vk::BufferPointer to pointer address.
if (SourceInfo.EltKind == AR_OBJECT_VK_BUFFER_POINTER) {
return TargetInfo.EltKind == AR_BASIC_UINT64;
}
#endif // ENABLE_SPIRV_CODEGEN

// Cast cbuffer to its result value.
if ((SourceInfo.EltKind == AR_OBJECT_CONSTANT_BUFFER ||
Expand Down Expand Up @@ -11604,6 +11617,7 @@ static bool CheckBarrierCall(Sema &S, FunctionDecl *FD, CallExpr *CE) {
return false;
}

#ifdef ENABLED_SPIRV_CODEGEN
static bool CheckVKBufferPointerCast(Sema &S, FunctionDecl *FD, CallExpr *CE,
bool isStatic) {
const Expr *argExpr = CE->getArg(0);
Expand All @@ -11627,6 +11641,7 @@ static bool CheckVKBufferPointerCast(Sema &S, FunctionDecl *FD, CallExpr *CE,

return false;
}
#endif // ENABLED_SPIRV_CODEGEN

// Check HLSL call constraints, not fatal to creating the AST.
void Sema::CheckHLSLFunctionCall(FunctionDecl *FDecl, CallExpr *TheCall,
Expand All @@ -11646,12 +11661,14 @@ void Sema::CheckHLSLFunctionCall(FunctionDecl *FDecl, CallExpr *TheCall,
case hlsl::IntrinsicOp::IOP_Barrier:
CheckBarrierCall(*this, FDecl, TheCall);
break;
#ifdef ENABLED_SPIRV_CODEGEN
case hlsl::IntrinsicOp::IOP_Vkreinterpret_pointer_cast:
CheckVKBufferPointerCast(*this, FDecl, TheCall, false);
break;
case hlsl::IntrinsicOp::IOP_Vkstatic_pointer_cast:
CheckVKBufferPointerCast(*this, FDecl, TheCall, true);
break;
#endif // ENABLED_SPIRV_CODEGEN
default:
break;
}
Expand Down
Loading