From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 16 Apr 2012 21:40:45 +0000 (-0700)
Subject: glsl: Make the standalone compiler accept '.glsl' files.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7e35d97a02cf139746ce9e85b78fe0c651139074;p=mesa.git

glsl: Make the standalone compiler accept '.glsl' files.

These ought to be treated as 'any stage', but for now, they're just
treated as vertex shaders.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index d43bf1a7463..3231b1be936 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -238,7 +238,7 @@ main(int argc, char **argv)
 	 usage_fail(argv[0]);
 
       const char *const ext = & argv[optind][len - 5];
-      if (strncmp(".vert", ext, 5) == 0)
+      if (strncmp(".vert", ext, 5) == 0 || strncmp(".glsl", ext, 5) == 0)
 	 shader->Type = GL_VERTEX_SHADER;
       else if (strncmp(".geom", ext, 5) == 0)
 	 shader->Type = GL_GEOMETRY_SHADER;