Mesa (master): glsl: Support GLSL ES in the standalone compile.

Kenneth Graunke kwg at kemper.freedesktop.org
Wed Sep 8 11:09:59 UTC 2010


Module: Mesa
Branch: master
Commit: 1a5b32ca0198488e7d616c8cd968471166a97ef3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a5b32ca0198488e7d616c8cd968471166a97ef3

Author: Chia-I Wu <olv at lunarg.com>
Date:   Wed Sep  8 18:52:27 2010 +0800

glsl: Support GLSL ES in the standalone compile.

GLSL ES mode is enabled when --glsl-es is passed to glsl_compiler.

---

 src/glsl/main.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 982562c..2a7a713 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -144,12 +144,14 @@ usage_fail(const char *name)
 }
 
 
+int glsl_es = 0;
 int dump_ast = 0;
 int dump_hir = 0;
 int dump_lir = 0;
 int do_link = 0;
 
 const struct option compiler_opts[] = {
+   { "glsl-es",  0, &glsl_es,  1 },
    { "dump-ast", 0, &dump_ast, 1 },
    { "dump-hir", 0, &dump_hir, 1 },
    { "dump-lir", 0, &dump_lir, 1 },
@@ -262,7 +264,7 @@ main(int argc, char **argv)
    if (argc <= optind)
       usage_fail(argv[0]);
 
-   initialize_context(ctx, API_OPENGL);
+   initialize_context(ctx, (glsl_es) ? API_OPENGLES2 : API_OPENGL);
 
    struct gl_shader_program *whole_program;
 




More information about the mesa-commit mailing list