mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-10-24 08:59:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VideoBackends / VideoCommon: rename member variables in RenderState to be consistent

Browse source
This commit is contained in:
iwubcode 2025-08-23 13:35:05 -05:00
commit 14459bcc1b
25 changed files with 340 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Source/Core/VideoBackends/OGL/OGLGfx.cpp
View file

@ -366,11 +366,11 @@ void OGLGfx::SetAndClearFramebuffer(AbstractFramebuffer* framebuffer, const Clea
// Restore color/depth mask.
if (framebuffer->HasColorBuffer())
{
glColorMask(m_current_blend_state.colorupdate, m_current_blend_state.colorupdate,
m_current_blend_state.colorupdate, m_current_blend_state.alphaupdate);
glColorMask(m_current_blend_state.color_update, m_current_blend_state.color_update,
m_current_blend_state.color_update, m_current_blend_state.alpha_update);
}
if (framebuffer->HasDepthBuffer())
glDepthMask(m_current_depth_state.updateenable);
glDepthMask(m_current_depth_state.update_enable);
}
void OGLGfx::ClearRegion(const MathUtil::Rectangle<int>& target_rc, bool colorEnable,
@ -400,11 +400,11 @@ void OGLGfx::ClearRegion(const MathUtil::Rectangle<int>& target_rc, bool colorEn
// Restore color/depth mask.
if (colorEnable || alphaEnable)
{
glColorMask(m_current_blend_state.colorupdate, m_current_blend_state.colorupdate,
m_current_blend_state.colorupdate, m_current_blend_state.alphaupdate);
glColorMask(m_current_blend_state.color_update, m_current_blend_state.color_update,
m_current_blend_state.color_update, m_current_blend_state.alpha_update);
}
if (zEnable)
glDepthMask(m_current_depth_state.updateenable);
glDepthMask(m_current_depth_state.update_enable);
}
bool OGLGfx::BindBackbuffer(const ClearColor& clear_color)
@ -510,11 +510,11 @@ void OGLGfx::ApplyRasterizationState(const RasterizationState state)
return;
// none, ccw, cw, ccw
if (state.cullmode != CullMode::None)
if (state.cull_mode != CullMode::None)
{
// TODO: GX_CULL_ALL not supported, yet!
glEnable(GL_CULL_FACE);
glFrontFace(state.cullmode == CullMode::Front ? GL_CCW : GL_CW);
glFrontFace(state.cull_mode == CullMode::Front ? GL_CCW : GL_CW);
}
else
{
@ -532,10 +532,10 @@ void OGLGfx::ApplyDepthState(const DepthState state)
const GLenum glCmpFuncs[8] = {GL_NEVER, GL_LESS, GL_EQUAL, GL_LEQUAL,
GL_GREATER, GL_NOTEQUAL, GL_GEQUAL, GL_ALWAYS};
if (state.testenable)
if (state.test_enable)
{
glEnable(GL_DEPTH_TEST);
glDepthMask(state.updateenable ? GL_TRUE : GL_FALSE);
glDepthMask(state.update_enable ? GL_TRUE : GL_FALSE);
glDepthFunc(glCmpFuncs[u32(state.func.Value())]);
}
else
@ -555,7 +555,7 @@ void OGLGfx::ApplyBlendingState(const BlendingState state)
if (m_current_blend_state == state)
return;
bool useDualSource = state.usedualsrc;
bool useDualSource = state.use_dual_src;
const GLenum src_factors[8] = {GL_ZERO,
GL_ONE,
@ -576,7 +576,7 @@ void OGLGfx::ApplyBlendingState(const BlendingState state)
GL_DST_ALPHA,
GL_ONE_MINUS_DST_ALPHA};
if (state.blendenable)
if (state.blend_enable)
glEnable(GL_BLEND);
else
glDisable(GL_BLEND);
@ -586,12 +586,12 @@ void OGLGfx::ApplyBlendingState(const BlendingState state)
// driver issues?). See https://bugs.dolphin-emu.org/issues/10120 : "Sonic
// Adventure 2 Battle: graphics crash when loading first Dark level"
GLenum equation = state.subtract ? GL_FUNC_REVERSE_SUBTRACT : GL_FUNC_ADD;
GLenum equationAlpha = state.subtractAlpha ? GL_FUNC_REVERSE_SUBTRACT : GL_FUNC_ADD;
GLenum equationAlpha = state.subtract_alpha ? GL_FUNC_REVERSE_SUBTRACT : GL_FUNC_ADD;
glBlendEquationSeparate(equation, equationAlpha);
glBlendFuncSeparate(src_factors[u32(state.srcfactor.Value())],
dst_factors[u32(state.dstfactor.Value())],
src_factors[u32(state.srcfactoralpha.Value())],
dst_factors[u32(state.dstfactoralpha.Value())]);
glBlendFuncSeparate(src_factors[u32(state.src_factor.Value())],
dst_factors[u32(state.dst_factor.Value())],
src_factors[u32(state.src_factor_alpha.Value())],
dst_factors[u32(state.dst_factor_alpha.Value())]);
const GLenum logic_op_codes[16] = {
GL_CLEAR, GL_AND, GL_AND_REVERSE, GL_COPY, GL_AND_INVERTED, GL_NOOP,
@ -601,10 +601,10 @@ void OGLGfx::ApplyBlendingState(const BlendingState state)
// Logic ops aren't available in GLES3
if (!IsGLES())
{
if (state.logicopenable)
if (state.logic_op_enable)
{
glEnable(GL_COLOR_LOGIC_OP);
glLogicOp(logic_op_codes[u32(state.logicmode.Value())]);
glLogicOp(logic_op_codes[u32(state.logic_mode.Value())]);
}
else
{
@ -612,7 +612,7 @@ void OGLGfx::ApplyBlendingState(const BlendingState state)
}
}
glColorMask(state.colorupdate, state.colorupdate, state.colorupdate, state.alphaupdate);
glColorMask(state.color_update, state.color_update, state.color_update, state.alpha_update);
m_current_blend_state = state;
}