Skip to content

Commit ed7180a

Browse files
vaalfrejaigcbot
authored andcommitted
Merge ldraws
Merge ldraws in constant coalescing.
1 parent bcfe2e1 commit ed7180a

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

IGC/Compiler/CISACodeGen/ConstantCoalescing.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ void ConstantCoalescing::ProcessBlock(
416416
if ((bufType != BINDLESS_CONSTANT_BUFFER)
417417
&& (bufType != BINDLESS_TEXTURE)
418418
&& (bufType != SSH_BINDLESS_CONSTANT_BUFFER)
419+
&& (bufType != BINDLESS)
419420
)
420421
{
421422
continue;
@@ -452,6 +453,7 @@ void ConstantCoalescing::ProcessBlock(
452453
}
453454
else if (bufType == BINDLESS_CONSTANT_BUFFER
454455
|| bufType == SSH_BINDLESS_CONSTANT_BUFFER
456+
|| bufType == BINDLESS
455457
)
456458
{
457459
if (UsesTypedConstantBuffer(m_ctx, bufType))
@@ -476,7 +478,7 @@ void ConstantCoalescing::ProcessBlock(
476478
indcb_gathers);
477479
}
478480
}
479-
else if (bufType == BINDLESS_TEXTURE && IGC_IS_FLAG_ENABLED(EnableTextureLoadCoalescing))
481+
else if ((bufType == BINDLESS_TEXTURE || bufType == BINDLESS) && IGC_IS_FLAG_ENABLED(EnableTextureLoadCoalescing))
480482
{
481483
MergeScatterLoad(
482484
ldRaw,

IGC/Compiler/CISACodeGen/helper.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ namespace IGC
172172
const BufferType bufType)
173173
{
174174
IGC_ASSERT(bufType == CONSTANT_BUFFER ||
175-
bufType == BINDLESS_CONSTANT_BUFFER);
175+
bufType == BINDLESS_CONSTANT_BUFFER ||
176+
bufType == BINDLESS);
176177

177178
if (pContext->m_DriverInfo.ForceUntypedBindlessConstantBuffers() &&
178179
bufType == BINDLESS_CONSTANT_BUFFER)

0 commit comments

Comments
 (0)