diff options
author | Thomas White <taw27@leoid.msm.cam.ac.uk> | 2008-08-11 14:06:39 +0100 |
---|---|---|
committer | Thomas White <taw27@leoid.msm.cam.ac.uk> | 2008-08-11 14:06:39 +0100 |
commit | f0451fde95eefc6f05e465b381fec345e0de8d1c (patch) | |
tree | fcbdcadcf3903467cfc67e21ef2ce4e8b5c0e1b8 | |
parent | 46d5536fd101f9849133f74d8f29d59dbd3bfff6 (diff) |
Fix a few missing shader checks
-rw-r--r-- | src/render.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/render.c b/src/render.c index 2a81d8d..bce3dbd 100644 --- a/src/render.c +++ b/src/render.c @@ -283,8 +283,10 @@ static int render_model_instance_draw(ModelInstance *instance, Uint32 t, RenderC } glMaterialfv(GL_FRONT, GL_SPECULAR, spec); glMaterialf(GL_FRONT, GL_SHININESS, p->shininess); - shaderutils_setunf(r->lighting_program, "shininess", p->shininess); - shaderutils_setunf(r->fill_program, "shininess", p->shininess); + if ( r->shaders ) { + shaderutils_setunf(r->lighting_program, "shininess", p->shininess); + shaderutils_setunf(r->fill_program, "shininess", p->shininess); + } } else { glMaterialfv(GL_FRONT, GL_SPECULAR, black); } @@ -341,7 +343,7 @@ static int render_model_instance_draw(ModelInstance *instance, Uint32 t, RenderC glDrawArrays(render_gltype(p->type), 0, p->num_vertices); *nvert += p->num_vertices; glDisable(GL_TEXTURE_2D); - shaderutils_setuni(r->lighting_program, "has_normals", 0); + if ( r->shaders ) shaderutils_setuni(r->lighting_program, "has_normals", 0); glPopMatrix(); if ( p->attribs & ATTRIB_SWIRLY ) { |