From 5e2ea815935a00bb9a807373782a3463b68af332 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 22 Feb 2025 07:40:12 +1100 Subject: [PATCH] Avoid lighting unless needed --- GL/state.c | 3 --- GL/tnl_effects.c | 7 +++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GL/state.c b/GL/state.c index faee889..e247624 100644 --- a/GL/state.c +++ b/GL/state.c @@ -428,7 +428,6 @@ void _glInitContext() { glDisable(GL_DEPTH_TEST); glDisable(GL_TEXTURE_2D); glDisable(GL_FOG); - glDisable(GL_LIGHTING); GLubyte i; for(i = 0; i < MAX_GLDC_LIGHTS; ++i) { @@ -472,7 +471,6 @@ GLAPI void APIENTRY glEnable(GLenum cap) { case GL_LIGHTING: { if(GPUState.lighting_enabled != GL_TRUE) { GPUState.lighting_enabled = GL_TRUE; - GPUState.is_dirty = GL_TRUE; _glTnlUpdateLighting(); } } break; @@ -584,7 +582,6 @@ GLAPI void APIENTRY glDisable(GLenum cap) { case GL_LIGHTING: { if(GPUState.lighting_enabled != GL_FALSE) { GPUState.lighting_enabled = GL_FALSE; - GPUState.is_dirty = GL_TRUE; _glTnlUpdateLighting(); } } break; diff --git a/GL/tnl_effects.c b/GL/tnl_effects.c index 6a20975..2325f5a 100644 --- a/GL/tnl_effects.c +++ b/GL/tnl_effects.c @@ -9,7 +9,10 @@ #include "platform.h" #define MAX_TNL_EFFECTS 3 +#define TNL_EFFECT_NONE 0x00 +#define TNL_EFFECT_VIEW_SPACE 0x01 +typedef void (*TnlEffect)(SubmissionTarget* target); static struct tnl_effect { GLint flags; TnlEffect func; @@ -30,7 +33,7 @@ static void updateEffectList(void) { } } -void _glTnlAddEffect(GLint flags, TnlEffect func) { +static void _glTnlAddEffect(GLint flags, TnlEffect func) { if (TNL_COUNT == MAX_TNL_EFFECTS) return; TNL_EFFECTS[TNL_COUNT].flags = flags; @@ -40,7 +43,7 @@ void _glTnlAddEffect(GLint flags, TnlEffect func) { updateEffectList(); } -void _glTnlRemoveEffect(TnlEffect func) { +static void _glTnlRemoveEffect(TnlEffect func) { int i, j; for (i = TNL_COUNT - 1; i >= 0; i--) {