Mesa (mesa_7_7_branch): progs/glsl: Silence compiler warnings.

Vinson Lee vlee at kemper.freedesktop.org
Tue Dec 29 21:12:05 PST 2009


Module: Mesa
Branch: mesa_7_7_branch
Commit: 0ab29d2b35bff913818f34d1979295a98cbe2b71
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ab29d2b35bff913818f34d1979295a98cbe2b71

Author: Vinson Lee <vlee at vmware.com>
Date:   Tue Dec 29 21:11:37 2009 -0800

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 88315d7..3c79543 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 4c8bfa5..2b93c78 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)
 {



More information about the mesa-commit mailing list