mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't update lights unnecessarily

Browse Source
This commit is contained in:
Luke Benstead 2023-03-23 20:01:41 +00:00
parent 0c5f941098
commit 6ee9a823c1
3 changed files with 66 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
GL/lighting.c
View File

@ -124,8 +124,10 @@ void APIENTRY glLightModeli(GLenum pname, const GLint param) {
void APIENTRY glLightModelfv(GLenum pname, const GLfloat *params) { void APIENTRY glLightModelfv(GLenum pname, const GLfloat *params) {
switch(pname) { switch(pname) {
case GL_LIGHT_MODEL_AMBIENT: { case GL_LIGHT_MODEL_AMBIENT: {
_glSetLightModelSceneAmbient(params); if(memcmp(_glGetLightModelSceneAmbient(), params, sizeof(float) * 4) != 0) {
_glPrecalcLightingValues(SCENE_AMBIENT_MASK); _glSetLightModelSceneAmbient(params);
_glPrecalcLightingValues(SCENE_AMBIENT_MASK);
}
} break; } break;
case GL_LIGHT_MODEL_LOCAL_VIEWER: case GL_LIGHT_MODEL_LOCAL_VIEWER:
_glSetLightModelViewerInEyeCoordinates((*params) ? GL_TRUE : GL_FALSE); _glSetLightModelViewerInEyeCoordinates((*params) ? GL_TRUE : GL_FALSE);
@ -164,18 +166,28 @@ void APIENTRY glLightfv(GLenum light, GLenum pname, const GLfloat *params) {
LightSource* l = _glLightAt(idx); LightSource* l = _glLightAt(idx);
GLboolean rebuild = GL_FALSE;
switch(pname) { switch(pname) {
case GL_AMBIENT: case GL_AMBIENT:
memcpy(l->ambient, params, sizeof(GLfloat) * 4); rebuild = memcmp(l->ambient, params, sizeof(GLfloat) * 4) != 0;
if(rebuild) {
memcpy(l->ambient, params, sizeof(GLfloat) * 4);
}
break; break;
case GL_DIFFUSE: case GL_DIFFUSE:
memcpy(l->diffuse, params, sizeof(GLfloat) * 4); rebuild = memcmp(l->diffuse, params, sizeof(GLfloat) * 4) != 0;
if(rebuild) {
memcpy(l->diffuse, params, sizeof(GLfloat) * 4);
}
break; break;
case GL_SPECULAR: case GL_SPECULAR:
memcpy(l->specular, params, sizeof(GLfloat) * 4); rebuild = memcmp(l->specular, params, sizeof(GLfloat) * 4) != 0;
if(rebuild) {
memcpy(l->specular, params, sizeof(GLfloat) * 4);
}
break; break;
case GL_POSITION: { case GL_POSITION: {
_glMatrixLoadModelView();
memcpy(l->position, params, sizeof(GLfloat) * 4); memcpy(l->position, params, sizeof(GLfloat) * 4);
l->isDirectional = params[3] == 0.0f; l->isDirectional = params[3] == 0.0f;
@ -183,6 +195,7 @@ void APIENTRY glLightfv(GLenum light, GLenum pname, const GLfloat *params) {
if(l->isDirectional) { if(l->isDirectional) {
//FIXME: Do we need to rotate directional lights? //FIXME: Do we need to rotate directional lights?
} else { } else {
_glMatrixLoadModelView();
TransformVec3(l->position); TransformVec3(l->position);
} }
} }
@ -204,7 +217,10 @@ void APIENTRY glLightfv(GLenum light, GLenum pname, const GLfloat *params) {
return; return;
} }
_glPrecalcLightingValues(mask); if(rebuild) {
_glPrecalcLightingValues(mask);
}
} }
void APIENTRY glLightf(GLenum light, GLenum pname, GLfloat param) { void APIENTRY glLightf(GLenum light, GLenum pname, GLfloat param) {
@ -258,25 +274,47 @@ void APIENTRY glMaterialfv(GLenum face, GLenum pname, const GLfloat *params) {
Material* material = _glActiveMaterial(); Material* material = _glActiveMaterial();
GLboolean rebuild = GL_FALSE;
switch(pname) { switch(pname) {
case GL_SHININESS: case GL_SHININESS:
glMaterialf(face, pname, *params); glMaterialf(face, pname, *params);
rebuild = GL_TRUE;
break; break;
case GL_AMBIENT: case GL_AMBIENT: {
vec4cpy(material->ambient, params); if(memcmp(material->ambient, params, sizeof(float) * 4) != 0) {
break; vec4cpy(material->ambient, params);
rebuild = GL_TRUE;
}
} break;
case GL_DIFFUSE: case GL_DIFFUSE:
vec4cpy(material->diffuse, params); if(memcmp(material->diffuse, params, sizeof(float) * 4) != 0) {
vec4cpy(material->diffuse, params);
rebuild = GL_TRUE;
}
break; break;
case GL_SPECULAR: case GL_SPECULAR:
vec4cpy(material->specular, params); if(memcmp(material->specular, params, sizeof(float) * 4) != 0) {
vec4cpy(material->specular, params);
rebuild = GL_TRUE;
}
break; break;
case GL_EMISSION: case GL_EMISSION:
vec4cpy(material->emissive, params); if(memcmp(material->emissive, params, sizeof(float) * 4) != 0) {
vec4cpy(material->emissive, params);
rebuild = GL_TRUE;
}
break; break;
case GL_AMBIENT_AND_DIFFUSE: { case GL_AMBIENT_AND_DIFFUSE: {
vec4cpy(material->ambient, params); rebuild = (
vec4cpy(material->diffuse, params); memcmp(material->ambient, params, sizeof(float) * 4) != 0 ||
memcmp(material->diffuse, params, sizeof(float) * 4) != 0
);
if(rebuild) {
vec4cpy(material->ambient, params);
vec4cpy(material->diffuse, params);
}
} break; } break;
case GL_COLOR_INDEXES: case GL_COLOR_INDEXES:
default: { default: {
@ -285,13 +323,15 @@ void APIENTRY glMaterialfv(GLenum face, GLenum pname, const GLfloat *params) {
} }
} }
GLuint updateMask = (pname == GL_AMBIENT) ? AMBIENT_MASK: if(rebuild) {
(pname == GL_DIFFUSE) ? DIFFUSE_MASK: GLuint updateMask = (pname == GL_AMBIENT) ? AMBIENT_MASK:
(pname == GL_SPECULAR) ? SPECULAR_MASK: (pname == GL_DIFFUSE) ? DIFFUSE_MASK:
(pname == GL_EMISSION) ? EMISSION_MASK: (pname == GL_SPECULAR) ? SPECULAR_MASK:
(pname == GL_AMBIENT_AND_DIFFUSE) ? AMBIENT_MASK | DIFFUSE_MASK : 0; (pname == GL_EMISSION) ? EMISSION_MASK:
(pname == GL_AMBIENT_AND_DIFFUSE) ? AMBIENT_MASK | DIFFUSE_MASK : 0;
_glPrecalcLightingValues(updateMask); _glPrecalcLightingValues(updateMask);
}
} }
void APIENTRY glColorMaterial(GLenum face, GLenum mode) { void APIENTRY glColorMaterial(GLenum face, GLenum mode) {

1
GL/private.h
View File

@ -520,6 +520,7 @@ void _glSetLightModelColorControl(GLint v);
GLuint _glEnabledLightCount(); GLuint _glEnabledLightCount();
void _glRecalcEnabledLights(); void _glRecalcEnabledLights();
GLfloat* _glLightModelSceneAmbient(); GLfloat* _glLightModelSceneAmbient();
GLfloat* _glGetLightModelSceneAmbient();
LightSource* _glLightAt(GLuint i); LightSource* _glLightAt(GLuint i);
GLboolean _glNearZClippingEnabled(); GLboolean _glNearZClippingEnabled();

4
GL/state.c
View File

@ -180,6 +180,10 @@ void _glSetLightModelSceneAmbient(const GLfloat* v) {
vec4cpy(GPUState.scene_ambient, v); vec4cpy(GPUState.scene_ambient, v);
} }
GLfloat* _glGetLightModelSceneAmbient() {
return GPUState.scene_ambient;
}
void _glSetLightModelColorControl(GLint v) { void _glSetLightModelColorControl(GLint v) {
GPUState.color_control = v; GPUState.color_control = v;
} }