Skip to content

Handle front face set using cull mode. #94

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
IsaacMarovitz merged 1 commit into from
Aug 13, 2025
Merged

Handle front face set using cull mode. #94

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
70 changes: 65 additions & 5 deletions MarathonRecomp/gpu/video.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ struct PipelineState
RenderBlend srcBlend = RenderBlend::ONE;
RenderBlend destBlend = RenderBlend::ZERO;
RenderCullMode cullMode = RenderCullMode::NONE;
RenderFrontFace frontFace = RenderFrontFace::CLOCKWISE;
RenderComparisonFunction zFunc = RenderComparisonFunction::LESS;
RenderComparisonFunction stencilFunc = RenderComparisonFunction::ALWAYS;
RenderStencilOp stencilFail = RenderStencilOp::KEEP;
Expand Down Expand Up @@ -1256,14 +1257,16 @@ static void ProcSetRenderState(const RenderCommand& cmd)
RenderCullMode cullMode;

switch (value) {
case D3DCULL_NONE:
case D3DCULL_NONE_2:
case D3DCULL_NONE_CCW:
case D3DCULL_NONE_CW:
cullMode = RenderCullMode::NONE;
break;
case D3DCULL_CW:
case D3DCULL_FRONT_CCW:
case D3DCULL_FRONT_CW:
cullMode = RenderCullMode::FRONT;
break;
case D3DCULL_CCW:
case D3DCULL_BACK_CCW:
case D3DCULL_BACK_CW:
cullMode = RenderCullMode::BACK;
break;
default:
Expand All @@ -1273,6 +1276,7 @@ static void ProcSetRenderState(const RenderCommand& cmd)
}

SetDirtyValue(g_dirtyStates.pipelineState, g_pipelineState.cullMode, cullMode);
SetDirtyValue(g_dirtyStates.pipelineState, g_pipelineState.frontFace, value < D3DCULL_NONE_CW ? RenderFrontFace::COUNTER_CLOCKWISE : RenderFrontFace::CLOCKWISE);
break;
}
case D3DRS_ZFUNC:
Expand Down Expand Up @@ -4418,6 +4422,7 @@ static std::unique_ptr<RenderPipeline> CreateGraphicsPipeline(const PipelineStat
desc.depthClipEnabled = true;
desc.primitiveTopology = pipelineState.primitiveTopology;
desc.cullMode = pipelineState.cullMode;
desc.frontFace = pipelineState.frontFace;
desc.renderTargetFormat[0] = pipelineState.renderTargetFormat;
desc.renderTargetBlend[0].blendEnabled = pipelineState.alphaBlendEnable;
desc.renderTargetBlend[0].srcBlend = pipelineState.srcBlend;
Expand Down Expand Up @@ -4509,10 +4514,24 @@ static RenderPipeline* CreateGraphicsPipelineInRenderThread(PipelineState pipeli
" instancing: {}\n"
" zEnable: {}\n"
" zWriteEnable: {}\n"
" stencilEnable: {}\n"
" stencilTwoSided: {}\n"
" srcBlend: {}\n"
" destBlend: {}\n"
" cullMode: {}\n"
" frontFace: {}\n"
" zFunc: {}\n"
" stencilFunc: {}\n"
" stencilFail: {}\n"
" stencilZFail: {}\n"
" stencilPass: {}\n"
" stencilFuncCCW: {}\n"
" stencilFailCCW: {}\n"
" stencilZFailCCW: {}\n"
" stencilPassCCW: {}\n"
" stencilMask: {}\n"
" stencilWriteMask: {}\n"
" stencilRef: {}\n"
" alphaBlendEnable: {}\n"
" blendOp: {}\n"
" slopeScaledDepthBias: {}\n"
Expand All @@ -4538,10 +4557,24 @@ static RenderPipeline* CreateGraphicsPipelineInRenderThread(PipelineState pipeli
pipelineState.instancing,
pipelineState.zEnable,
pipelineState.zWriteEnable,
pipelineState.stencilEnable,
pipelineState.stencilTwoSided,
magic_enum::enum_name(pipelineState.srcBlend),
magic_enum::enum_name(pipelineState.destBlend),
magic_enum::enum_name(pipelineState.cullMode),
magic_enum::enum_name(pipelineState.frontFace),
magic_enum::enum_name(pipelineState.zFunc),
magic_enum::enum_name(pipelineState.stencilFunc),
magic_enum::enum_name(pipelineState.stencilFail),
magic_enum::enum_name(pipelineState.stencilZFail),
magic_enum::enum_name(pipelineState.stencilPass),
magic_enum::enum_name(pipelineState.stencilFuncCCW),
magic_enum::enum_name(pipelineState.stencilFailCCW),
magic_enum::enum_name(pipelineState.stencilZFailCCW),
magic_enum::enum_name(pipelineState.stencilPassCCW),
pipelineState.stencilMask,
pipelineState.stencilWriteMask,
pipelineState.stencilRef,
pipelineState.alphaBlendEnable,
magic_enum::enum_name(pipelineState.blendOp),
pipelineState.slopeScaledDepthBias,
Expand Down Expand Up @@ -7810,7 +7843,6 @@ class SDLEventListenerForPSOCaching : public SDLEventListener
pipelineState.sampleCount = 1;
pipelineState.enableAlphaToCoverage = false;

pipelineState.specConstants &= ~SPEC_CONSTANT_BICUBIC_GI_FILTER;
if ((pipelineState.specConstants & SPEC_CONSTANT_ALPHA_TO_COVERAGE) != 0)
{
pipelineState.specConstants &= ~SPEC_CONSTANT_ALPHA_TO_COVERAGE;
Expand Down Expand Up @@ -7840,10 +7872,24 @@ class SDLEventListenerForPSOCaching : public SDLEventListener
"{},"
"{},"
"{},"
"{},"
"{},"
"RenderBlend::{},"
"RenderBlend::{},"
"RenderCullMode::{},"
"RenderFrontFace::{},"
"RenderComparisonFunction::{},"
"RenderComparisonFunction::{},"
"RenderStencilOp::{},"
"RenderStencilOp::{},"
"RenderStencilOp::{},"
"RenderComparisonFunction::{},"
"RenderStencilOp::{},"
"RenderStencilOp::{},"
"RenderStencilOp::{},"
"{},"
"{},"
"{},"
"{},"
"RenderBlendOperation::{},"
"{},"
Expand All @@ -7865,10 +7911,24 @@ class SDLEventListenerForPSOCaching : public SDLEventListener
pipelineState.instancing,
pipelineState.zEnable,
pipelineState.zWriteEnable,
pipelineState.stencilEnable,
pipelineState.stencilTwoSided,
magic_enum::enum_name(pipelineState.srcBlend),
magic_enum::enum_name(pipelineState.destBlend),
magic_enum::enum_name(pipelineState.cullMode),
magic_enum::enum_name(pipelineState.frontFace),
magic_enum::enum_name(pipelineState.zFunc),
magic_enum::enum_name(pipelineState.stencilFunc),
magic_enum::enum_name(pipelineState.stencilFail),
magic_enum::enum_name(pipelineState.stencilZFail),
magic_enum::enum_name(pipelineState.stencilPass),
magic_enum::enum_name(pipelineState.stencilFuncCCW),
magic_enum::enum_name(pipelineState.stencilFailCCW),
magic_enum::enum_name(pipelineState.stencilZFailCCW),
magic_enum::enum_name(pipelineState.stencilPassCCW),
pipelineState.stencilMask,
pipelineState.stencilWriteMask,
pipelineState.stencilRef,
pipelineState.alphaBlendEnable,
magic_enum::enum_name(pipelineState.blendOp),
pipelineState.slopeScaledDepthBias,
Expand Down
10 changes: 6 additions & 4 deletions MarathonRecomp/gpu/video.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,12 @@ enum GuestRenderState

enum GuestCullMode
{
D3DCULL_NONE = 0,
D3DCULL_CW = 2,
D3DCULL_NONE_2 = 4,
D3DCULL_CCW = 6
D3DCULL_NONE_CCW = 0,
D3DCULL_FRONT_CCW = 1,
D3DCULL_BACK_CCW = 2,
D3DCULL_NONE_CW = 4,
D3DCULL_FRONT_CW = 5,
D3DCULL_BACK_CW = 6
};

enum GuestBlendMode
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/plume
Open in desktop
Submodule plume updated 4 files
+2 −0 plume_d3d12.cpp
+18 −1 plume_metal.cpp
+7 −0 plume_render_interface_types.h
+13 −1 plume_vulkan.cpp
Loading