Skip to content
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

[d3d9] fix opCompositeExtract out of bound #3390

Merged
merged 1 commit into from
May 9, 2023
Merged

[d3d9] fix opCompositeExtract out of bound #3390

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
22 changes: 16 additions & 6 deletions src/d3d9/d3d9_fixed_function.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,19 +1102,30 @@ namespace dxvk {
m_module.opStore(m_vs.out.NORMAL, outNrm);

for (uint32_t i = 0; i < caps::TextureStageCount; i++) {
uint32_t inputIndex = (m_vsKey.Data.Contents.TexcoordIndices >> (i * 3)) & 0b111;
uint32_t inputFlags = (m_vsKey.Data.Contents.TexcoordFlags >> (i * 3)) & 0b111;
uint32_t inputIndex = (m_vsKey.Data.Contents.TexcoordIndices >> (i * 3)) & 0b111;
uint32_t inputFlags = (m_vsKey.Data.Contents.TexcoordFlags >> (i * 3)) & 0b111;
uint32_t texcoordCount = (m_vsKey.Data.Contents.TexcoordDeclMask >> (i * 3)) & 0b111;

uint32_t transformed;

const uint32_t wIndex = 3;

uint32_t flags = (m_vsKey.Data.Contents.TransformFlags >> (i * 3)) & 0b111;
uint32_t count = flags;
uint32_t count;
switch (inputFlags) {
default:
case (DXVK_TSS_TCI_PASSTHRU >> TCIOffset):
transformed = m_vs.in.TEXCOORD[inputIndex & 0xFF];
// flags is actually the number of elements that get passed
// to the rasterizer.
count = flags;
if (texcoordCount) {
// Clamp by the number of elements in the texcoord input.
if (!count || count > texcoordCount)
count = texcoordCount;
}
else
flags = D3DTTFF_DISABLE;
break;

case (DXVK_TSS_TCI_CAMERASPACENORMAL >> TCIOffset):
Expand Down Expand Up @@ -1798,10 +1809,9 @@ namespace dxvk {
texcoord, texcoord, texcoordCnt, indices.data());

uint32_t projIdx = m_fsKey.Stages[i].Contents.ProjectedCount;
if (projIdx == 0)
if (projIdx == 0 || projIdx > texcoordCnt)
projIdx = texcoordCnt;
else
projIdx--;
--projIdx;

uint32_t projValue = 0;

Expand Down