From 0f3d77768dd5408cfaec6c0f0d505b4b7bae1b24 Mon Sep 17 00:00:00 2001 From: Wunkolo Date: Tue, 11 Jul 2023 07:41:17 -0700 Subject: [PATCH] Fix array declarations to use block-formatting --- src/core/renderer_gl/renderer_gl.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/core/renderer_gl/renderer_gl.cpp b/src/core/renderer_gl/renderer_gl.cpp index bcfb0dc0..3a587046 100644 --- a/src/core/renderer_gl/renderer_gl.cpp +++ b/src/core/renderer_gl/renderer_gl.cpp @@ -725,7 +725,8 @@ void RendererGL::setupBlending() { GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, GL_SRC_ALPHA_SATURATE, - GL_ONE}; + GL_ONE, + }; if (!blendingEnabled) { gl.disableBlend(); @@ -759,9 +760,10 @@ void RendererGL::setupBlending() { void RendererGL::setupTextureEnvState() { // TODO: Only update uniforms when the TEV config changed. Use an UBO potentially. - static constexpr std::array ioBases = {PICA::InternalRegs::TexEnv0Source, PICA::InternalRegs::TexEnv1Source, - PICA::InternalRegs::TexEnv2Source, PICA::InternalRegs::TexEnv3Source, - PICA::InternalRegs::TexEnv4Source, PICA::InternalRegs::TexEnv5Source}; + static constexpr std::array ioBases = { + PICA::InternalRegs::TexEnv0Source, PICA::InternalRegs::TexEnv1Source, PICA::InternalRegs::TexEnv2Source, + PICA::InternalRegs::TexEnv3Source, PICA::InternalRegs::TexEnv4Source, PICA::InternalRegs::TexEnv5Source, + }; u32 textureEnvSourceRegs[6]; u32 textureEnvOperandRegs[6]; @@ -788,7 +790,10 @@ void RendererGL::setupTextureEnvState() { void RendererGL::bindTexturesToSlots() { static constexpr std::array ioBases = { - PICA::InternalRegs::Tex0BorderColor, PICA::InternalRegs::Tex1BorderColor, PICA::InternalRegs::Tex2BorderColor}; + PICA::InternalRegs::Tex0BorderColor, + PICA::InternalRegs::Tex1BorderColor, + PICA::InternalRegs::Tex2BorderColor, + }; for (int i = 0; i < 3; i++) { if ((regs[PICA::InternalRegs::TexUnitCfg] & (1 << i)) == 0) {