Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-05-10 05:55:06 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix array declarations to use block-formatting

Browse source
This commit is contained in:
Wunkolo 2023-07-11 07:41:17 -07:00
parent 0a605339a3
commit 0f3d77768d
1 changed files with 10 additions and 5 deletions

15
src/core/renderer_gl/renderer_gl.cpp
View file

@ -725,7 +725,8 @@ void RendererGL::setupBlending() {
GL_CONSTANT_ALPHA, GL_CONSTANT_ALPHA,
GL_ONE_MINUS_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA,
GL_SRC_ALPHA_SATURATE, GL_SRC_ALPHA_SATURATE,
GL_ONE}; GL_ONE,
};
if (!blendingEnabled) { if (!blendingEnabled) {
gl.disableBlend(); gl.disableBlend();
@ -759,9 +760,10 @@ void RendererGL::setupBlending() {
void RendererGL::setupTextureEnvState() { void RendererGL::setupTextureEnvState() {
// TODO: Only update uniforms when the TEV config changed. Use an UBO potentially. // TODO: Only update uniforms when the TEV config changed. Use an UBO potentially.
static constexpr std::array<u32, 6> ioBases = {PICA::InternalRegs::TexEnv0Source, PICA::InternalRegs::TexEnv1Source, static constexpr std::array<u32, 6> ioBases = {
PICA::InternalRegs::TexEnv2Source, PICA::InternalRegs::TexEnv3Source, PICA::InternalRegs::TexEnv0Source, PICA::InternalRegs::TexEnv1Source, PICA::InternalRegs::TexEnv2Source,
PICA::InternalRegs::TexEnv4Source, PICA::InternalRegs::TexEnv5Source}; PICA::InternalRegs::TexEnv3Source, PICA::InternalRegs::TexEnv4Source, PICA::InternalRegs::TexEnv5Source,
};
u32 textureEnvSourceRegs[6]; u32 textureEnvSourceRegs[6];
u32 textureEnvOperandRegs[6]; u32 textureEnvOperandRegs[6];
@ -788,7 +790,10 @@ void RendererGL::setupTextureEnvState() {
void RendererGL::bindTexturesToSlots() { void RendererGL::bindTexturesToSlots() {
static constexpr std::array<u32, 3> ioBases = { static constexpr std::array<u32, 3> 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++) { for (int i = 0; i < 3; i++) {
if ((regs[PICA::InternalRegs::TexUnitCfg] & (1 << i)) == 0) { if ((regs[PICA::InternalRegs::TexUnitCfg] & (1 << i)) == 0) {