From 73bf8a524db152ca6e4723c950a61ce4812b041c Mon Sep 17 00:00:00 2001 From: Robin Liu Date: Wed, 14 Aug 2024 13:18:21 -0400 Subject: [PATCH] upate the additional mode name --- .../graphics_pipeline/GraphicsBenchmarkApp.cpp | 2 +- include/ppx/grfx/grfx_enums.h | 14 +++++++------- include/ppx/grfx/grfx_pipeline.h | 2 +- src/ppx/grfx/grfx_pipeline.cpp | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/benchmarks/graphics_pipeline/GraphicsBenchmarkApp.cpp b/benchmarks/graphics_pipeline/GraphicsBenchmarkApp.cpp index d2371dd89..ae14c9ecb 100644 --- a/benchmarks/graphics_pipeline/GraphicsBenchmarkApp.cpp +++ b/benchmarks/graphics_pipeline/GraphicsBenchmarkApp.cpp @@ -779,7 +779,7 @@ Result GraphicsBenchmarkApp::CompilePipeline(const QuadPipelineKey& key) gpCreateInfo.frontFace = grfx::FRONT_FACE_CW; gpCreateInfo.depthReadEnable = false; gpCreateInfo.depthWriteEnable = false; - gpCreateInfo.blendModes[0] = pKnobDisablePsOutput->GetValue() ? grfx::BLEND_MODE_BENCHMARK_DISABLE_OUTPUT : grfx::BLEND_MODE_NONE; + gpCreateInfo.blendModes[0] = pKnobDisablePsOutput->GetValue() ? grfx::BLEND_MODE_DISABLE_OUTPUT : grfx::BLEND_MODE_NONE; gpCreateInfo.outputState.renderTargetCount = 1; gpCreateInfo.outputState.renderTargetFormats[0] = key.renderFormat; gpCreateInfo.outputState.depthStencilFormat = GetSwapchain()->GetDepthFormat(); diff --git a/include/ppx/grfx/grfx_enums.h b/include/ppx/grfx/grfx_enums.h index 298fcc6e0..67aad7814 100644 --- a/include/ppx/grfx/grfx_enums.h +++ b/include/ppx/grfx/grfx_enums.h @@ -69,13 +69,13 @@ enum BlendFactor //! enum BlendMode { - BLEND_MODE_NONE = 0, - BLEND_MODE_ADDITIVE = 1, - BLEND_MODE_ALPHA = 2, - BLEND_MODE_OVER = 3, - BLEND_MODE_UNDER = 4, - BLEND_MODE_PREMULT_ALPHA = 5, - BLEND_MODE_BENCHMARK_DISABLE_OUTPUT = 6, // Mode used for benchmark app to disable vs output. + BLEND_MODE_NONE = 0, + BLEND_MODE_ADDITIVE = 1, + BLEND_MODE_ALPHA = 2, + BLEND_MODE_OVER = 3, + BLEND_MODE_UNDER = 4, + BLEND_MODE_PREMULT_ALPHA = 5, + BLEND_MODE_DISABLE_OUTPUT = 6, // Mode used to disable vs output. }; enum BlendOp diff --git a/include/ppx/grfx/grfx_pipeline.h b/include/ppx/grfx/grfx_pipeline.h index 5362103ad..2136af86e 100644 --- a/include/ppx/grfx/grfx_pipeline.h +++ b/include/ppx/grfx/grfx_pipeline.h @@ -135,7 +135,7 @@ struct BlendAttachmentState static grfx::BlendAttachmentState BlendModeOver(); static grfx::BlendAttachmentState BlendModeUnder(); static grfx::BlendAttachmentState BlendModePremultAlpha(); - static grfx::BlendAttachmentState BlendModeBenchmarkDisableOutput(); + static grfx::BlendAttachmentState BlendModeDisableOutput(); }; struct ColorBlendState diff --git a/src/ppx/grfx/grfx_pipeline.cpp b/src/ppx/grfx/grfx_pipeline.cpp index 4ccfd2921..491c7fe43 100644 --- a/src/ppx/grfx/grfx_pipeline.cpp +++ b/src/ppx/grfx/grfx_pipeline.cpp @@ -98,7 +98,7 @@ grfx::BlendAttachmentState BlendAttachmentState::BlendModePremultAlpha() return state; } -grfx::BlendAttachmentState BlendAttachmentState::BlendModeBenchmarkDisableOutput() +grfx::BlendAttachmentState BlendAttachmentState::BlendModeDisableOutput() { grfx::BlendAttachmentState state = {}; state.blendEnable = false; @@ -193,8 +193,8 @@ void FillOutGraphicsPipelineCreateInfo( case grfx::BLEND_MODE_PREMULT_ALPHA: { pDstCreateInfo->colorBlendState.blendAttachments[i] = grfx::BlendAttachmentState::BlendModePremultAlpha(); } break; - case grfx::BLEND_MODE_BENCHMARK_DISABLE_OUTPUT: { - pDstCreateInfo->colorBlendState.blendAttachments[i] = grfx::BlendAttachmentState::BlendModeBenchmarkDisableOutput(); + case grfx::BLEND_MODE_DISABLE_OUTPUT: { + pDstCreateInfo->colorBlendState.blendAttachments[i] = grfx::BlendAttachmentState::BlendModeDisableOutput(); } } }