From 0ab29d2b35bff913818f34d1979295a98cbe2b71 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Tue, 29 Dec 2009 21:11:37 -0800 Subject: [PATCH] progs/glsl: Silence compiler warnings. --- progs/glsl/shtest.c | 4 +++- progs/glsl/vert-tex.c | 9 --------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c index 88315d74614..3c795437f42 100644 --- a/progs/glsl/shtest.c +++ b/progs/glsl/shtest.c @@ -493,7 +493,9 @@ ReadConfigFile(const char *filename, struct config_file *conf) /* ugly but functional parser */ while (!feof(f)) { - fgets(line, sizeof(line), f); + char *result; + result = fgets(line, sizeof(line), f); + (void) result; if (!feof(f) && line[0]) { if (strncmp(line, "vs ", 3) == 0) { VertShaderFile = strdup(line + 3); diff --git a/progs/glsl/vert-tex.c b/progs/glsl/vert-tex.c index 4c8bfa587aa..2b93c788889 100644 --- a/progs/glsl/vert-tex.c +++ b/progs/glsl/vert-tex.c @@ -40,15 +40,6 @@ static GLboolean Anim = GL_TRUE; static GLboolean WireFrame = GL_TRUE; static GLfloat xRot = -70.0f, yRot = 0.0f, zRot = 0.0f; - -/* value[0] = tex unit */ -static struct uniform_info Uniforms[] = { - { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 }, - END_OF_UNIFORMS -}; - - - static void Idle(void) { -- 2.30.2