Skip to content

[clang][bytecode] Fix D3DCOLORtoUBYTE4 hlsl test #151819

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

Merged
merged 1 commit into from
Aug 2, 2025
Merged

[clang][bytecode] Fix D3DCOLORtoUBYTE4 hlsl test #151819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions clang/lib/AST/ByteCode/Compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ bool Compiler<Emitter>::VisitCastExpr(const CastExpr *CE) {
}

case CK_FloatingToIntegral: {
if (!CE->getType()->isIntegralOrEnumerationType())
return false;
if (!this->visit(SubExpr))
return false;
PrimType ToT = classifyPrim(CE);
Expand Down Expand Up @@ -1369,10 +1371,15 @@ bool Compiler<Emitter>::VisitVectorBinOp(const BinaryOperator *E) {
// BitAdd/BitOr/BitXor/Shl/Shr doesn't support bool type, we need perform the
// integer promotion.
bool NeedIntPromot = ElemT == PT_Bool && (E->isBitwiseOp() || E->isShiftOp());
QualType PromotTy =
Ctx.getASTContext().getPromotedIntegerType(Ctx.getASTContext().BoolTy);
PrimType PromotT = classifyPrim(PromotTy);
PrimType OpT = NeedIntPromot ? PromotT : ElemT;
QualType PromotTy;
PrimType PromotT = PT_Bool;
PrimType OpT = ElemT;
if (NeedIntPromot) {
PromotTy =
Ctx.getASTContext().getPromotedIntegerType(Ctx.getASTContext().BoolTy);
PromotT = classifyPrim(PromotTy);
OpT = PromotT;
}

auto getElem = [=](unsigned Offset, PrimType ElemT, unsigned Index) {
if (!this->emitGetLocal(PT_Ptr, Offset, E))
Expand Down
8 changes: 8 additions & 0 deletions clang/test/AST/ByteCode/hlsl.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,11 @@ export void fn() {
// smaller vector, then truncated to a float as a constant expression.
_Static_assert(((float2)float4(6, 5, 4, 3)).x == 6, "Woo!");
}

int4 test_D3DCOLORtoUBYTE4(float4 p1) {
return D3DCOLORtoUBYTE4(p1);
}

int4 test_constant_inputs() {
return D3DCOLORtoUBYTE4(float4(0, 11.11, -50.5, 100));
}