Skip to content

[ZH] Fix the bugged Heat Haze (Smudge) effect of the USA Microwave Tank #1073

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −4
Open

[ZH] Fix the bugged Heat Haze (Smudge) effect of the USA Microwave Tank #1073

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: 18 additions & 4 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ void W3DSmudgeManager::ReleaseResources(void)
//Make sure (SMUDGE_DRAW_SIZE * 12) < 65535 because that's the max index buffer size.
#define SMUDGE_DRAW_SIZE 500 //draw at most 50 smudges per call. Tweak value to improve CPU/GPU parallelism.

static_assert(SMUDGE_DRAW_SIZE * 12 < 65535, "Must not exceed the max index buffer size");


void W3DSmudgeManager::ReAcquireResources(void)
{
ReleaseResources();
Expand Down Expand Up @@ -467,12 +470,12 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)
VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
DX8Wrapper::Set_Material(vmat);
REF_PTR_RELEASE(vmat);
DX8Wrapper::Apply_Render_State_Changes();
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this call, because DX8Wrapper::Draw_Triangles will call this as well and therefore it is redundant.


//Disable reading texture alpha since it's undefined.
//DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_SELECTARG1);
DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAOP,D3DTOP_SELECTARG2);

Int smudgesBatchCount=0;
Int smudgesRemaining=count;
set=m_usedSmudgeSetList.Head(); //first smudge set that needs rendering.
Smudge *remainingSmudgeStart=set->getUsedSmudgeList().Head(); //first smudge that needs rendering.
Expand Down Expand Up @@ -502,7 +505,8 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)

//Check if we exceeded maximum number of smudges allowed per draw call.
if (smudgesInRenderBatch >= count)
{ remainingSmudgeStart = smudge;
{
remainingSmudgeStart = smudge;
goto flushSmudges;
}

Expand Down Expand Up @@ -535,9 +539,10 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)
if (set) //start next batch at beginning of set.
remainingSmudgeStart = set->getUsedSmudgeList().Head();
}
flushSmudges:
DX8Wrapper::Set_Vertex_Buffer(vb_access);
}
flushSmudges:
++smudgesBatchCount;
DX8Wrapper::Set_Vertex_Buffer(vb_access);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved this call outside the above scope, because that was within the lock of the vertex buffer, which did not appear to cause issues but is technically not right.


DX8Wrapper::Draw_Triangles( 0,smudgesInRenderBatch*4, 0, smudgesInRenderBatch*5);

Expand All @@ -553,6 +558,15 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)
smudgesRemaining -= smudgesInRenderBatch;
}

// TheSuperHackers @bugfix xezon 15/06/2025 Draw a dummy point with the last vertex buffer
// to force the GPU to flush all current pipeline state and commit the previous draw call.
// This is required for some AMD models and drivers that refuse to flush a single draw call
// for the smudges. This draw call is invisible and harmless.
if (smudgesBatchCount == 1)
{
DX8Wrapper::_Get_D3D_Device8()->DrawPrimitive(D3DPT_POINTLIST, 0, 1);
}

DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_MODULATE);
DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAOP,D3DTOP_MODULATE);

Expand Down
Loading