From b16b9e4656e7199c2aec74a4c8ebc7a875d3ba73 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 2 Feb 2015 15:02:49 +0100
Subject: massive reduction of unneeded files

---
 nx-X11/extras/Mesa/src/mesa/shader/arbprogram.syn  | 2786 -------------
 nx-X11/extras/Mesa/src/mesa/shader/asmopcodes.reg  |   78 -
 nx-X11/extras/Mesa/src/mesa/shader/descrip.mms     |   83 -
 .../Mesa/src/mesa/shader/grammar/descrip.mms       |   41 -
 .../Mesa/src/mesa/shader/grammar/grammar.syn       |  567 ---
 .../Mesa/src/mesa/shader/grammar/grammar_crt.c     |   64 -
 .../Mesa/src/mesa/shader/grammar/grammar_crt.h     |   20 -
 .../Mesa/src/mesa/shader/slang/Include/BaseTypes.h |  133 -
 .../Mesa/src/mesa/shader/slang/Include/Common.h    |  288 --
 .../src/mesa/shader/slang/Include/ConstantUnion.h  |   50 -
 .../Mesa/src/mesa/shader/slang/Include/InfoSink.h  |  135 -
 .../mesa/shader/slang/Include/InitializeGlobals.h  |   43 -
 .../shader/slang/Include/InitializeParseContext.h  |   44 -
 .../Mesa/src/mesa/shader/slang/Include/PoolAlloc.h |  346 --
 .../src/mesa/shader/slang/Include/ResourceLimits.h |   61 -
 .../Mesa/src/mesa/shader/slang/Include/ShHandle.h  |  177 -
 .../Mesa/src/mesa/shader/slang/Include/Types.h     |  297 --
 .../src/mesa/shader/slang/Include/intermediate.h   |  516 ---
 .../slang/MachineIndependent/Gen_glslang.cpp       | 2942 -------------
 .../slang/MachineIndependent/Gen_glslang_tab.cpp   | 4354 --------------------
 .../shader/slang/MachineIndependent/InfoSink.cpp   |  107 -
 .../shader/slang/MachineIndependent/Initialize.cpp |  948 -----
 .../shader/slang/MachineIndependent/Initialize.h   |   58 -
 .../slang/MachineIndependent/IntermTraverse.cpp    |  243 --
 .../slang/MachineIndependent/Intermediate.cpp      | 2110 ----------
 .../mesa/shader/slang/MachineIndependent/MMap.h    |   84 -
 .../slang/MachineIndependent/ParseHelper.cpp       | 1452 -------
 .../shader/slang/MachineIndependent/ParseHelper.h  |  143 -
 .../shader/slang/MachineIndependent/PoolAlloc.cpp  |  349 --
 .../slang/MachineIndependent/QualifierAlive.cpp    |   91 -
 .../slang/MachineIndependent/QualifierAlive.h      |   35 -
 .../shader/slang/MachineIndependent/RemoveTree.cpp |   98 -
 .../shader/slang/MachineIndependent/RemoveTree.h   |   35 -
 .../shader/slang/MachineIndependent/ShaderLang.cpp |  607 ---
 .../slang/MachineIndependent/SymbolTable.cpp       |  235 --
 .../shader/slang/MachineIndependent/SymbolTable.h  |  320 --
 .../mesa/shader/slang/MachineIndependent/glslang.l |  614 ---
 .../mesa/shader/slang/MachineIndependent/glslang.y | 2009 ---------
 .../shader/slang/MachineIndependent/glslang_tab.h  |  260 --
 .../shader/slang/MachineIndependent/intermOut.cpp  |  496 ---
 .../slang/MachineIndependent/localintermediate.h   |   91 -
 .../shader/slang/MachineIndependent/parseConst.cpp |  344 --
 .../slang/MachineIndependent/preprocessor/atom.c   |  768 ----
 .../slang/MachineIndependent/preprocessor/atom.h   |   96 -
 .../MachineIndependent/preprocessor/compile.h      |  132 -
 .../slang/MachineIndependent/preprocessor/cpp.c    | 1037 -----
 .../slang/MachineIndependent/preprocessor/cpp.h    |  119 -
 .../preprocessor/cpp_comment_fix.c                 |   76 -
 .../MachineIndependent/preprocessor/cppstruct.c    |  185 -
 .../slang/MachineIndependent/preprocessor/memory.c |  191 -
 .../slang/MachineIndependent/preprocessor/memory.h |   89 -
 .../slang/MachineIndependent/preprocessor/parser.h |  126 -
 .../MachineIndependent/preprocessor/preprocess.h   |   84 -
 .../MachineIndependent/preprocessor/scanner.c      |  789 ----
 .../MachineIndependent/preprocessor/scanner.h      |  118 -
 .../MachineIndependent/preprocessor/slglobals.h    |  115 -
 .../MachineIndependent/preprocessor/symbols.c      |  318 --
 .../MachineIndependent/preprocessor/symbols.h      |  145 -
 .../slang/MachineIndependent/preprocessor/tokens.c |  462 ---
 .../slang/MachineIndependent/preprocessor/tokens.h |  122 -
 .../mesa/shader/slang/MachineIndependent/unistd.h  |    1 -
 .../slang/OGLCompilersDLL/Initialisation.cpp       |  151 -
 .../shader/slang/OGLCompilersDLL/Initialisation.h  |   47 -
 .../shader/slang/OSDependent/Linux/osinclude.h     |   78 -
 .../shader/slang/OSDependent/Linux/ossource.cpp    |  140 -
 .../shader/slang/OSDependent/Windows/osinclude.h   |   68 -
 .../shader/slang/OSDependent/Windows/ossource.cpp  |  119 -
 .../Mesa/src/mesa/shader/slang/Public/ShaderLang.h |  212 -
 .../src/mesa/shader/slang/Public/ShaderLangExt.h   |   57 -
 .../extras/Mesa/src/mesa/shader/slang/descrip.mms  |   52 -
 .../Mesa/src/mesa/shader/slang/library/gc_to_bin.c |   79 -
 .../src/mesa/shader/slang/library/gc_to_string.py  |   55 -
 .../shader/slang/library/slang_common_builtin.gc   | 1410 -------
 .../src/mesa/shader/slang/library/slang_core.gc    | 1565 -------
 .../shader/slang/library/slang_fragment_builtin.gc |  366 --
 .../src/mesa/shader/slang/library/slang_shader.syn | 1508 -------
 .../mesa/shader/slang/library/slang_version.syn    |  118 -
 .../shader/slang/library/slang_vertex_builtin.gc   |  262 --
 .../Mesa/src/mesa/shader/slang/slang_mesa.cpp      |  144 -
 .../extras/Mesa/src/mesa/shader/slang/slang_mesa.h |   36 -
 80 files changed, 35194 deletions(-)
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/arbprogram.syn
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/asmopcodes.reg
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/descrip.mms
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/grammar/descrip.mms
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.syn
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.c
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/BaseTypes.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Common.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ConstantUnion.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeGlobals.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeParseContext.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/PoolAlloc.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ResourceLimits.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ShHandle.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Types.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Include/intermediate.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang_tab.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/InfoSink.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/IntermTraverse.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Intermediate.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/MMap.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ShaderLang.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.h
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang.l
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang.y
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang_tab.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/intermOut.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/localintermediate.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/parseConst.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.c
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/compile.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.c
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.h
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp_comment_fix.c
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cppstruct.c
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.c
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/parser.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/preprocess.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.c
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/slglobals.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.c
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.c
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/unistd.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/osinclude.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/ossource.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/osinclude.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/ossource.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLang.h
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLangExt.h
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/slang/descrip.mms
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_bin.c
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_string.py
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin.gc
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core.gc
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin.gc
 delete mode 100644 nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader.syn
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version.syn
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin.gc
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.cpp
 delete mode 100755 nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.h

(limited to 'nx-X11/extras/Mesa/src/mesa/shader')

diff --git a/nx-X11/extras/Mesa/src/mesa/shader/arbprogram.syn b/nx-X11/extras/Mesa/src/mesa/shader/arbprogram.syn
deleted file mode 100644
index 6ab0f2693..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogram.syn
+++ /dev/null
@@ -1,2786 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.2
- *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
- 
- /**
- * \file arbprogram.syn
- * ARB_fragment/vertex_program syntax
- * \author Michal Krol
- */
- 
-.syntax program;
-
-/*
-   This value must be incremented every time emit code values or structure of the production
-   array changes. This value is placed at the beginning of the production array. The loader
-   compares the value with its REVISION value. If they do not match, the loader is not up
-   to date.
-*/
-.emtcode REVISION                                   0x09
-
-/* program type */
-.emtcode FRAGMENT_PROGRAM                           0x01
-.emtcode VERTEX_PROGRAM                             0x02
-
-/* program section */
-.emtcode OPTION                                     0x01
-.emtcode INSTRUCTION                                0x02
-.emtcode DECLARATION                                0x03
-.emtcode END                                        0x04
-
-/* GL_ARB_fragment_program option */
-.emtcode ARB_PRECISION_HINT_FASTEST                 0x00
-.emtcode ARB_PRECISION_HINT_NICEST                  0x01
-.emtcode ARB_FOG_EXP                                0x02
-.emtcode ARB_FOG_EXP2                               0x03
-.emtcode ARB_FOG_LINEAR                             0x04
-
-/* GL_ARB_vertex_program option */
-.emtcode ARB_POSITION_INVARIANT                     0x05
-
-/* GL_ARB_fragment_program_shadow option */
-.emtcode ARB_FRAGMENT_PROGRAM_SHADOW                0x06
-
-/* GL_ARB_draw_buffers option */
-.emtcode ARB_DRAW_BUFFERS                           0x07
-
-/* GL_ARB_fragment_program instruction class */
-.emtcode OP_ALU_INST                                0x00
-.emtcode OP_TEX_INST                                0x01
-
-/* GL_ARB_vertex_program instruction class */
-/*       OP_ALU_INST */
-
-/* GL_ARB_fragment_program instruction type */
-.emtcode OP_ALU_VECTOR                               0x00
-.emtcode OP_ALU_SCALAR                               0x01
-.emtcode OP_ALU_BINSC                                0x02
-.emtcode OP_ALU_BIN                                  0x03
-.emtcode OP_ALU_TRI                                  0x04
-.emtcode OP_ALU_SWZ                                  0x05
-.emtcode OP_TEX_SAMPLE                               0x06
-.emtcode OP_TEX_KIL                                  0x07
-
-/* GL_ARB_vertex_program instruction type */
-.emtcode OP_ALU_ARL                                  0x08
-/*       OP_ALU_VECTOR */
-/*       OP_ALU_SCALAR */
-/*       OP_ALU_BINSC */
-/*       OP_ALU_BIN */
-/*       OP_ALU_TRI */
-/*       OP_ALU_SWZ */
-
-/* GL_ARB_fragment_program instruction code */
-.emtcode OP_ABS                                     0x00
-.emtcode OP_ABS_SAT                                 0x1B
-.emtcode OP_FLR                                     0x09
-.emtcode OP_FLR_SAT                                 0x26
-.emtcode OP_FRC                                     0x0A
-.emtcode OP_FRC_SAT                                 0x27
-.emtcode OP_LIT                                     0x0C
-.emtcode OP_LIT_SAT                                 0x2A
-.emtcode OP_MOV                                     0x11
-.emtcode OP_MOV_SAT                                 0x30
-.emtcode OP_COS                                     0x1F
-.emtcode OP_COS_SAT                                 0x20
-.emtcode OP_EX2                                     0x07
-.emtcode OP_EX2_SAT                                 0x25
-.emtcode OP_LG2                                     0x0B
-.emtcode OP_LG2_SAT                                 0x29
-.emtcode OP_RCP                                     0x14
-.emtcode OP_RCP_SAT                                 0x33
-.emtcode OP_RSQ                                     0x15
-.emtcode OP_RSQ_SAT                                 0x34
-.emtcode OP_SIN                                     0x38
-.emtcode OP_SIN_SAT                                 0x39
-.emtcode OP_SCS                                     0x35
-.emtcode OP_SCS_SAT                                 0x36
-.emtcode OP_POW                                     0x13
-.emtcode OP_POW_SAT                                 0x32
-.emtcode OP_ADD                                     0x01
-.emtcode OP_ADD_SAT                                 0x1C
-.emtcode OP_DP3                                     0x03
-.emtcode OP_DP3_SAT                                 0x21
-.emtcode OP_DP4                                     0x04
-.emtcode OP_DP4_SAT                                 0x22
-.emtcode OP_DPH                                     0x05
-.emtcode OP_DPH_SAT                                 0x23
-.emtcode OP_DST                                     0x06
-.emtcode OP_DST_SAT                                 0x24
-.emtcode OP_MAX                                     0x0F
-.emtcode OP_MAX_SAT                                 0x2E
-.emtcode OP_MIN                                     0x10
-.emtcode OP_MIN_SAT                                 0x2F
-.emtcode OP_MUL                                     0x12
-.emtcode OP_MUL_SAT                                 0x31
-.emtcode OP_SGE                                     0x16
-.emtcode OP_SGE_SAT                                 0x37
-.emtcode OP_SLT                                     0x17
-.emtcode OP_SLT_SAT                                 0x3A
-.emtcode OP_SUB                                     0x18
-.emtcode OP_SUB_SAT                                 0x3B
-.emtcode OP_XPD                                     0x1A
-.emtcode OP_XPD_SAT                                 0x43
-.emtcode OP_CMP                                     0x1D
-.emtcode OP_CMP_SAT                                 0x1E
-.emtcode OP_LRP                                     0x2B
-.emtcode OP_LRP_SAT                                 0x2C
-.emtcode OP_MAD                                     0x0E
-.emtcode OP_MAD_SAT                                 0x2D
-.emtcode OP_SWZ                                     0x19
-.emtcode OP_SWZ_SAT                                 0x3C
-.emtcode OP_TEX                                     0x3D
-.emtcode OP_TEX_SAT                                 0x3E
-.emtcode OP_TXB                                     0x3F
-.emtcode OP_TXB_SAT                                 0x40
-.emtcode OP_TXP                                     0x41
-.emtcode OP_TXP_SAT                                 0x42
-.emtcode OP_KIL                                     0x28
-
-/* GL_ARB_vertex_program instruction code */
-.emtcode OP_ARL                                     0x02
-/*       OP_ABS */
-/*       OP_FLR */
-/*       OP_FRC */
-/*       OP_LIT */
-/*       OP_MOV */
-/*       OP_EX2 */
-.emtcode OP_EXP                                     0x08
-/*       OP_LG2 */
-.emtcode OP_LOG                                     0x0D
-/*       OP_RCP */
-/*       OP_RSQ */
-/*       OP_POW */
-/*       OP_ADD */
-/*       OP_DP3 */
-/*       OP_DP4 */
-/*       OP_DPH */
-/*       OP_DST */
-/*       OP_MAX */
-/*       OP_MIN */
-/*       OP_MUL */
-/*       OP_SGE */
-/*       OP_SLT */
-/*       OP_SUB */
-/*       OP_XPD */
-/*       OP_MAD */
-/*       OP_SWZ */
-
-/* fragment attribute binding */
-.emtcode FRAGMENT_ATTRIB_COLOR                      0x01
-.emtcode FRAGMENT_ATTRIB_TEXCOORD                   0x02
-.emtcode FRAGMENT_ATTRIB_FOGCOORD                   0x03
-.emtcode FRAGMENT_ATTRIB_POSITION                   0x04
-
-/* vertex attribute binding */
-.emtcode VERTEX_ATTRIB_POSITION                     0x01
-.emtcode VERTEX_ATTRIB_WEIGHT                       0x02
-.emtcode VERTEX_ATTRIB_NORMAL                       0x03
-.emtcode VERTEX_ATTRIB_COLOR                        0x04
-.emtcode VERTEX_ATTRIB_FOGCOORD                     0x05
-.emtcode VERTEX_ATTRIB_TEXCOORD                     0x06
-.emtcode VERTEX_ATTRIB_MATRIXINDEX                  0x07
-.emtcode VERTEX_ATTRIB_GENERIC                      0x08
-
-/* fragment result binding */
-.emtcode FRAGMENT_RESULT_COLOR                      0x01
-.emtcode FRAGMENT_RESULT_DEPTH                      0x02
-
-/* vertex result binding */
-.emtcode VERTEX_RESULT_POSITION                     0x01
-.emtcode VERTEX_RESULT_COLOR                        0x02
-.emtcode VERTEX_RESULT_FOGCOORD                     0x03
-.emtcode VERTEX_RESULT_POINTSIZE                    0x04
-.emtcode VERTEX_RESULT_TEXCOORD                     0x05
-
-/* texture target */
-.emtcode TEXTARGET_1D                               0x01
-.emtcode TEXTARGET_2D                               0x02
-.emtcode TEXTARGET_3D                               0x03
-.emtcode TEXTARGET_RECT                             0x04
-.emtcode TEXTARGET_CUBE                             0x05
-/* GL_ARB_fragment_program_shadow */
-.emtcode TEXTARGET_SHADOW1D                         0x06
-.emtcode TEXTARGET_SHADOW2D                         0x07
-.emtcode TEXTARGET_SHADOWRECT                       0x08
-
-/* face type */
-.emtcode FACE_FRONT                                 0x00
-.emtcode FACE_BACK                                  0x01
-
-/* color type */
-.emtcode COLOR_PRIMARY                              0x00
-.emtcode COLOR_SECONDARY                            0x01
-
-/* component */
-.emtcode COMPONENT_X                                0x00
-.emtcode COMPONENT_Y                                0x01
-.emtcode COMPONENT_Z                                0x02
-.emtcode COMPONENT_W                                0x03
-.emtcode COMPONENT_0                                0x04
-.emtcode COMPONENT_1                                0x05
-
-/* array index type */
-.emtcode ARRAY_INDEX_ABSOLUTE                       0x00
-.emtcode ARRAY_INDEX_RELATIVE                       0x01
-
-/* matrix name */
-.emtcode MATRIX_MODELVIEW                           0x01
-.emtcode MATRIX_PROJECTION                          0x02
-.emtcode MATRIX_MVP                                 0x03
-.emtcode MATRIX_TEXTURE                             0x04
-.emtcode MATRIX_PALETTE                             0x05
-.emtcode MATRIX_PROGRAM                             0x06
-
-/* matrix modifier */
-.emtcode MATRIX_MODIFIER_IDENTITY                   0x00
-.emtcode MATRIX_MODIFIER_INVERSE                    0x01
-.emtcode MATRIX_MODIFIER_TRANSPOSE                  0x02
-.emtcode MATRIX_MODIFIER_INVTRANS                   0x03
-
-/* constant type */
-.emtcode CONSTANT_SCALAR                            0x01
-.emtcode CONSTANT_VECTOR                            0x02
-
-/* program param type */
-.emtcode PROGRAM_PARAM_ENV                          0x01
-.emtcode PROGRAM_PARAM_LOCAL                        0x02
-
-/* register type */
-.emtcode REGISTER_ATTRIB                            0x01
-.emtcode REGISTER_PARAM                             0x02
-.emtcode REGISTER_RESULT                            0x03
-.emtcode REGISTER_ESTABLISHED_NAME                  0x04
-
-/* param binding */
-.emtcode PARAM_NULL                                 0x00
-.emtcode PARAM_ARRAY_ELEMENT                        0x01
-.emtcode PARAM_STATE_ELEMENT                        0x02
-.emtcode PARAM_PROGRAM_ELEMENT                      0x03
-.emtcode PARAM_PROGRAM_ELEMENTS                     0x04
-.emtcode PARAM_CONSTANT                             0x05
-
-/* param state property */
-.emtcode STATE_MATERIAL                             0x01
-.emtcode STATE_LIGHT                                0x02
-.emtcode STATE_LIGHT_MODEL                          0x03
-.emtcode STATE_LIGHT_PROD                           0x04
-.emtcode STATE_FOG                                  0x05
-.emtcode STATE_MATRIX_ROWS                          0x06
-/* GL_ARB_fragment_program */
-.emtcode STATE_TEX_ENV                              0x07
-.emtcode STATE_DEPTH                                0x08
-/* GL_ARB_vertex_program */
-.emtcode STATE_TEX_GEN                              0x09
-.emtcode STATE_CLIP_PLANE                           0x0A
-.emtcode STATE_POINT                                0x0B
-
-/* state material property */
-.emtcode MATERIAL_AMBIENT                           0x01
-.emtcode MATERIAL_DIFFUSE                           0x02
-.emtcode MATERIAL_SPECULAR                          0x03
-.emtcode MATERIAL_EMISSION                          0x04
-.emtcode MATERIAL_SHININESS                         0x05
-
-/* state light property */
-.emtcode LIGHT_AMBIENT                              0x01
-.emtcode LIGHT_DIFFUSE                              0x02
-.emtcode LIGHT_SPECULAR                             0x03
-.emtcode LIGHT_POSITION                             0x04
-.emtcode LIGHT_ATTENUATION                          0x05
-.emtcode LIGHT_HALF                                 0x06
-.emtcode LIGHT_SPOT_DIRECTION                       0x07
-
-/* state light model property */
-.emtcode LIGHT_MODEL_AMBIENT                        0x01
-.emtcode LIGHT_MODEL_SCENECOLOR                     0x02
-
-/* state light product property */
-.emtcode LIGHT_PROD_AMBIENT                         0x01
-.emtcode LIGHT_PROD_DIFFUSE                         0x02
-.emtcode LIGHT_PROD_SPECULAR                        0x03
-
-/* state texture environment property */
-.emtcode TEX_ENV_COLOR                              0x01
-
-/* state texture generation coord property */
-.emtcode TEX_GEN_EYE                                0x01
-.emtcode TEX_GEN_OBJECT                             0x02
-
-/* state fog property */
-.emtcode FOG_COLOR                                  0x01
-.emtcode FOG_PARAMS                                 0x02
-
-/* state depth property */
-.emtcode DEPTH_RANGE                                0x01
-
-/* state point parameters property */
-.emtcode POINT_SIZE                                 0x01
-.emtcode POINT_ATTENUATION                          0x02
-
-/* declaration */
-.emtcode ATTRIB                                     0x01
-.emtcode PARAM                                      0x02
-.emtcode TEMP                                       0x03
-.emtcode OUTPUT                                     0x04
-.emtcode ALIAS                                      0x05
-/* GL_ARB_vertex_program */
-.emtcode ADDRESS                                    0x06
-
-/* error messages */
-.errtext UNKNOWN_PROGRAM_SIGNATURE                  "1001: '$e_signature$': unknown program signature"
-.errtext MISSING_END_OR_INVALID_STATEMENT           "1002: '$e_statement$': invalid statement"
-.errtext CODE_AFTER_END                             "1003: '$e_statement$': code after 'END' keyword"
-.errtext INVALID_PROGRAM_OPTION                     "1004: '$e_identifier$': invalid program option"
-.errtext EXT_SWIZ_COMP_EXPECTED                     "1005: extended swizzle component expected but '$e_token$' found"
-.errtext TEX_TARGET_EXPECTED                        "1006: texture target expected but '$e_token$' found"
-.errtext TEXTURE_EXPECTED                           "1007: 'texture' expected but '$e_identifier$' found"
-.errtext SOURCE_REGISTER_EXPECTED                   "1008: source register expected but '$e_token$' found"
-.errtext DESTINATION_REGISTER_EXPECTED              "1009: destination register expected but '$e_token$' found"
-.errtext INVALID_ADDRESS_COMPONENT                  "1010: '$e_identifier$': invalid address component"
-.errtext INVALID_ADDRESS_WRITEMASK                  "1011: '$e_identifier$': invalid address writemask"
-.errtext INVALID_COMPONENT                          "1012: '$e_charordigit$': invalid component"
-.errtext INVALID_SUFFIX                             "1013: '$e_identifier$': invalid suffix"
-.errtext INVALID_WRITEMASK                          "1014: '$e_identifier$': invalid writemask"
-.errtext FRAGMENT_EXPECTED                          "1015: 'fragment' expected but '$e_identifier$' found"
-.errtext VERTEX_EXPECTED                            "1016: 'vertex' expected but '$e_identifier$' found"
-.errtext INVALID_FRAGMENT_PROPERTY                  "1017: '$e_identifier$': invalid fragment property"
-.errtext INVALID_VERTEX_PROPERTY                    "1018: '$e_identifier$': invalid vertex property"
-.errtext INVALID_STATE_PROPERTY                     "1019: '$e_identifier$': invalid state property"
-.errtext INVALID_MATERIAL_PROPERTY                  "1020: '$e_identifier$': invalid material property"
-.errtext INVALID_LIGHT_PROPERTY                     "1021: '$e_identifier$': invalid light property"
-.errtext INVALID_SPOT_PROPERTY                      "1022: '$e_identifier$': invalid spot property"
-.errtext INVALID_LIGHTMODEL_PROPERTY                "1023: '$e_identifier$': invalid light model property"
-.errtext INVALID_LIGHTPROD_PROPERTY                 "1024: '$e_identifier$': invalid light product property"
-.errtext INVALID_TEXENV_PROPERTY                    "1025: '$e_identifier$': invalid texture environment property"
-.errtext INVALID_TEXGEN_PROPERTY                    "1026: '$e_identifier$': invalid texture generating property"
-.errtext INVALID_TEXGEN_COORD                       "1027: '$e_identifier$': invalid texture generating coord"
-.errtext INVALID_FOG_PROPERTY                       "1028: '$e_identifier$': invalid fog property"
-.errtext INVALID_DEPTH_PROPERTY                     "1029: '$e_identifier$': invalid depth property"
-.errtext INVALID_CLIPPLANE_PROPERTY                 "1030: '$e_identifier$': invalid clip plane property"
-.errtext INVALID_POINT_PROPERTY                     "1031: '$e_identifier$': invalid point property"
-.errtext MATRIX_ROW_SELECTOR_OR_MODIFIER_EXPECTED   "1032: matrix row selector or modifier expected but '$e_token$' found"
-.errtext INVALID_MATRIX_NAME                        "1033: '$e_identifier$': invalid matrix name"
-.errtext INVALID_PROGRAM_PROPERTY                   "1034: '$e_identifier$': invalid program property"
-.errtext RESULT_EXPECTED                            "1035: 'result' expected but '$e_token$' found"
-.errtext INVALID_RESULT_PROPERTY                    "1036: '$e_identifier$': invalid result property"
-.errtext INVALID_FACE_PROPERTY                      "1037: '$e_identifier$': invalid face property"
-.errtext INVALID_COLOR_PROPERTY                     "1038: '$e_identifier$': invalid color property"
-.errtext IDENTIFIER_EXPECTED                        "1039: identifier expected but '$e_token$' found"
-.errtext RESERVED_KEYWORD                           "1040: use of reserved keyword as an identifier"
-.errtext INTEGER_EXPECTED                           "1041: integer value expected but '$e_token$' found"
-.errtext MISSING_SEMICOLON                          "1042: ';' expected but '$e_token$' found"
-.errtext MISSING_COMMA                              "1043: ',' expected but '$e_token$' found"
-.errtext MISSING_LBRACKET                           "1044: '[' expected but '$e_token$' found"
-.errtext MISSING_RBRACKET                           "1045: ']' expected but '$e_token$' found"
-.errtext MISSING_DOT                                "1046: '.' expected but '$e_token$' found"
-.errtext MISSING_EQUAL                              "1047: '=' expected but '$e_token$' found"
-.errtext MISSING_LBRACE                             "1048: '{' expected but '$e_token$' found"
-.errtext MISSING_RBRACE                             "1049: '}' expected but '$e_token$' found"
-.errtext MISSING_DOTDOT                             "1050: '..' expected but '$e_token$' found"
-.errtext MISSING_FRACTION_OR_EXPONENT               "1051: missing fraction part or exponent"
-.errtext MISSING_DOT_OR_EXPONENT                    "1052: missing '.' or exponent"
-.errtext EXPONENT_VALUE_EXPECTED                    "1053: exponent value expected"
-.errtext INTEGER_OUT_OF_RANGE                       "1054: integer value out of range"
-.errtext OPERATION_NEEDS_DESTINATION_VARIABLE       "1055: operation needs destination variable"
-.errtext OPERATION_NEEDS_SOURCE_VARIABLE            "1056: operation needs source variable"
-.errtext ADDRESS_REGISTER_EXPECTED                  "1057: address register expected but '$e_token$' found"
-.errtext ADDRESS_REGISTER_OR_INTEGER_EXPECTED       "1058: address register or integer literal expected but '$e_token$' found"
-
-/* extension presence condition registers */
-
-/* GL_ARB_vertex_blend */
-/* GL_EXT_vertex_weighting */
-.regbyte vertex_blend                               0x00
-
-/* GL_ARB_matrix_palette */
-.regbyte matrix_palette                             0x00
-
-/* GL_ARB_point_parameters */
-/* GL_EXT_point_parameters */
-.regbyte point_parameters                           0x00
-
-/* GL_EXT_secondary_color */
-.regbyte secondary_color                            0x00
-
-/* GL_EXT_fog_coord */
-.regbyte fog_coord                                  0x00
-
-/* GL_EXT_texture_rectangle */
-/* GL_NV_texture_rectangle */
-.regbyte texture_rectangle                          0x00
-
-/* GL_ARB_fragment_program_shadow */
-.regbyte fragment_program_shadow                    0x00
-
-/* GL_ARB_draw_buffers */
-.regbyte draw_buffers                               0x00
-
-/* option presence condition registers */
-/* they are all initially set to zero - when a particular OPTION is encountered, the appropriate */
-/* register is set to 1 to indicate that the OPTION was specified. */
-
-/* GL_ARB_fragment_program */
-.regbyte ARB_precision_hint_fastest                 0x00
-.regbyte ARB_precision_hint_nicest                  0x00
-.regbyte ARB_fog_exp                                0x00
-.regbyte ARB_fog_exp2                               0x00
-.regbyte ARB_fog_linear                             0x00
-
-/* GL_ARB_vertex_program */
-.regbyte ARB_position_invariant                     0x00
-
-/* GL_ARB_fragment_program_shadow */
-.regbyte ARB_fragment_program_shadow                0x00
-
-/* GL_ARB_draw_buffers */
-.regbyte ARB_draw_buffers                           0x00
-
-/* program target condition register */
-/* this syntax script deals with two program targets - VERTEX_PROGRAM and FRAGMENT_PROGRAM. */
-/* to distinguish between them we need a register that will store for us the current target. */
-/* the client will typically set the register to apropriate value before parsing a particular */
-/* program. the mapping between program targets and their values is listed below. */
-/* */
-/* program target               register value    */
-/* ---------------------------------------------- */
-/* FRAGMENT_PROGRAM             0x10              */
-/* VERTEX_PROGRAM               0x20              */
-/* */
-/* the initial value of the register is 0 to catch potential errors with not setting the register */
-/* with the proper value. */
-.regbyte program_target                             0x00
-
-/*
-    <program>              ::= <optionSequence> <statementSequence> "END"
-*/
-program
-    programs .error UNKNOWN_PROGRAM_SIGNATURE .emit REVISION;
-programs
-    .if (program_target == 0x10) frag_program_1_0 .emit FRAGMENT_PROGRAM .emit 0x01 .emit 0x00 .or
-    .if (program_target == 0x20) vert_program_1_0 .emit VERTEX_PROGRAM .emit 0x01 .emit 0x00;
-frag_program_1_0
-    '!' .and '!' .and 'A' .and 'R' .and 'B' .and 'f' .and 'p' .and '1' .and '.' .and '0' .and
-    optional_space .and fp_optionSequence .and fp_statementSequence .and
-    "END" .error MISSING_END_OR_INVALID_STATEMENT .emit END .and optional_space .and
-    '\0' .error CODE_AFTER_END;
-vert_program_1_0
-    '!' .and '!' .and 'A' .and 'R' .and 'B' .and 'v' .and 'p' .and '1' .and '.' .and '0' .and
-    optional_space .and vp_optionSequence .and vp_statementSequence .and
-    "END" .error MISSING_END_OR_INVALID_STATEMENT .emit END .and optional_space .and
-    '\0' .error CODE_AFTER_END;
-
-/*
-    <optionSequence>       ::= <optionSequence> <option>
-                             | ""
-*/
-fp_optionSequence
-    .loop fp_option;
-vp_optionSequence
-    .loop vp_option;
-
-/*
-    <option>               ::= "OPTION" <identifier> ";"
-
-NOTE: options ARB_precision_hint_nicest and ARB_precision_hint_fastest are exclusive. When one of
-      these options is encountered, the other one is automatically disabled.
-      the same applies to options ARB_fog_exp, ARB_fog_exp2 and ARB_fog_linear.
-*/
-fp_option
-    "OPTION" .emit OPTION .and space .error IDENTIFIER_EXPECTED .and
-    fp_optionString .error INVALID_PROGRAM_OPTION .and semicolon;
-vp_option
-    "OPTION" .emit OPTION .and space .error IDENTIFIER_EXPECTED .and
-    vp_optionString .error INVALID_PROGRAM_OPTION .and semicolon;
-fp_optionString
-    .if (ARB_precision_hint_nicest == 0x00) "ARB_precision_hint_fastest"
-        .emit ARB_PRECISION_HINT_FASTEST .load ARB_precision_hint_fastest 0x01 .or
-    .if (ARB_precision_hint_fastest == 0x00) "ARB_precision_hint_nicest"
-        .emit ARB_PRECISION_HINT_NICEST .load ARB_precision_hint_nicest 0x01 .or
-    fp_ARB_fog_exp .emit ARB_FOG_EXP .load ARB_fog_exp 0x01 .or
-    fp_ARB_fog_exp2 .emit ARB_FOG_EXP2 .load ARB_fog_exp2 0x01 .or
-    fp_ARB_fog_linear .emit ARB_FOG_LINEAR .load ARB_fog_linear 0x01 .or
-    .if (fragment_program_shadow != 0x00) "ARB_fragment_program_shadow"
-        .emit ARB_FRAGMENT_PROGRAM_SHADOW .load ARB_fragment_program_shadow 0x01 .or
-    .if (draw_buffers != 0x00) "ARB_draw_buffers" .emit ARB_DRAW_BUFFERS
-        .load ARB_draw_buffers 0x01;
-vp_optionString
-    "ARB_position_invariant" .emit ARB_POSITION_INVARIANT .load ARB_position_invariant 0x01;
-fp_ARB_fog_exp
-    .if (ARB_fog_exp2 == 0x00) .true .and .if (ARB_fog_linear == 0x00) "ARB_fog_exp";
-fp_ARB_fog_exp2
-    .if (ARB_fog_exp == 0x00) .true .and .if (ARB_fog_linear == 0x00) "ARB_fog_exp2";
-fp_ARB_fog_linear
-    .if (ARB_fog_exp == 0x00) .true .and .if (ARB_fog_exp2 == 0x00) "ARB_fog_linear";
-
-/*
-    <statementSequence>    ::= <statementSequence> <statement>
-                             | ""
-*/
-fp_statementSequence
-    .loop fp_statement;
-vp_statementSequence
-    .loop vp_statement;
-
-/*
-    <statement>            ::= <instruction> ";"
-                             | <namingStatement> ";"
-
-NOTE: ".emit $" in the definitions below means that we output instruction position (offset of
-      the first character of instruction) for program debugging purposes.
-*/
-fp_statement
-    fp_statement_1 .or fp_statement_2;
-vp_statement
-    vp_statement_1 .or vp_statement_2;
-fp_statement_1
-    fp_instruction .emit INSTRUCTION .emit $ .and semicolon;
-fp_statement_2
-    fp_namingStatement .emit DECLARATION .and semicolon;
-vp_statement_1
-    vp_instruction .emit INSTRUCTION .emit $ .and semicolon;
-vp_statement_2
-    vp_namingStatement .emit DECLARATION .and semicolon;
-
-/*
-fragment program
-    <instruction>          ::= <ALUInstruction>
-                             | <TexInstruction>
-
-vertex program
-    <instruction>          ::= <ARL_instruction>
-                             | <VECTORop_instruction>
-                             | <SCALARop_instruction>
-                             | <BINSCop_instruction>
-                             | <BINop_instruction>
-                             | <TRIop_instruction>
-                             | <SWZ_instruction>
-*/
-fp_instruction
-    ALUInstruction .emit OP_ALU_INST .or
-    TexInstruction .emit OP_TEX_INST;
-vp_instruction
-    ARL_instruction .emit OP_ALU_ARL .or
-    vp_VECTORop_instruction .emit OP_ALU_VECTOR .or
-    vp_SCALARop_instruction .emit OP_ALU_SCALAR .or
-    vp_BINSCop_instruction .emit OP_ALU_BINSC .or
-    vp_BINop_instruction .emit OP_ALU_BIN .or
-    vp_TRIop_instruction .emit OP_ALU_TRI .or
-    vp_SWZ_instruction .emit OP_ALU_SWZ;
-
-/*
-fragment program
-    <ALUInstruction>       ::= <VECTORop_instruction>
-                             | <SCALARop_instruction>
-                             | <BINSCop_instruction>
-                             | <BINop_instruction>
-                             | <TRIop_instruction>
-                             | <SWZ_instruction>
-*/
-ALUInstruction
-    fp_VECTORop_instruction .emit OP_ALU_VECTOR .or
-    fp_SCALARop_instruction .emit OP_ALU_SCALAR .or
-    fp_BINSCop_instruction .emit OP_ALU_BINSC .or
-    fp_BINop_instruction .emit OP_ALU_BIN .or
-    fp_TRIop_instruction .emit OP_ALU_TRI .or
-    fp_SWZ_instruction .emit OP_ALU_SWZ;
-
-/*
-fragment program
-    <TexInstruction>       ::= <SAMPLE_instruction>
-                             | <KIL_instruction>
-*/
-TexInstruction
-    SAMPLE_instruction .emit OP_TEX_SAMPLE .or
-    KIL_instruction .emit OP_TEX_KIL;
-
-/*
-vertex program
-    <ARL_instruction>      ::= "ARL" <maskedAddrReg> "," <scalarSrcReg>
-*/
-ARL_instruction
-    "ARL" .emit OP_ARL .and space_dst .and maskedAddrReg .and comma .and vp_scalarSrcReg;
-
-/*
-fragment program
-    <VECTORop_instruction> ::= <VECTORop> <maskedDstReg> "," 
-                               <vectorSrcReg>
-
-vertex program
-    <VECTORop_instruction> ::= <VECTORop> <maskedDstReg> "," <swizzleSrcReg>
-*/
-fp_VECTORop_instruction
-    fp_VECTORop .and space_dst .and fp_maskedDstReg .and comma .and vectorSrcReg;
-vp_VECTORop_instruction
-    vp_VECTORop .and space_dst .and vp_maskedDstReg .and comma .and swizzleSrcReg;
-
-/*
-fragment program
-    <VECTORop>             ::= "ABS" | "ABS_SAT"
-                             | "FLR" | "FLR_SAT"
-                             | "FRC" | "FRC_SAT"
-                             | "LIT" | "LIT_SAT"
-                             | "MOV" | "MOV_SAT"
-
-vertex program
-    <VECTORop>             ::= "ABS"
-                             | "FLR"
-                             | "FRC"
-                             | "LIT"
-                             | "MOV"
-*/
-fp_VECTORop
-    "ABS" .emit OP_ABS .or "ABS_SAT" .emit OP_ABS_SAT .or
-    "FLR" .emit OP_FLR .or "FLR_SAT" .emit OP_FLR_SAT .or
-    "FRC" .emit OP_FRC .or "FRC_SAT" .emit OP_FRC_SAT .or
-    "LIT" .emit OP_LIT .or "LIT_SAT" .emit OP_LIT_SAT .or
-    "MOV" .emit OP_MOV .or "MOV_SAT" .emit OP_MOV_SAT;
-vp_VECTORop
-    "ABS" .emit OP_ABS .or
-    "FLR" .emit OP_FLR .or
-    "FRC" .emit OP_FRC .or
-    "LIT" .emit OP_LIT .or
-    "MOV" .emit OP_MOV;
-
-/*
-    <SCALARop_instruction> ::= <SCALARop> <maskedDstReg> "," <scalarSrcReg>
-*/
-fp_SCALARop_instruction
-    fp_SCALARop .and space_dst .and fp_maskedDstReg .and comma .and fp_scalarSrcReg;
-vp_SCALARop_instruction
-    vp_SCALARop .and space_dst .and vp_maskedDstReg .and comma .and vp_scalarSrcReg;
-
-/*
-fragment program
-    <SCALARop>             ::= "COS" | "COS_SAT"
-                             | "EX2" | "EX2_SAT"
-                             | "LG2" | "LG2_SAT"
-                             | "RCP" | "RCP_SAT"
-                             | "RSQ" | "RSQ_SAT"
-                             | "SIN" | "SIN_SAT"
-                             | "SCS" | "SCS_SAT"
-
-vertex program
-    <SCALARop>             ::= "EX2"
-                             | "EXP"
-                             | "LG2"
-                             | "LOG"
-                             | "RCP"
-                             | "RSQ"
-*/
-fp_SCALARop
-    "COS" .emit OP_COS .or "COS_SAT" .emit OP_COS_SAT .or
-    "EX2" .emit OP_EX2 .or "EX2_SAT" .emit OP_EX2_SAT .or
-    "LG2" .emit OP_LG2 .or "LG2_SAT" .emit OP_LG2_SAT .or
-    "RCP" .emit OP_RCP .or "RCP_SAT" .emit OP_RCP_SAT .or
-    "RSQ" .emit OP_RSQ .or "RSQ_SAT" .emit OP_RSQ_SAT .or
-    "SIN" .emit OP_SIN .or "SIN_SAT" .emit OP_SIN_SAT .or
-    "SCS" .emit OP_SCS .or "SCS_SAT" .emit OP_SCS_SAT;
-vp_SCALARop
-    "EX2" .emit OP_EX2 .or
-    "EXP" .emit OP_EXP .or
-    "LG2" .emit OP_LG2 .or
-    "LOG" .emit OP_LOG .or
-    "RCP" .emit OP_RCP .or
-    "RSQ" .emit OP_RSQ;
-
-/*
-    <BINSCop_instruction>  ::= <BINSCop> <maskedDstReg> "," <scalarSrcReg> ","
-                               <scalarSrcReg>
-*/
-fp_BINSCop_instruction
-    fp_BINSCop .and space_dst .and fp_maskedDstReg .and comma .and fp_scalarSrcReg .and comma .and
-    fp_scalarSrcReg;
-vp_BINSCop_instruction
-    vp_BINSCop .and space_dst .and vp_maskedDstReg .and comma .and vp_scalarSrcReg .and comma .and
-    vp_scalarSrcReg;
-
-/*
-fragment program
-    <BINSCop>              ::= "POW" | "POW_SAT"
-
-vertex program
-    <BINSCop>              ::= "POW"
-*/
-fp_BINSCop
-    "POW" .emit OP_POW .or "POW_SAT" .emit OP_POW_SAT;
-vp_BINSCop
-    "POW" .emit OP_POW;
-
-/*
-fragment program
-    <BINop_instruction>    ::= <BINop> <maskedDstReg> ","
-                               <vectorSrcReg> "," <vectorSrcReg>
-
-vertex program
-    <BINop_instruction>    ::= <BINop> <maskedDstReg> ","
-                               <swizzleSrcReg> "," <swizzleSrcReg>
-*/
-fp_BINop_instruction
-    fp_BINop .and space_dst .and fp_maskedDstReg .and comma .and vectorSrcReg .and comma .and
-    vectorSrcReg;
-vp_BINop_instruction
-    vp_BINop .and space_dst .and vp_maskedDstReg .and comma .and swizzleSrcReg .and comma .and
-    swizzleSrcReg;
-
-/*
-fragment program
-    <BINop>                ::= "ADD" | "ADD_SAT"
-                             | "DP3" | "DP3_SAT"
-                             | "DP4" | "DP4_SAT"
-                             | "DPH" | "DPH_SAT"
-                             | "DST" | "DST_SAT"
-                             | "MAX" | "MAX_SAT"
-                             | "MIN" | "MIN_SAT"
-                             | "MUL" | "MUL_SAT"
-                             | "SGE" | "SGE_SAT"
-                             | "SLT" | "SLT_SAT"
-                             | "SUB" | "SUB_SAT"
-                             | "XPD" | "XPD_SAT"
-
-vertex program
-    <BINop>                ::= "ADD"
-                             | "DP3"
-                             | "DP4"
-                             | "DPH"
-                             | "DST"
-                             | "MAX"
-                             | "MIN"
-                             | "MUL"
-                             | "SGE"
-                             | "SLT"
-                             | "SUB"
-                             | "XPD"
-*/
-fp_BINop
-    "ADD" .emit OP_ADD .or "ADD_SAT" .emit OP_ADD_SAT .or
-    "DP3" .emit OP_DP3 .or "DP3_SAT" .emit OP_DP3_SAT .or
-    "DP4" .emit OP_DP4 .or "DP4_SAT" .emit OP_DP4_SAT .or
-    "DPH" .emit OP_DPH .or "DPH_SAT" .emit OP_DPH_SAT .or
-    "DST" .emit OP_DST .or "DST_SAT" .emit OP_DST_SAT .or
-    "MAX" .emit OP_MAX .or "MAX_SAT" .emit OP_MAX_SAT .or
-    "MIN" .emit OP_MIN .or "MIN_SAT" .emit OP_MIN_SAT .or
-    "MUL" .emit OP_MUL .or "MUL_SAT" .emit OP_MUL_SAT .or
-    "SGE" .emit OP_SGE .or "SGE_SAT" .emit OP_SGE_SAT .or
-    "SLT" .emit OP_SLT .or "SLT_SAT" .emit OP_SLT_SAT .or
-    "SUB" .emit OP_SUB .or "SUB_SAT" .emit OP_SUB_SAT .or
-    "XPD" .emit OP_XPD .or "XPD_SAT" .emit OP_XPD_SAT;
-vp_BINop
-    "ADD" .emit OP_ADD .or
-    "DP3" .emit OP_DP3 .or
-    "DP4" .emit OP_DP4 .or
-    "DPH" .emit OP_DPH .or
-    "DST" .emit OP_DST .or
-    "MAX" .emit OP_MAX .or
-    "MIN" .emit OP_MIN .or
-    "MUL" .emit OP_MUL .or
-    "SGE" .emit OP_SGE .or
-    "SLT" .emit OP_SLT .or
-    "SUB" .emit OP_SUB .or
-    "XPD" .emit OP_XPD;
-
-/*
-fragment program
-    <TRIop_instruction>    ::= <TRIop> <maskedDstReg> ","
-                               <vectorSrcReg> "," <vectorSrcReg> ","
-                               <vectorSrcReg>
-
-vertex program
-    <TRIop_instruction>    ::= <TRIop> <maskedDstReg> ","
-                               <swizzleSrcReg> "," <swizzleSrcReg> ","
-                               <swizzleSrcReg>
-*/
-fp_TRIop_instruction
-    fp_TRIop .and space_dst .and fp_maskedDstReg .and comma .and vectorSrcReg .and comma .and
-    vectorSrcReg .and comma .and vectorSrcReg;
-vp_TRIop_instruction
-    vp_TRIop .and space_dst .and vp_maskedDstReg .and comma .and swizzleSrcReg .and comma .and
-    swizzleSrcReg .and comma .and swizzleSrcReg;
-
-/*
-fragment program
-    <TRIop>                ::= "CMP" | "CMP_SAT"
-                             | "LRP" | "LRP_SAT"
-                             | "MAD" | "MAD_SAT"
-
-vertex program
-    <TRIop>                ::= "MAD"
-*/
-fp_TRIop
-    "CMP" .emit OP_CMP .or "CMP_SAT" .emit OP_CMP_SAT .or
-    "LRP" .emit OP_LRP .or "LRP_SAT" .emit OP_LRP_SAT .or
-    "MAD" .emit OP_MAD .or "MAD_SAT" .emit OP_MAD_SAT;
-vp_TRIop
-    "MAD" .emit OP_MAD;
-
-/*
-fragment program
-    <SWZ_instruction>      ::= <SWZop> <maskedDstReg> "," 
-                               <srcReg> "," <extendedSwizzle>
-
-vertex program
-    <SWZ_instruction>      ::= "SWZ" <maskedDstReg> "," <srcReg> "," 
-                               <extendedSwizzle>
-*/
-fp_SWZ_instruction
-    SWZop .and space_dst .and fp_maskedDstReg .and comma .and fp_srcReg .and comma .and
-    fp_extendedSwizzle .error EXT_SWIZ_COMP_EXPECTED;
-vp_SWZ_instruction
-    "SWZ" .emit OP_SWZ .and space_dst .and vp_maskedDstReg .and comma .and vp_srcReg .and comma .and
-    vp_extendedSwizzle .error EXT_SWIZ_COMP_EXPECTED;
-
-/*
-fragment program
-    <SWZop>                ::= "SWZ" | "SWZ_SAT"
-*/
-SWZop
-    "SWZ" .emit OP_SWZ .or "SWZ_SAT" .emit OP_SWZ_SAT;
-
-/*
-fragment program
-    <SAMPLE_instruction>   ::= <SAMPLEop> <maskedDstReg> ","
-                               <vectorSrcReg> "," <texImageUnit> "," 
-                               <texTarget>
-*/
-SAMPLE_instruction
-    SAMPLEop .and space_dst .and fp_maskedDstReg .and comma .and vectorSrcReg .and comma .and
-    texImageUnit .and comma .and texTarget .error TEX_TARGET_EXPECTED;
-
-/*
-fragment program
-    <SAMPLEop>             ::= "TEX" | "TEX_SAT"
-                             | "TXP" | "TXP_SAT"
-                             | "TXB" | "TXB_SAT"
-*/
-SAMPLEop
-    "TEX" .emit OP_TEX .or "TEX_SAT" .emit OP_TEX_SAT .or
-    "TXB" .emit OP_TXB .or "TXB_SAT" .emit OP_TXB_SAT .or
-    "TXP" .emit OP_TXP .or "TXP_SAT" .emit OP_TXP_SAT;
-
-/*
-fragment program
-    <KIL_instruction>      ::= "KIL" <vectorSrcReg>
-*/
-KIL_instruction
-    "KIL" .emit OP_KIL .and space_src .and vectorSrcReg;
-
-/*
-fragment program
-    <texImageUnit>         ::= "texture" <optTexImageUnitNum>
-*/
-texImageUnit
-    "texture" .error TEXTURE_EXPECTED .and optTexImageUnitNum;
-
-/*
-fragment program
-    <texTarget>            ::= "1D"
-                             | "2D"
-                             | "3D"
-                             | "CUBE"
-                             | "RECT"
-                             | <shadowTarget> (if option ARB_fragment_program_shadow present)
-*/
-texTarget
-    "1D" .emit TEXTARGET_1D .or
-    "2D" .emit TEXTARGET_2D .or
-    "3D" .emit TEXTARGET_3D .or
-    .if (texture_rectangle != 0x00) "RECT" .emit TEXTARGET_RECT .or
-    "CUBE" .emit TEXTARGET_CUBE .or
-    .if (ARB_fragment_program_shadow != 0x00) shadowTarget;
-
-/*
-GL_ARB_fragment_program_shadow
-    <shadowTarget>         ::= "SHADOW1D"
-                             | "SHADOW2D"
-                             | "SHADOWRECT"
-*/
-shadowTarget
-    "SHADOW1D" .emit TEXTARGET_SHADOW1D .or
-    "SHADOW2D" .emit TEXTARGET_SHADOW2D .or
-    .if (texture_rectangle != 0x00) "SHADOWRECT" .emit TEXTARGET_SHADOWRECT;
-
-/*
-fragment program
-    <optTexImageUnitNum>   ::= ""
-                             | "[" <texImageUnitNum> "]"
-*/
-optTexImageUnitNum
-    optTexImageUnitNum_1 .or .true .emit 0x00;
-optTexImageUnitNum_1
-    lbracket_ne .and texImageUnitNum .and rbracket;
-
-/*
-fragment program
-    <texImageUnitNum>      ::= <integer> from 0 to 
-                               MAX_TEXTURE_IMAGE_UNITS_ARB-1
-*/
-texImageUnitNum
-    integer;
-
-/*
-    <scalarSrcReg>         ::= <optionalSign> <srcReg> <scalarSuffix>
-*/
-fp_scalarSrcReg
-    optionalSign .and fp_srcReg .and fp_scalarSuffix;
-vp_scalarSrcReg
-    optionalSign .and vp_srcReg .and vp_scalarSuffix;
-
-/*
-vertex program
-    <swizzleSrcReg>        ::= <optionalSign> <srcReg> <swizzleSuffix>
-*/
-swizzleSrcReg
-    optionalSign .and vp_srcReg .and swizzleSuffix;
-
-/*
-fragment program
-    <vectorSrcReg>         ::= <optionalSign> <srcReg> <optionalSuffix> 
-*/
-vectorSrcReg
-    optionalSign .and fp_srcReg .and optionalSuffix;
-
-/*
-    <maskedDstReg>         ::= <dstReg> <optionalMask>
-*/
-fp_maskedDstReg
-    fp_dstReg .and fp_optionalMask;
-vp_maskedDstReg
-    vp_dstReg .and vp_optionalMask;
-
-/*
-vertex program
-    <maskedAddrReg>        ::= <addrReg> <addrWriteMask>
-*/
-maskedAddrReg
-    addrReg .error ADDRESS_REGISTER_EXPECTED .and addrWriteMask;
-
-/*
-fragment program
-    <extendedSwizzle>      ::= <xyzwExtendedSwizzle>
-                             | <rgbaExtendedSwizzle>
-
-vertex program
-    <extendedSwizzle>      ::= <extSwizComp> "," <extSwizComp> "," 
-                                 <extSwizComp> "," <extSwizComp>
-
-NOTE: do NOT change the order of <rgbaExtendedSwizzle> and <xyzwExtendedSwizzle> rulez
-*/
-fp_extendedSwizzle
-    rgbaExtendedSwizzle .or xyzwExtendedSwizzle;
-vp_extendedSwizzle
-    extSwizComp .and comma .and
-    extSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and
-    extSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and
-    extSwizComp .error EXT_SWIZ_COMP_EXPECTED;
-
-/*
-fragment program
-    <xyzwExtendedSwizzle>  ::= <xyzwExtSwizComp> "," <xyzwExtSwizComp> "," 
-                               <xyzwExtSwizComp> "," <xyzwExtSwizComp>
-*/
-xyzwExtendedSwizzle
-    xyzwExtSwizComp .and comma .and
-    xyzwExtSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and
-    xyzwExtSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and
-    xyzwExtSwizComp .error EXT_SWIZ_COMP_EXPECTED;
-
-/*
-fragment program
-    <rgbaExtendedSwizzle>  ::= <rgbaExtSwizComp> "," <rgbaExtSwizComp> "," 
-                               <rgbaExtSwizComp> "," <rgbaExtSwizComp>
-*/
-rgbaExtendedSwizzle
-    rgbaExtendedSwizzle_1 .or rgbaExtendedSwizzle_2 .or rgbaExtendedSwizzle_3 .or
-    rgbaExtendedSwizzle_4;
-rgbaExtendedSwizzle_1
-    rgbaExtSwizComp_digit .and comma .and rgbaExtSwizComp_digit .and comma .and
-    rgbaExtSwizComp_digit .and comma .and rgbaExtSwizComp;
-rgbaExtendedSwizzle_2
-    rgbaExtSwizComp_digit .and comma .and rgbaExtSwizComp_digit .and comma .and
-    rgbaExtSwizComp_alpha .and comma .and rgbaExtSwizComp .error EXT_SWIZ_COMP_EXPECTED;
-rgbaExtendedSwizzle_3
-    rgbaExtSwizComp_digit .and comma .and rgbaExtSwizComp_alpha .and comma .and
-    rgbaExtSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and
-    rgbaExtSwizComp .error EXT_SWIZ_COMP_EXPECTED;
-rgbaExtendedSwizzle_4
-    rgbaExtSwizComp_alpha .and comma .and 
-    rgbaExtSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and
-    rgbaExtSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and
-    rgbaExtSwizComp .error EXT_SWIZ_COMP_EXPECTED;
-
-/*
-fragment program
-    <xyzwExtSwizComp>      ::= <optionalSign> <xyzwExtSwizSel>
-*/
-xyzwExtSwizComp
-    optionalSign .and xyzwExtSwizSel;
-
-/*
-fragment program
-    <rgbaExtSwizComp>      ::= <optionalSign> <rgbaExtSwizSel>
-*/
-rgbaExtSwizComp
-    optionalSign .and rgbaExtSwizSel;
-rgbaExtSwizComp_digit
-    optionalSign .and rgbaExtSwizSel_digit;
-rgbaExtSwizComp_alpha
-    optionalSign .and rgbaExtSwizSel_alpha;
-
-/*
-vertex program
-    <extSwizComp>          ::= <optionalSign> <extSwizSel>
-*/
-extSwizComp
-    optionalSign .and extSwizSel;
-
-/*
-fragment program
-    <xyzwExtSwizSel>       ::= "0" 
-                             | "1" 
-                             | <xyzwComponent>
-*/
-xyzwExtSwizSel
-    "0" .emit COMPONENT_0 .or "1" .emit COMPONENT_1 .or xyzwComponent_single;
-
-/*
-fragment program
-    <rgbaExtSwizSel>       ::= "0" 
-                             | "1" 
-                             | <rgbaComponent>
-*/
-rgbaExtSwizSel
-    rgbaExtSwizSel_digit .or rgbaExtSwizSel_alpha;
-rgbaExtSwizSel_digit
-    "0" .emit COMPONENT_0 .or "1" .emit COMPONENT_1;
-rgbaExtSwizSel_alpha
-    rgbaComponent_single;
-
-/*
-vertex program
-    <extSwizSel>           ::= "0" 
-                             | "1" 
-                             | <component>
-*/
-extSwizSel
-    "0" .emit COMPONENT_0 .or "1" .emit COMPONENT_1 .or vp_component_single;
-
-/*
-fragment program
-    <srcReg>               ::= <fragmentAttribReg>
-                             | <temporaryReg>
-                             | <progParamReg>
-
-vertex program
-    <srcReg>               ::= <vertexAttribReg>
-                             | <temporaryReg>
-                             | <progParamReg>
-*/
-fp_srcReg
-    fp_srcReg_1 .error SOURCE_REGISTER_EXPECTED;
-vp_srcReg
-    vp_srcReg_1 .error SOURCE_REGISTER_EXPECTED;
-fp_srcReg_1
-    fragmentAttribReg .emit REGISTER_ATTRIB .or
-    fp_progParamReg .emit REGISTER_PARAM .or
-    fp_temporaryReg .emit REGISTER_ESTABLISHED_NAME;
-vp_srcReg_1
-    vertexAttribReg .emit REGISTER_ATTRIB .or
-    vp_progParamReg .emit REGISTER_PARAM .or
-    vp_temporaryReg .emit REGISTER_ESTABLISHED_NAME;
-
-/*
-fragment program
-    <dstReg>               ::= <temporaryReg>
-                             | <fragmentResultReg>
-
-vertex program
-    <dstReg>               ::= <temporaryReg>
-                             | <vertexResultReg>
-*/
-fp_dstReg
-    fp_dstReg_1 .error DESTINATION_REGISTER_EXPECTED;
-vp_dstReg
-    vp_dstReg_1 .error DESTINATION_REGISTER_EXPECTED;
-fp_dstReg_1
-    fragmentResultReg .emit REGISTER_RESULT .or
-    fp_temporaryReg .emit REGISTER_ESTABLISHED_NAME;
-vp_dstReg_1
-    vertexResultReg .emit REGISTER_RESULT .or
-    vp_temporaryReg .emit REGISTER_ESTABLISHED_NAME;
-
-/*
-fragment program
-    <fragmentAttribReg>    ::= <establishedName>
-                             | <fragAttribBinding>
-
-NOTE: <establishedName> is driven by <temporaryReg> rule at the end of <srcReg>
-*/
-fragmentAttribReg
-    /*fp_establishedName .or */fragAttribBinding;
-
-/*
-vertex program
-    <vertexAttribReg>      ::= <establishedName>
-                             | <vtxAttribBinding>
-
-NOTE: <establishedName> is driven by <temporaryReg> rule at the end of <srcReg>
-*/
-vertexAttribReg
-    vtxAttribBinding;
-
-/*
-    <temporaryReg>         ::= <establishedName>
-*/
-fp_temporaryReg
-    fp_establishedName_no_error_on_identifier;
-vp_temporaryReg
-    vp_establishedName_no_error_on_identifier;
-
-/*
-fragment program
-    <progParamReg>         ::= <progParamSingle>
-                             | <progParamArray> "[" <progParamArrayAbs> "]"
-                             | <paramSingleItemUse>
-
-vertex program
-    <progParamReg>         ::= <progParamSingle>
-                             | <progParamArray> "[" <progParamArrayMem> "]"
-                             | <paramSingleItemUse>
-*/
-fp_progParamReg
-    fp_paramSingleItemUse .or fp_progParamReg_1 .or fp_progParamSingle;
-vp_progParamReg
-    vp_paramSingleItemUse .or vp_progParamReg_1 .or vp_progParamSingle;
-fp_progParamReg_1
-    fp_progParamArray .emit PARAM_ARRAY_ELEMENT .and lbracket_ne .and progParamArrayAbs .and
-    rbracket;
-vp_progParamReg_1
-    vp_progParamArray .emit PARAM_ARRAY_ELEMENT .and lbracket_ne .and progParamArrayMem .and
-    rbracket;
-
-/*
-    <progParamSingle>      ::= <establishedName>
-
-NOTE: <establishedName> is driven by <temporaryReg> rule at the end of <srcReg>
-*/
-fp_progParamSingle
-    .false;
-vp_progParamSingle
-    .false;
-
-/*
-    <progParamArray>       ::= <establishedName>
-*/
-fp_progParamArray
-    fp_establishedName_no_error_on_identifier;
-vp_progParamArray
-    vp_establishedName_no_error_on_identifier;
-
-/*
-vertex program
-    <progParamArrayMem>    ::= <progParamArrayAbs>
-                             | <progParamArrayRel>
-*/
-progParamArrayMem
-    progParamArrayAbs .or progParamArrayRel;
-
-/*
-    <progParamArrayAbs>    ::= <integer>
-*/
-progParamArrayAbs
-    integer_ne .emit ARRAY_INDEX_ABSOLUTE;
-
-/*
-vertex program
-    <progParamArrayRel>    ::= <addrReg> <addrComponent> <addrRegRelOffset>
-*/
-progParamArrayRel
-    addrReg .error ADDRESS_REGISTER_OR_INTEGER_EXPECTED .emit ARRAY_INDEX_RELATIVE .and
-    addrComponent .and addrRegRelOffset;
-
-/*
-vertex program
-    <addrRegRelOffset>     ::= ""
-                             | "+" <addrRegPosOffset>
-                             | "-" <addrRegNegOffset>
-*/
-addrRegRelOffset
-    addrRegRelOffset_1 .or addrRegRelOffset_2 .or .true .emit 0x00;
-addrRegRelOffset_1
-    plus_ne .and addrRegPosOffset;
-addrRegRelOffset_2
-    minus_ne .and addrRegNegOffset;
-
-/*
-vertex program
-    <addrRegPosOffset>     ::= <integer> from 0 to 63
-*/
-addrRegPosOffset
-    integer_0_63;
-
-/*
-vertex program
-    <addrRegNegOffset>     ::= <integer> from 0 to 64
-*/
-addrRegNegOffset
-    integer_0_64;
-
-/*
-fragment program
-    <fragmentResultReg>    ::= <establishedName>
-                             | <resultBinding>
-
-NOTE: <establishedName> is driven by <temporaryReg> rule at the end of <dstReg>
-*/
-fragmentResultReg
-    fp_resultBinding;
-
-/*
-vertex program
-    <vertexResultReg>      ::= <establishedName>
-                             | <resultBinding>
-
-NOTE: <establishedName> is driven by <temporaryReg> rule at the end of <dstReg>
-*/
-vertexResultReg
-    vp_resultBinding;
-
-/*
-vertex program
-    <addrReg>              ::= <establishedName>
-*/
-addrReg
-    vp_establishedName_no_error_on_identifier;
-
-/*
-vertex program
-    <addrComponent>        ::= "." "x"
-*/
-addrComponent
-    dot .and "x" .error INVALID_ADDRESS_COMPONENT .emit COMPONENT_X .emit COMPONENT_X
-    .emit COMPONENT_X .emit COMPONENT_X;
-
-/*
-vertex program
-    <addrWriteMask>        ::= "." "x"
-*/
-addrWriteMask
-    dot .and "x" .error INVALID_ADDRESS_WRITEMASK .emit 0x08;
-
-/*
-    <scalarSuffix>         ::= "." <component>
-*/
-fp_scalarSuffix
-    dot .and fp_component_single .error INVALID_COMPONENT;
-vp_scalarSuffix
-    dot .and vp_component_single .error INVALID_COMPONENT;
-
-/*
-vertex program
-    <swizzleSuffix>        ::= ""
-                             | "." <component>
-                             | "." <component> <component>
-                                   <component> <component>
-*/
-swizzleSuffix
-    swizzleSuffix_1 .or
-    .true .emit COMPONENT_X .emit COMPONENT_Y .emit COMPONENT_Z .emit COMPONENT_W;
-swizzleSuffix_1
-    dot_ne .and swizzleSuffix_2 .error INVALID_SUFFIX;
-swizzleSuffix_2
-    swizzleSuffix_3 .or swizzleSuffix_4;
-swizzleSuffix_3
-    vp_component_multi .and vp_component_multi .and vp_component_multi .error INVALID_COMPONENT .and
-    vp_component_multi .error INVALID_COMPONENT;
-swizzleSuffix_4
-    "x" .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .or
-    "y" .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .or
-    "z" .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .or
-    "w" .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W;
-
-/*
-fragment program
-    <optionalSuffix>       ::= "" 
-                             | "." <component> 
-                             | "." <xyzwComponent> <xyzwComponent>
-                                   <xyzwComponent> <xyzwComponent>
-                             | "." <rgbaComponent> <rgbaComponent>
-                                   <rgbaComponent> <rgbaComponent>
-*/
-optionalSuffix
-    optionalSuffix_1 .or
-    .true .emit COMPONENT_X .emit COMPONENT_Y .emit COMPONENT_Z .emit COMPONENT_W;
-optionalSuffix_1
-    dot_ne .and optionalSuffix_2 .error INVALID_SUFFIX;
-optionalSuffix_2
-    optionalSuffix_3 .or optionalSuffix_4 .or optionalSuffix_5;
-optionalSuffix_3
-    xyzwComponent_multi .and xyzwComponent_multi .and
-    xyzwComponent_multi .error INVALID_COMPONENT .and xyzwComponent_multi .error INVALID_COMPONENT;
-optionalSuffix_4
-    rgbaComponent_multi .and rgbaComponent_multi .and
-    rgbaComponent_multi .error INVALID_COMPONENT .and rgbaComponent_multi .error INVALID_COMPONENT;
-optionalSuffix_5
-    "x" .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .or
-    "y" .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .or
-    "z" .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .or
-    "w" .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W .or
-    "r" .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .or
-    "g" .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .or
-    "b" .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .or
-    "a" .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W;
-
-/*
-fragment program
-    <component>            ::= <xyzwComponent>
-                             | <rgbaComponent>
-
-vertex program
-    <component>            ::= "x"
-                             | "y"
-                             | "z"
-                             | "w"
-*/
-fp_component_single
-    xyzwComponent_single .or rgbaComponent_single;
-vp_component_multi
-    'x' .emit COMPONENT_X .or 'y' .emit COMPONENT_Y .or 'z' .emit COMPONENT_Z .or
-    'w' .emit COMPONENT_W;
-vp_component_single
-    "x" .emit COMPONENT_X .or "y" .emit COMPONENT_Y .or "z" .emit COMPONENT_Z .or
-    "w" .emit COMPONENT_W;
-
-/*
-fragment program
-    <xyzwComponent>        ::= "x" | "y" | "z" | "w"
-*/
-xyzwComponent_multi
-    'x' .emit COMPONENT_X .or 'y' .emit COMPONENT_Y .or 'z' .emit COMPONENT_Z .or
-    'w' .emit COMPONENT_W;
-xyzwComponent_single
-    "x" .emit COMPONENT_X .or "y" .emit COMPONENT_Y .or "z" .emit COMPONENT_Z .or
-    "w" .emit COMPONENT_W;
-
-/*
-fragment program
-    <rgbaComponent>        ::= "r" | "g" | "b" | "a"
-*/
-rgbaComponent_multi
-    'r' .emit COMPONENT_X .or 'g' .emit COMPONENT_Y .or 'b' .emit COMPONENT_Z .or
-    'a' .emit COMPONENT_W;
-rgbaComponent_single
-    "r" .emit COMPONENT_X .or "g" .emit COMPONENT_Y .or "b" .emit COMPONENT_Z .or
-    "a" .emit COMPONENT_W;
-
-/*
-fragment program
-    <optionalMask>         ::= ""
-                             | <xyzwMask>
-                             | <rgbaMask>
-
-vertex program
-    <optionalMask>         ::= ""
-                             | "." "x"
-                             | "." "y"
-                             | "." "xy"
-                             | "." "z"
-                             | "." "xz"
-                             | "." "yz"
-                             | "." "xyz"
-                             | "." "w"
-                             | "." "xw"
-                             | "." "yw"
-                             | "." "xyw"
-                             | "." "zw"
-                             | "." "xzw"
-                             | "." "yzw"
-                             | "." "xyzw"
-
-NOTE: do NOT change the order of <rgbaMask> and <xyzwMask> rulez
-*/
-fp_optionalMask
-    rgbaMask .or xyzwMask .or .true .emit 0x0F;
-vp_optionalMask
-    xyzwMask .or .true .emit 0x0F;
-
-/*
-fragment program
-    <xyzwMask>             ::= "." "x"
-                             | "." "y"
-                             | "." "xy"
-                             | "." "z"
-                             | "." "xz"
-                             | "." "yz"
-                             | "." "xyz"
-                             | "." "w"
-                             | "." "xw"
-                             | "." "yw"
-                             | "." "xyw"
-                             | "." "zw"
-                             | "." "xzw"
-                             | "." "yzw"
-                             | "." "xyzw"
-
-NOTE: <xyzwMask> is also referenced by the vertex program symbol <optionalMask>.
-*/
-xyzwMask
-    dot_ne .and xyzwMask_1 .error INVALID_WRITEMASK;
-xyzwMask_1
-    "xyzw" .emit 0x0F .or "xyz" .emit 0x0E .or "xyw" .emit 0x0D .or "xy" .emit 0x0C .or
-    "xzw" .emit 0x0B .or "xz" .emit 0x0A .or "xw" .emit 0x09 .or "x" .emit 0x08 .or
-    "yzw" .emit 0x07 .or "yz" .emit 0x06 .or "yw" .emit 0x05 .or "y" .emit 0x04 .or
-    "zw" .emit 0x03 .or "z" .emit 0x02 .or "w" .emit 0x01;
-
-/*
-fragment program
-    <rgbaMask>             ::= "." "r"
-                             | "." "g"
-                             | "." "rg"
-                             | "." "b"
-                             | "." "rb"
-                             | "." "gb"
-                             | "." "rgb"
-                             | "." "a"
-                             | "." "ra"
-                             | "." "ga"
-                             | "." "rga"
-                             | "." "ba"
-                             | "." "rba"
-                             | "." "gba"
-                             | "." "rgba"
-*/
-rgbaMask
-    dot_ne .and rgbaMask_1;
-rgbaMask_1
-    "rgba" .emit 0x0F .or "rgb" .emit 0x0E .or "rga" .emit 0x0D .or "rg" .emit 0x0C .or
-    "rba" .emit 0x0B .or "rb" .emit 0x0A .or "ra" .emit 0x09 .or "r" .emit 0x08 .or
-    "gba" .emit 0x07 .or "gb" .emit 0x06 .or "ga" .emit 0x05 .or "g" .emit 0x04 .or
-    "ba" .emit 0x03 .or "b" .emit 0x02 .or "a" .emit 0x01;
-
-/*
-fragment program
-    <namingStatement>      ::= <ATTRIB_statement>
-                             | <PARAM_statement>
-                             | <TEMP_statement>
-                             | <OUTPUT_statement>
-                             | <ALIAS_statement>
-
-vertex program
-    <namingStatement>      ::= <ATTRIB_statement>
-                             | <PARAM_statement>
-                             | <TEMP_statement>
-                             | <ADDRESS_statement>
-                             | <OUTPUT_statement>
-                             | <ALIAS_statement>
-*/
-fp_namingStatement
-    fp_ATTRIB_statement .emit ATTRIB .or
-    fp_PARAM_statement .emit PARAM .or
-    fp_TEMP_statement .emit TEMP .or
-    fp_OUTPUT_statement .emit OUTPUT .or
-    fp_ALIAS_statement .emit ALIAS;
-vp_namingStatement
-    vp_ATTRIB_statement .emit ATTRIB .or
-    vp_PARAM_statement .emit PARAM .or
-    vp_TEMP_statement .emit TEMP .or
-    ADDRESS_statement .emit ADDRESS .or
-    vp_OUTPUT_statement .emit OUTPUT .or
-    vp_ALIAS_statement .emit ALIAS;
-
-/*
-fragment program
-    <ATTRIB_statement>     ::= "ATTRIB" <establishName> "="
-                                 <fragAttribBinding>
-
-vertex program
-    <ATTRIB_statement>     ::= "ATTRIB" <establishName> "="
-                                 <vtxAttribBinding>
-*/
-fp_ATTRIB_statement
-    "ATTRIB" .and space .and fp_establishName .and equal .and
-    fragAttribBinding .error FRAGMENT_EXPECTED;
-vp_ATTRIB_statement
-    "ATTRIB" .and space .and vp_establishName .and equal .and
-    vtxAttribBinding .error VERTEX_EXPECTED;
-
-/*
-fragment program
-    <fragAttribBinding>    ::= "fragment" "." <fragAttribItem>
-*/
-fragAttribBinding
-    "fragment" .and dot .and fragAttribItem .error INVALID_FRAGMENT_PROPERTY;
-
-/*
-vertex program
-    <vtxAttribBinding>     ::= "vertex" "." <vtxAttribItem>
-*/
-vtxAttribBinding
-    "vertex" .and dot .and vtxAttribItem .error INVALID_VERTEX_PROPERTY;
-
-/*
-fragment program
-    <fragAttribItem>       ::= "color" <optColorType>
-                             | "texcoord" <optTexCoordNum>
-                             | "fogcoord"
-                             | "position"
-*/
-fragAttribItem
-    fragAttribItem_1 .emit FRAGMENT_ATTRIB_COLOR .or
-    fragAttribItem_2 .emit FRAGMENT_ATTRIB_TEXCOORD .or
-    .if (fog_coord != 0x00) "fogcoord" .emit FRAGMENT_ATTRIB_FOGCOORD .or
-    "position" .emit FRAGMENT_ATTRIB_POSITION;
-fragAttribItem_1
-    "color" .and optColorType;
-fragAttribItem_2
-    "texcoord" .and optTexCoordNum;
-
-/*
-vertex program
-    <vtxAttribItem>        ::= "position"
-                             | "weight" <vtxOptWeightNum>
-                             | "normal"
-                             | "color" <optColorType>
-                             | "fogcoord"
-                             | "texcoord" <optTexCoordNum>
-                             | "matrixindex" "[" <vtxWeightNum> "]"
-                             | "attrib" "[" <vtxAttribNum> "]"
-*/
-vtxAttribItem
-    "position" .emit VERTEX_ATTRIB_POSITION .or
-    .if (vertex_blend != 0x00) vtxAttribItem_1 .emit VERTEX_ATTRIB_WEIGHT .or
-    "normal" .emit VERTEX_ATTRIB_NORMAL .or
-    vtxAttribItem_2 .emit VERTEX_ATTRIB_COLOR .or
-    "fogcoord" .emit VERTEX_ATTRIB_FOGCOORD .or
-    vtxAttribItem_3 .emit VERTEX_ATTRIB_TEXCOORD .or
-    .if (matrix_palette != 0x00) vtxAttribItem_4 .emit VERTEX_ATTRIB_MATRIXINDEX .or
-    vtxAttribItem_5 .emit VERTEX_ATTRIB_GENERIC;
-vtxAttribItem_1
-    "weight" .and vtxOptWeightNum;
-vtxAttribItem_2
-    "color" .and optColorType;
-vtxAttribItem_3
-    "texcoord" .and optTexCoordNum;
-vtxAttribItem_4
-    "matrixindex" .and lbracket .and vtxWeightNum .and rbracket;
-vtxAttribItem_5
-    "attrib" .and lbracket .and vtxAttribNum .and rbracket;
-
-/*
-vertex program
-    <vtxAttribNum>         ::= <integer> from 0 to MAX_VERTEX_ATTRIBS_ARB-1
-*/
-vtxAttribNum
-    integer;
-
-/*
-vertex program
-    <vtxOptWeightNum>      ::= ""
-                             | "[" <vtxWeightNum> "]"
-*/
-vtxOptWeightNum
-    vtxOptWeightNum_1 .or .true .emit 0x00;
-vtxOptWeightNum_1
-    lbracket_ne .and vtxWeightNum .and rbracket;
-
-/*
-vertex program
-    <vtxWeightNum>         ::= <integer> from 0 to MAX_VERTEX_UNITS_ARB-1,
-                                 must be divisible by four
-*/
-vtxWeightNum
-    integer;
-
-/*
-    <PARAM_statement>      ::= <PARAM_singleStmt>
-                             | <PARAM_multipleStmt>
-*/
-fp_PARAM_statement
-    fp_PARAM_multipleStmt .or fp_PARAM_singleStmt;
-vp_PARAM_statement
-    vp_PARAM_multipleStmt .or vp_PARAM_singleStmt;
-
-/*
-    <PARAM_singleStmt>     ::= "PARAM" <establishName> <paramSingleInit>
-*/
-fp_PARAM_singleStmt
-    "PARAM" .and space .and fp_establishName .and .true .emit 0x00 .and fp_paramSingleInit .and
-    .true .emit PARAM_NULL;
-vp_PARAM_singleStmt
-    "PARAM" .and space .and vp_establishName .and .true .emit 0x00 .and vp_paramSingleInit .and
-    .true .emit PARAM_NULL;
-
-/*
-    <PARAM_multipleStmt>   ::= "PARAM" <establishName> "[" <optArraySize> "]"
-                                   <paramMultipleInit>
-*/
-fp_PARAM_multipleStmt
-    "PARAM" .and space .and fp_establishName .and lbracket_ne .and optArraySize .and rbracket .and
-    fp_paramMultipleInit .and .true .emit PARAM_NULL;
-vp_PARAM_multipleStmt
-    "PARAM" .and space .and vp_establishName .and lbracket_ne .and optArraySize .and rbracket .and
-    vp_paramMultipleInit .and .true .emit PARAM_NULL;
-
-/*
-    <optArraySize>         ::= ""
-                             | <integer> from 1 to MAX_PROGRAM_PARAMETERS_ARB
-                                 (maximum number of allowed program 
-                                  parameter bindings)
-*/
-optArraySize
-    optional_integer;
-
-/*
-    <paramSingleInit>      ::= "=" <paramSingleItemDecl>
-*/
-fp_paramSingleInit
-    equal .and fp_paramSingleItemDecl;
-vp_paramSingleInit
-    equal .and vp_paramSingleItemDecl;
-
-/*
-    <paramMultipleInit>    ::= "=" "{" <paramMultInitList> "}"
-*/
-fp_paramMultipleInit
-    equal .and lbrace .and fp_paramMultInitList .and rbrace;
-vp_paramMultipleInit
-    equal .and lbrace .and vp_paramMultInitList .and rbrace;
-
-/*
-    <paramMultInitList>    ::= <paramMultipleItem>
-                             | <paramMultipleItem> "," <paramMultiInitList>
-*/
-fp_paramMultInitList
-    fp_paramMultInitList_1 .or fp_paramMultipleItem;
-vp_paramMultInitList
-    vp_paramMultInitList_1 .or vp_paramMultipleItem;
-fp_paramMultInitList_1
-    fp_paramMultipleItem .and comma_ne .and fp_paramMultInitList;
-vp_paramMultInitList_1
-    vp_paramMultipleItem .and comma_ne .and vp_paramMultInitList;
-
-/*
-    <paramSingleItemDecl>  ::= <stateSingleItem>
-                             | <programSingleItem>
-                             | <paramConstDecl>
-*/
-fp_paramSingleItemDecl
-    fp_stateSingleItem .emit PARAM_STATE_ELEMENT .or
-    programSingleItem .emit PARAM_PROGRAM_ELEMENT .or
-    paramConstDecl .emit PARAM_CONSTANT;
-vp_paramSingleItemDecl
-    vp_stateSingleItem .emit PARAM_STATE_ELEMENT .or
-    programSingleItem .emit PARAM_PROGRAM_ELEMENT .or
-    paramConstDecl .emit PARAM_CONSTANT;
-
-/*
-    <paramSingleItemUse>   ::= <stateSingleItem>
-                             | <programSingleItem>
-                             | <paramConstUse>
-*/
-fp_paramSingleItemUse
-    fp_stateSingleItem .emit PARAM_STATE_ELEMENT .or
-    programSingleItem .emit PARAM_PROGRAM_ELEMENT .or
-    paramConstUse .emit PARAM_CONSTANT;
-vp_paramSingleItemUse
-    vp_stateSingleItem .emit PARAM_STATE_ELEMENT .or
-    programSingleItem .emit PARAM_PROGRAM_ELEMENT .or
-    paramConstUse .emit PARAM_CONSTANT;
-
-/*
-    <paramMultipleItem>    ::= <stateMultipleItem>
-                             | <programMultipleItem>
-                             | <paramConstDecl>
-*/
-fp_paramMultipleItem
-    fp_stateMultipleItem .emit PARAM_STATE_ELEMENT .or
-    programMultipleItem .emit PARAM_PROGRAM_ELEMENT .or
-    paramConstDecl .emit PARAM_CONSTANT;
-vp_paramMultipleItem
-    vp_stateMultipleItem .emit PARAM_STATE_ELEMENT .or
-    programMultipleItem .emit PARAM_PROGRAM_ELEMENT .or
-    paramConstDecl .emit PARAM_CONSTANT;
-
-/*
-    <stateMultipleItem>    ::= <stateSingleItem>
-                             | "state" "." <stateMatrixRows>
-*/
-fp_stateMultipleItem
-    stateMultipleItem_1 .or fp_stateSingleItem;
-vp_stateMultipleItem
-    stateMultipleItem_1 .or vp_stateSingleItem;
-stateMultipleItem_1
-    "state" .and dot .and stateMatrixRows .emit STATE_MATRIX_ROWS;
-
-/*
-fragment program
-    <stateSingleItem>      ::= "state" "." <stateMaterialItem>
-                             | "state" "." <stateLightItem>
-                             | "state" "." <stateLightModelItem>
-                             | "state" "." <stateLightProdItem>
-                             | "state" "." <stateTexEnvItem>
-                             | "state" "." <stateFogItem>
-                             | "state" "." <stateDepthItem>
-                             | "state" "." <stateMatrixRow>
-
-vertex program
-    <stateSingleItem>      ::= "state" "." <stateMaterialItem>
-                             | "state" "." <stateLightItem>
-                             | "state" "." <stateLightModelItem>
-                             | "state" "." <stateLightProdItem>
-                             | "state" "." <stateTexGenItem>
-                             | "state" "." <stateFogItem>
-                             | "state" "." <stateClipPlaneItem>
-                             | "state" "." <statePointItem>
-                             | "state" "." <stateMatrixRow>
-*/
-fp_stateSingleItem
-    "state" .and dot .and fp_stateSingleItem_1 .error INVALID_STATE_PROPERTY;
-vp_stateSingleItem
-    "state" .and dot .and vp_stateSingleItem_1 .error INVALID_STATE_PROPERTY;
-fp_stateSingleItem_1
-    stateSingleItem_1 .or stateSingleItem_2 .or stateSingleItem_3 .or stateSingleItem_4 .or
-    stateSingleItem_5 .or stateSingleItem_7 .or stateSingleItem_8 .or stateSingleItem_11;
-vp_stateSingleItem_1
-    stateSingleItem_1 .or stateSingleItem_2 .or stateSingleItem_3 .or stateSingleItem_4 .or
-    stateSingleItem_6 .or stateSingleItem_7 .or stateSingleItem_9 .or stateSingleItem_10 .or
-    stateSingleItem_11;
-stateSingleItem_1
-    stateMaterialItem .emit STATE_MATERIAL;
-stateSingleItem_2
-    stateLightItem .emit STATE_LIGHT;
-stateSingleItem_3
-    stateLightModelItem .emit STATE_LIGHT_MODEL;
-stateSingleItem_4
-    stateLightProdItem .emit STATE_LIGHT_PROD;
-stateSingleItem_5
-    stateTexEnvItem .emit STATE_TEX_ENV;
-stateSingleItem_6
-    stateTexGenItem .emit STATE_TEX_GEN;
-stateSingleItem_7
-    stateFogItem .emit STATE_FOG;
-stateSingleItem_8
-    stateDepthItem .emit STATE_DEPTH;
-stateSingleItem_9
-    stateClipPlaneItem .emit STATE_CLIP_PLANE;
-stateSingleItem_10
-    statePointItem .emit STATE_POINT;
-stateSingleItem_11
-    stateMatrixRow .emit STATE_MATRIX_ROWS;
-
-/*
-    <stateMaterialItem>    ::= "material" <optFaceType> "." <stateMatProperty>
-*/
-stateMaterialItem
-    "material" .and optFaceType .and dot .and stateMatProperty .error INVALID_MATERIAL_PROPERTY;
-
-/*
-    <stateMatProperty>     ::= "ambient"
-                             | "diffuse"
-                             | "specular"
-                             | "emission"
-                             | "shininess"
-*/
-stateMatProperty
-    "ambient" .emit MATERIAL_AMBIENT .or
-    "diffuse" .emit MATERIAL_DIFFUSE .or
-    "specular" .emit MATERIAL_SPECULAR .or
-    "emission" .emit MATERIAL_EMISSION .or
-    "shininess" .emit MATERIAL_SHININESS;
-
-/*
-    <stateLightItem>       ::= "light" "[" <stateLightNumber> "]" "." 
-                                 <stateLightProperty>
-*/
-stateLightItem
-    "light" .and lbracket .and stateLightNumber .and rbracket .and dot .and
-    stateLightProperty .error INVALID_LIGHT_PROPERTY;
-
-/*
-    <stateLightProperty>   ::= "ambient"
-                             | "diffuse" 
-                             | "specular"
-                             | "position"
-                             | "attenuation"
-                             | "spot" "." <stateSpotProperty>
-                             | "half"
-*/
-stateLightProperty
-    "ambient" .emit LIGHT_AMBIENT .or
-    "diffuse" .emit LIGHT_DIFFUSE .or
-    "specular" .emit LIGHT_SPECULAR .or
-    "position" .emit LIGHT_POSITION .or
-    "attenuation" .emit LIGHT_ATTENUATION .or
-    stateLightProperty_1 .emit LIGHT_SPOT_DIRECTION .or
-    "half" .emit LIGHT_HALF;
-stateLightProperty_1
-    "spot" .and dot .and stateSpotProperty .error INVALID_SPOT_PROPERTY;
-
-/*
-    <stateSpotProperty>    ::= "direction" 
-*/
-stateSpotProperty
-    "direction";
-
-/*
-    <stateLightModelItem>  ::= "lightmodel" <stateLModProperty>
-*/
-stateLightModelItem
-    "lightmodel" .and stateLModProperty .error INVALID_LIGHTMODEL_PROPERTY;
-
-/*
-    <stateLModProperty>    ::= "." "ambient"
-                             | <optFaceType> "." "scenecolor"
-*/
-stateLModProperty
-    stateLModProperty_1 .or stateLModProperty_2;
-stateLModProperty_1
-    dot .and "ambient" .emit LIGHT_MODEL_AMBIENT;
-stateLModProperty_2
-    stateLModProperty_3 .emit LIGHT_MODEL_SCENECOLOR;
-stateLModProperty_3
-    optFaceType .and dot .and "scenecolor";
-
-/*
-    <stateLightProdItem>   ::= "lightprod" "[" <stateLightNumber> "]"
-                                 <optFaceType> "." <stateLProdProperty>
-*/
-stateLightProdItem
-    "lightprod" .and lbracket .and stateLightNumber .and rbracket .and optFaceType .and dot .and
-    stateLProdProperty .error INVALID_LIGHTPROD_PROPERTY;
-
-/*
-    <stateLProdProperty>   ::= "ambient"
-                             | "diffuse"
-                             | "specular"
-*/
-stateLProdProperty
-    "ambient" .emit LIGHT_PROD_AMBIENT .or
-    "diffuse" .emit LIGHT_PROD_DIFFUSE .or
-    "specular" .emit LIGHT_PROD_SPECULAR;
-
-/*
-    <stateLightNumber>     ::= <integer> from 0 to MAX_LIGHTS-1
-*/
-stateLightNumber
-    integer;
-
-/*
-fragment program
-    <stateTexEnvItem>      ::= "texenv" <optLegacyTexUnitNum> "." 
-                                 <stateTexEnvProperty>
-*/
-stateTexEnvItem
-    "texenv" .and optLegacyTexUnitNum .and dot .and
-    stateTexEnvProperty .error INVALID_TEXENV_PROPERTY;
-
-/*
-fragment program
-    <stateTexEnvProperty>  ::= "color"
-*/
-stateTexEnvProperty
-    "color" .emit TEX_ENV_COLOR;
-
-/*
-fragment program
-    <optLegacyTexUnitNum>  ::= ""
-                             | "[" <legacyTexUnitNum> "]"
-
-NOTE: <optLegaceTexUnitNum> is not optional.
-*/
-optLegacyTexUnitNum
-    lbracket_ne .and legacyTexUnitNum .and rbracket;
-
-/*
-fragment program
-    <legacyTexUnitNum>     ::= <integer> from 0 to MAX_TEXTURE_UNITS-1
-*/
-legacyTexUnitNum
-    integer;
-
-/*
-vertex program
-    <stateTexGenItem>      ::= "texgen" <optTexCoordNum> "."
-                                 <stateTexGenType> "." <stateTexGenCoord>
-*/
-stateTexGenItem
-    "texgen" .and optTexCoordNum .and dot .and stateTexGenType .error INVALID_TEXGEN_PROPERTY .and
-    dot .and stateTexGenCoord .error INVALID_TEXGEN_COORD;
-
-/*
-vertex program
-    <stateTexGenType>      ::= "eye"
-                             | "object"
-*/
-stateTexGenType
-    "eye" .emit TEX_GEN_EYE .or
-    "object" .emit TEX_GEN_OBJECT;
-
-/*
-vertex program
-    <stateTexGenCoord>     ::= "s"
-                             | "t"
-                             | "r"
-                             | "q"
-*/
-stateTexGenCoord
-    "s" .emit COMPONENT_X .or
-    "t" .emit COMPONENT_Y .or
-    "r" .emit COMPONENT_Z .or
-    "q" .emit COMPONENT_W;
-
-/*
-    <stateFogItem>         ::= "fog" "." <stateFogProperty>
-*/
-stateFogItem
-    "fog" .and dot .and stateFogProperty .error INVALID_FOG_PROPERTY;
-
-/*
-    <stateFogProperty>     ::= "color"
-                             | "params"
-*/
-stateFogProperty
-    "color" .emit FOG_COLOR .or
-    "params" .emit FOG_PARAMS;
-
-/*
-fragment program
-    <stateDepthItem>       ::= "depth" "." <stateDepthProperty>
-*/
-stateDepthItem
-    "depth" .and dot .and stateDepthProperty .error INVALID_DEPTH_PROPERTY;
-
-/*
-fragment program
-    <stateDepthProperty>   ::= "range"
-*/
-stateDepthProperty
-    "range" .emit DEPTH_RANGE;
-
-/*
-vertex program
-    <stateClipPlaneItem>   ::= "clip" "[" <stateClipPlaneNum> "]" "." "plane"
-*/
-stateClipPlaneItem
-    "clip" .and lbracket .and stateClipPlaneNum .and rbracket .and dot .and
-    "plane" .error INVALID_CLIPPLANE_PROPERTY;
-
-/*
-vertex program
-    <stateClipPlaneNum>    ::= <integer> from 0 to MAX_CLIP_PLANES-1
-*/
-stateClipPlaneNum
-    integer;
-
-/*
-vertex program
-    <statePointItem>       ::= "point" "." <statePointProperty>
-*/
-statePointItem
-    "point" .and dot .and statePointProperty .error INVALID_POINT_PROPERTY;
-
-/*
-vertex program
-    <statePointProperty>   ::= "size"
-                             | "attenuation"
-*/
-statePointProperty
-    "size" .emit POINT_SIZE .or
-    .if (point_parameters != 0x00) "attenuation" .emit POINT_ATTENUATION;
-
-/*
-    <stateMatrixRow>       ::= <stateMatrixItem> "." "row" "[" 
-                                  <stateMatrixRowNum> "]"
-*/
-stateMatrixRow
-    stateMatrixItem .and dot .and "row" .error MATRIX_ROW_SELECTOR_OR_MODIFIER_EXPECTED .and
-    lbracket .and stateMatrixRowNum .and rbracket .emit 0x0;
-
-/*
-    <stateMatrixRows>      ::= <stateMatrixItem> <optMatrixRows>
-*/
-stateMatrixRows
-    stateMatrixItem .and optMatrixRows;
-
-/*
-    <optMatrixRows>        ::= ""
-                             | "." "row" "[" <stateMatrixRowNum> ".." 
-                                  <stateMatrixRowNum> "]"
-*/
-optMatrixRows
-    optMatrixRows_1 .or .true .emit 0x0 .emit '3' .emit 0x0 .emit $;
-optMatrixRows_1
-    dot_ne .and "row" .error MATRIX_ROW_SELECTOR_OR_MODIFIER_EXPECTED .and lbracket .and
-    stateMatrixRowNum .and dotdot .and stateMatrixRowNum .and rbracket;
-
-/*
-    <stateMatrixItem>      ::= "matrix" "." <stateMatrixName> 
-                               <stateOptMatModifier>
-*/
-stateMatrixItem
-    "matrix" .and dot .and stateMatrixName .error INVALID_MATRIX_NAME .and stateOptMatModifier;
-
-/*
-    <stateOptMatModifier>  ::= ""
-                             | "." <stateMatModifier>
-*/
-stateOptMatModifier
-    stateOptMatModifier_1 .or .true .emit MATRIX_MODIFIER_IDENTITY;
-stateOptMatModifier_1
-    dot_ne .and stateMatModifier;
-
-/*
-    <stateMatModifier>     ::= "inverse" 
-                             | "transpose" 
-                             | "invtrans"
-*/
-stateMatModifier
-    "inverse" .emit MATRIX_MODIFIER_INVERSE .or
-    "transpose" .emit MATRIX_MODIFIER_TRANSPOSE .or
-    "invtrans" .emit MATRIX_MODIFIER_INVTRANS;
-
-/*
-    <stateMatrixRowNum>    ::= <integer> from 0 to 3
-*/
-stateMatrixRowNum
-    integer_0_3;
-
-/*
-    <stateMatrixName>      ::= "modelview" <stateOptModMatNum>
-                             | "projection"
-                             | "mvp"
-                             | "texture" <optTexCoordNum>
-                             | "palette" "[" <statePaletteMatNum> "]"
-                             | "program" "[" <stateProgramMatNum> "]"
-*/
-stateMatrixName
-    stateMatrixName_1_1 .emit MATRIX_MODELVIEW .or
-    "projection" .emit MATRIX_PROJECTION .or
-    "mvp" .emit MATRIX_MVP .or
-    stateMatrixName_1_2 .emit MATRIX_TEXTURE .or
-    .if (matrix_palette != 0x00) stateMatrixName_1_3 .emit MATRIX_PALETTE .or
-    stateMatrixName_1_4 .emit MATRIX_PROGRAM;
-stateMatrixName_1_1
-    "modelview" .and stateOptModMatNum;
-stateMatrixName_1_2
-    "texture" .and optTexCoordNum;
-stateMatrixName_1_3
-    "palette" .and lbracket .and statePaletteMatNum .and rbracket;
-stateMatrixName_1_4
-    "program" .and lbracket .and stateProgramMatNum .and rbracket;
-
-/*
-    <stateOptModMatNum>    ::= ""
-                             | "[" <stateModMatNum> "]"
-*/
-stateOptModMatNum
-    .if (vertex_blend != 0x00) stateOptModMatNum_1 .or
-    .true .emit 0x00;
-stateOptModMatNum_1
-    lbracket_ne .and stateModMatNum .and rbracket;
-
-/*
-    <stateModMatNum>       ::= <integer> from 0 to MAX_VERTEX_UNITS_ARB-1
-*/
-stateModMatNum
-    integer;
-
-/*
-    <optTexCoordNum>       ::= ""
-                             | "[" <texCoordNum> "]"
-*/
-optTexCoordNum
-    optTexCoordNum_1 .or .true .emit 0x00;
-optTexCoordNum_1
-    lbracket_ne .and texCoordNum .and rbracket;
-
-/*
-    <texCoordNum>          ::= <integer> from 0 to MAX_TEXTURE_COORDS_ARB-1
-*/
-texCoordNum
-    integer;
-
-/*
-    <statePaletteMatNum>   ::= <integer> from 0 to MAX_PALETTE_MATRICES_ARB-1
-*/
-statePaletteMatNum
-    integer;
-
-/*
-    <stateProgramMatNum>   ::= <integer> from 0 to MAX_PROGRAM_MATRICES_ARB-1
-*/
-stateProgramMatNum
-    integer;
-
-/*
-    <programSingleItem>    ::= <progEnvParam>
-                             | <progLocalParam>
-
-NOTE: <programSingleItem> has been modified for correct error handling. If program property
-      is neither "env" nor "local" INVALID_PROGRAM_PROPERTY is generated.
-*/
-programSingleItem
-    "program" .and dot .and programSingleItem_1 .error INVALID_PROGRAM_PROPERTY;
-programSingleItem_1
-    progEnvParam .or progLocalParam;
-
-/*
-    <programMultipleItem>  ::= <progEnvParams>
-                             | <progLocalParams>
-
-NOTE: <programMultipleItem> has been modified for correct error handling. If program property
-      is neither "env" nor "local" INVALID_PROGRAM_PROPERTY is generated.
-*/
-programMultipleItem
-    "program" .and dot .and programMultipleItem_1 .error INVALID_PROGRAM_PROPERTY;
-programMultipleItem_1
-    progEnvParams .or progLocalParams;
-
-/*
-    <progEnvParams>        ::= "program" "." "env" 
-                                 "[" <progEnvParamNums> "]"
-
-NOTE: "program" "." has been moved to <programMultipleItem>.
-*/
-progEnvParams
-    "env" .emit PROGRAM_PARAM_ENV .and lbracket .and progEnvParamNums .and rbracket;
-
-/*
-    <progEnvParamNums>     ::= <progEnvParamNum>
-                             | <progEnvParamNum> ".." <progEnvParamNum>
-*/
-progEnvParamNums
-    progEnvParamNums_1 .or progEnvParamNums_2;
-progEnvParamNums_1
-    progEnvParamNum .and dotdot_ne .and progEnvParamNum;
-progEnvParamNums_2
-    progEnvParamNum .and .true .emit 0x00;
-
-/*
-    <progEnvParam>         ::= "program" "." "env" 
-                                 "[" <progEnvParamNum> "]"
-
-NOTE: "program" "." has been moved to <programSingleItem>.
-*/
-progEnvParam
-    "env" .emit PROGRAM_PARAM_ENV .and lbracket .and progEnvParamNum .and rbracket .emit 0x00;
-
-/*
-    <progLocalParams>      ::= "program" "." "local" 
-                                 "[" <progLocalParamNums> "]"
-
-NOTE: "program" "." has been moved to <programMultipleItem>.
-*/
-progLocalParams
-    "local" .emit PROGRAM_PARAM_LOCAL .and lbracket .and progLocalParamNums .and rbracket;
-
-/*
-    <progLocalParamNums>   ::= <progLocalParamNum>
-                             | <progLocalParamNum> ".." <progLocalParamNum>
-*/
-progLocalParamNums
-    progLocalParamNums_1 .or progLocalParamNums_2;
-progLocalParamNums_1
-    progLocalParamNum .and dotdot_ne .and progLocalParamNum;
-progLocalParamNums_2
-    progLocalParamNum .and .true .emit 0x00;
-
-/*
-    <progLocalParam>       ::= "program" "." "local" 
-                                 "[" <progLocalParamNum> "]"
-
-NOTE: "program" "." has been moved to <programSingleItem>.
-*/
-progLocalParam
-    "local" .emit PROGRAM_PARAM_LOCAL .and lbracket .and progLocalParamNum .and rbracket .emit 0x00;
-
-/*
-    <progEnvParamNum>      ::= <integer> from 0 to
-                               MAX_PROGRAM_ENV_PARAMETERS_ARB - 1
-*/
-progEnvParamNum
-    integer;
-
-/*
-    <progLocalParamNum>    ::= <integer> from 0 to
-                               MAX_PROGRAM_LOCAL_PARAMETERS_ARB - 1
-*/
-progLocalParamNum
-    integer;
-
-/*
-    <paramConstDecl>       ::= <paramConstScalarDecl>
-                             | <paramConstVector>
-*/
-paramConstDecl
-    paramConstScalarDecl .emit CONSTANT_SCALAR .or paramConstVector .emit CONSTANT_VECTOR;
-
-/*
-    <paramConstUse>        ::= <paramConstScalarUse>
-                             | <paramConstVector>
-*/
-paramConstUse
-    paramConstScalarUse .emit CONSTANT_SCALAR .or paramConstVector .emit CONSTANT_VECTOR;
-
-/*
-    <paramConstScalarDecl> ::= <signedFloatConstant>
-*/
-paramConstScalarDecl
-    signedFloatConstant;
-
-/*
-    <paramConstScalarUse>  ::= <floatConstant>
-*/
-paramConstScalarUse
-    floatConstant;
-
-/*
-    <paramConstVector>     ::= "{" <signedFloatConstant> "}"
-                             | "{" <signedFloatConstant> "," 
-                                   <signedFloatConstant> "}"
-                             | "{" <signedFloatConstant> "," 
-                                   <signedFloatConstant> ","
-                                   <signedFloatConstant> "}"
-                             | "{" <signedFloatConstant> "," 
-                                   <signedFloatConstant> ","
-                                   <signedFloatConstant> "," 
-                                   <signedFloatConstant> "}"
-*/
-paramConstVector
-    paramConstVector_4 .emit 0x04 .or paramConstVector_3 .emit 0x03 .or
-    paramConstVector_2 .emit 0x02 .or paramConstVector_1 .emit 0x01;
-paramConstVector_1
-    lbrace_ne .and signedFloatConstant .and rbrace;
-paramConstVector_2
-    lbrace_ne .and signedFloatConstant .and comma_ne .and signedFloatConstant .and rbrace;
-paramConstVector_3
-    lbrace_ne .and signedFloatConstant .and comma_ne .and signedFloatConstant .and comma_ne .and
-    signedFloatConstant .and rbrace;
-paramConstVector_4
-    lbrace_ne .and signedFloatConstant .and comma_ne .and signedFloatConstant .and comma_ne .and
-    signedFloatConstant .and comma_ne .and signedFloatConstant .and rbrace;
-
-/*
-    <signedFloatConstant>  ::= <optionalSign> <floatConstant>
-*/
-signedFloatConstant
-    optionalSign .and floatConstant;
-
-/*
-    <floatConstant>        ::= see text
-    The <floatConstant> rule matches a floating-point constant consisting
-    of an integer part, a decimal point, a fraction part, an "e" or
-    "E", and an optionally signed integer exponent.  The integer and
-    fraction parts both consist of a sequence of one or more digits ("0"
-    through "9").  Either the integer part or the fraction parts (not
-    both) may be missing; either the decimal point or the "e" (or "E")
-    and the exponent (not both) may be missing.
-*/
-floatConstant
-    float;
-
-/*
-    <optionalSign>         ::= ""
-                             | "-"
-                             | "+"
-*/
-optionalSign
-    optional_sign_ne;
-
-/*
-    <TEMP_statement>       ::= "TEMP" <varNameList>
-*/
-fp_TEMP_statement
-    "TEMP" .and space .and fp_varNameList .and .true .emit 0x00;
-vp_TEMP_statement
-    "TEMP" .and space .and vp_varNameList .and .true .emit 0x00;
-
-/*
-vertex program
-    <ADDRESS_statement>    ::= "ADDRESS" <varNameList>
-*/
-ADDRESS_statement
-    "ADDRESS" .and space .and vp_varNameList .and .true .emit 0x00;
-
-/*
-    <varNameList>          ::= <establishName>
-                             | <establishName> "," <varNameList>
-*/
-fp_varNameList
-    fp_varNameList_1 .or fp_establishName;
-vp_varNameList
-    vp_varNameList_1 .or vp_establishName;
-fp_varNameList_1
-    fp_establishName .and comma_ne .and fp_varNameList;
-vp_varNameList_1
-    vp_establishName .and comma_ne .and vp_varNameList;
-
-/*
-    <OUTPUT_statement>     ::= "OUTPUT" <establishName> "="
-                                 <resultBinding>
-*/
-fp_OUTPUT_statement
-    "OUTPUT" .and space .and fp_establishName .and equal .and
-    fp_resultBinding .error RESULT_EXPECTED;
-vp_OUTPUT_statement
-    "OUTPUT" .and space .and vp_establishName .and equal .and
-    vp_resultBinding .error RESULT_EXPECTED;
-
-/*
-fragment program
-    <resultBinding>        ::= "result" "." "color"
-                             | "result" "." "color" <optOutputColorNum> (if option ARB_draw_buffers present)
-                             | "result" "." "depth"
-
-vertex program
-    <resultBinding>        ::= "result" "." "position"
-                             | "result" "." <resultColBinding>
-                             | "result" "." "fogcoord"
-                             | "result" "." "pointsize"
-                             | "result" "." "texcoord" <optTexCoordNum>
-*/
-fp_resultBinding
-    "result" .and dot .and fp_resultBinding_1 .error INVALID_RESULT_PROPERTY;
-vp_resultBinding
-    "result" .and dot .and vp_resultBinding_1 .error INVALID_RESULT_PROPERTY;
-fp_resultBinding_1
-    fp_resultBinding_2 .emit FRAGMENT_RESULT_COLOR .or
-    "depth" .emit FRAGMENT_RESULT_DEPTH;
-fp_resultBinding_2
-    "color" .and optOutputColorNum;
-vp_resultBinding_1
-    .if (ARB_position_invariant == 0x00) "position" .emit VERTEX_RESULT_POSITION .or
-    resultColBinding .emit VERTEX_RESULT_COLOR .or
-    "fogcoord" .emit VERTEX_RESULT_FOGCOORD .or
-    "pointsize" .emit VERTEX_RESULT_POINTSIZE .or
-    vp_resultBinding_2 .emit VERTEX_RESULT_TEXCOORD;
-vp_resultBinding_2
-    "texcoord" .and optTexCoordNum;
-
-/*
-GL_ARB_draw_buffers
-    <optOutputColorNum>    ::= ""
-                             | "[" <outputColorNum> "]"
-*/
-optOutputColorNum
-    .if (ARB_draw_buffers != 0x00) optOutputColorNum_1 .or .true .emit 0x00;
-optOutputColorNum_1
-    lbracket_ne .and outputColorNum .and rbracket;
-
-/*
-GL_ARB_draw_buffers
-    <outputColorNum>       ::= <integer> from 0 to MAX_DRAW_BUFFERS_ARB-1
-*/
-outputColorNum
-    integer;
-
-/*
-vertex program
-    <resultColBinding>     ::= "color" <optFaceType> <optColorType>
-*/
-resultColBinding
-    "color" .and optFaceType .and optColorType;
-
-/*
-    <optFaceType>          ::= ""
-                             | "." "front"
-                             | "." "back"
-*/
-optFaceType
-    FaceType .or .true .emit FACE_FRONT;
-FaceType
-    dot_ne .and FaceProperty;
-FaceProperty
-    "front" .emit FACE_FRONT .or "back" .emit FACE_BACK;
-
-/*
-    <optColorType>         ::= ""
-                             | "." "primary"
-                             | "." "secondary"
-*/
-optColorType
-    ColorType .or .true .emit COLOR_PRIMARY;
-ColorType
-    dot_ne .and ColorProperty;
-ColorProperty
-    "primary" .emit COLOR_PRIMARY .or
-    .if (secondary_color != 0x00) "secondary" .emit COLOR_SECONDARY;
-
-/*
-    <ALIAS_statement>      ::= "ALIAS" <establishName> "="
-                                 <establishedName>
-*/
-fp_ALIAS_statement
-    "ALIAS" .and fp_ALIAS_statement_1 .error IDENTIFIER_EXPECTED .and equal .and fp_establishedName;
-vp_ALIAS_statement
-    "ALIAS" .and vp_ALIAS_statement_1 .error IDENTIFIER_EXPECTED .and equal .and vp_establishedName;
-fp_ALIAS_statement_1
-    space .and fp_establishName;
-vp_ALIAS_statement_1
-    space .and vp_establishName;
-
-/*
-    <establishName>        ::= <identifier>
-*/
-fp_establishName
-    fp_identifier;
-vp_establishName
-    vp_identifier;
-
-/*
-    <establishedName>      ::= <identifier>
-*/
-fp_establishedName
-    fp_identifier;
-vp_establishedName
-    vp_identifier;
-fp_establishedName_no_error_on_identifier
-    fp_identifier_ne;
-vp_establishedName_no_error_on_identifier
-    vp_identifier_ne;
-
-/*
-fragment program
-    <identifier>           ::= see text
-    The <identifier> rule matches a sequence of one or more letters ("A"
-    through "Z", "a" through "z"), digits ("0" through "9), underscores 
-    ("_"), or dollar signs ("$"); the first character must not be a 
-    number.  Upper and lower case letters are considered different 
-    (names are case-sensitive).  The following strings are reserved 
-    keywords and may not be used as identifiers:
-
-        ABS, ABS_SAT, ADD, ADD_SAT, ALIAS, ATTRIB, CMP, CMP_SAT, COS,
-        COS_SAT, DP3, DP3_SAT, DP4, DP4_SAT, DPH, DPH_SAT, DST, DST_SAT, 
-        END, EX2, EX2_SAT, FLR, FLR_SAT, FRC, FRC_SAT, KIL, LG2, 
-        LG2_SAT, LIT, LIT_SAT, LRP, LRP_SAT, MAD, MAD_SAT, MAX, MAX_SAT, 
-        MIN, MIN_SAT, MOV, MOV_SAT, MUL, MUL_SAT, OPTION, OUTPUT, PARAM, 
-        POW, POW_SAT, RCP, RCP_SAT, RSQ, RSQ_SAT, SIN, SIN_SAT, SCS, 
-        SCS_SAT, SGE, SGE_SAT, SLT, SLT_SAT, SUB, SUB_SAT, SWZ, SWZ_SAT, 
-        TEMP, TEX, TEX_SAT, TXB, TXB_SAT, TXP, TXP_SAT, XPD, XPD_SAT, 
-        fragment, program, result, state, and texture.
-
-vertex program
-    <identifier>           ::= see text
-    The <identifier> rule matches a sequence of one or more letters ("A"
-    through "Z", "a" through "z"), digits ("0" through "9), underscores ("_"),
-    or dollar signs ("$"); the first character must not be a number.  Upper
-    and lower case letters are considered different (names are
-    case-sensitive).  The following strings are reserved keywords and may not
-    be used as identifiers:
-
-        ABS, ADD, ADDRESS, ALIAS, ARL, ATTRIB, DP3, DP4, DPH, DST, END, EX2,
-        EXP, FLR, FRC, LG2, LIT, LOG, MAD, MAX, MIN, MOV, MUL, OPTION, OUTPUT,
-        PARAM, POW, RCP, RSQ, SGE, SLT, SUB, SWZ, TEMP, XPD, program, result,
-        state, and vertex.
-*/
-fp_identifier
-    fp_identifier_ne .error IDENTIFIER_EXPECTED;
-vp_identifier
-    vp_identifier_ne .error IDENTIFIER_EXPECTED;
-fp_identifier_ne
-    fp_not_reserved_identifier .and identifier_ne;
-vp_identifier_ne
-    vp_not_reserved_identifier .and identifier_ne;
-
-fp_not_reserved_identifier
-    fp_not_reserved_identifier_1 .or .true;
-fp_not_reserved_identifier_1
-    fp_reserved_identifier .and .false .error RESERVED_KEYWORD;
-vp_not_reserved_identifier
-    vp_not_reserved_identifier_1 .or .true;
-vp_not_reserved_identifier_1
-    vp_reserved_identifier .and .false .error RESERVED_KEYWORD;
-
-fp_reserved_identifier
-    "ABS" .or "ABS_SAT" .or "ADD" .or "ADD_SAT" .or "ALIAS" .or "ATTRIB" .or "CMP" .or "CMP_SAT" .or
-    "COS" .or "COS_SAT" .or "DP3" .or "DP3_SAT" .or "DP4" .or "DP4_SAT" .or "DPH" .or "DPH_SAT" .or
-    "DST" .or "DST_SAT" .or "END" .or "EX2" .or "EX2_SAT" .or "FLR" .or "FLR_SAT" .or "FRC" .or
-    "FRC_SAT" .or "KIL" .or "LG2" .or "LG2_SAT" .or "LIT" .or "LIT_SAT" .or "LRP" .or "LRP_SAT" .or
-    "MAD" .or "MAD_SAT" .or "MAX" .or "MAX_SAT" .or "MIN" .or "MIN_SAT" .or "MOV" .or "MOV_SAT" .or
-    "MUL" .or "MUL_SAT" .or "OPTION" .or "OUTPUT" .or "PARAM" .or "POW" .or "POW_SAT" .or "RCP" .or
-    "RCP_SAT" .or "RSQ" .or "RSQ_SAT" .or "SIN" .or "SIN_SAT" .or "SCS" .or "SCS_SAT" .or "SGE" .or
-    "SGE_SAT" .or "SLT" .or "SLT_SAT" .or "SUB" .or "SUB_SAT" .or "SWZ" .or "SWZ_SAT" .or "TEMP" .or
-    "TEX" .or "TEX_SAT" .or "TXB" .or "TXB_SAT" .or "TXP" .or "TXP_SAT" .or "XPD" .or "XPD_SAT" .or
-    "fragment" .or "program" .or "result" .or "state" .or "texture";
-vp_reserved_identifier
-    "ABS" .or "ADD" .or "ADDRESS" .or "ALIAS" .or "ARL" .or "ATTRIB" .or "DP3" .or "DP4" .or
-    "DPH" .or "DST" .or "END" .or "EX2" .or "EXP" .or "FLR" .or "FRC" .or "LG2" .or "LIT" .or
-    "LOG" .or "MAD" .or "MAX" .or "MIN" .or "MOV" .or "MUL" .or "OPTION" .or "OUTPUT" .or
-    "PARAM" .or "POW" .or "RCP" .or "RSQ" .or "SGE" .or "SLT" .or "SUB" .or "SWZ" .or "TEMP" .or
-    "XPD" .or "program" .or "result" .or "state" .or "vertex";
-
-/*
-    The <integer> rule matches an integer constant.  The integer consists
-    of a sequence of one or more digits ("0" through "9").
-*/
-integer
-    integer_ne .error INTEGER_EXPECTED;
-
-zero
-    '0';
-
-leading_zeroes
-    .loop zero;
-
-no_digit
-    no_digit_1 .or .true;
-no_digit_1
-    digit10 .and .false .error INTEGER_OUT_OF_RANGE;
-
-all_zeroes
-    all_zeroes_1 .or no_digit_1;
-all_zeroes_1
-    '0' .and .loop zero .and no_digit;
-
-integer_0_3
-    integer_0_3_1 .error INTEGER_EXPECTED .and .true .emit 0x00 .emit $;
-integer_0_3_1
-    integer_0_3_2 .or all_zeroes .emit '0';
-integer_0_3_2       /* [1, 3] */
-    leading_zeroes .and '1'-'3' .emit * .and no_digit;
-
-integer_0_63
-    integer_0_63_1 .error INTEGER_EXPECTED .and .true .emit 0x00 .emit $;
-integer_0_63_1
-    integer_0_63_2 .or integer_0_63_3 .or integer_0_63_4 .or integer_0_63_5 .or
-    all_zeroes .emit '0';
-integer_0_63_2      /* [7, 9] */
-    leading_zeroes .and '7'-'9' .emit * .and no_digit;
-integer_0_63_3      /* [10, 59] */
-    leading_zeroes .and '1'-'5' .emit * .and '0'-'9' .emit * .and no_digit;
-integer_0_63_4      /* [60, 63] */
-    leading_zeroes .and '6' .emit * .and '0'-'3' .emit * .and no_digit;
-integer_0_63_5      /* [1, 6] */
-    leading_zeroes .and '1'-'6' .emit * .and no_digit;
-
-integer_0_64
-    integer_0_64_1 .error INTEGER_EXPECTED .and .true .emit 0x00 .emit $;
-integer_0_64_1
-    integer_0_64_2 .or integer_0_64_3 .or integer_0_64_4 .or integer_0_64_5 .or
-    all_zeroes .emit '0';
-integer_0_64_2      /* [7, 9] */
-    leading_zeroes .and '7'-'9' .emit * .and no_digit;
-integer_0_64_3      /* [10, 59] */
-    leading_zeroes .and '1'-'5' .emit * .and '0'-'9' .emit * .and no_digit;
-integer_0_64_4      /* [60, 64] */
-    leading_zeroes .and '6' .emit * .and '0'-'4' .emit * .and no_digit;
-integer_0_64_5      /* [1, 6] */
-    leading_zeroes .and '1'-'6' .emit * .and no_digit;
-
-optional_space
-    space .or .true;
-
-space_dst
-    space .error OPERATION_NEEDS_DESTINATION_VARIABLE;
-
-space_src
-    space .error OPERATION_NEEDS_SOURCE_VARIABLE;
-
-space
-    single_space .and .loop single_space;
-
-single_space
-    white_char .or comment_block;
-
-white_char
-    ' ' .or '\t' .or '\n' .or '\r';
-
-comment_block
-    '#' .and .loop comment_char .and new_line;
-
-/* All ASCII characters except '\r', '\n' and '\0' */
-comment_char
-    '\x0E'-'\xFF' .or '\x01'-'\x09' .or '\x0B'-'\x0C';
-
-new_line
-    '\n' .or crlf .or '\0';
-
-crlf
-    '\r' .and '\n';
-
-semicolon
-    optional_space .and ';' .error MISSING_SEMICOLON .and optional_space;
-
-comma
-    optional_space .and ',' .error MISSING_COMMA .and optional_space;
-
-comma_ne
-    optional_space .and ',' .and optional_space;
-
-lbracket
-    optional_space .and '[' .error MISSING_LBRACKET .and optional_space;
-
-lbracket_ne
-    optional_space .and '[' .and optional_space;
-
-rbracket
-    optional_space .and ']' .error MISSING_RBRACKET .and optional_space;
-
-dot
-    optional_space .and '.' .error MISSING_DOT .and optional_space;
-
-dot_ne
-    optional_space .and '.' .and optional_space;
-
-equal
-    optional_space .and '=' .error MISSING_EQUAL .and optional_space;
-
-lbrace
-    optional_space .and '{' .error MISSING_LBRACE .and optional_space;
-
-lbrace_ne
-    optional_space .and '{' .and optional_space;
-
-rbrace
-    optional_space .and '}' .error MISSING_RBRACE .and optional_space;
-
-dotdot
-    optional_space .and '.' .and '.' .error MISSING_DOTDOT .and optional_space;
-
-dotdot_ne
-    optional_space .and '.' .and '.' .and optional_space;
-
-/*
-    The definition below accepts the following floating point number formats:
-    .99 .99e99 99. 99.99 99.99e99 99.e99 99e99
-    Also 99 format was considered and accepted because of a large number of existing program
-    strings with such a format.
-*/
-float
-    float_1 .or float_2 .or float_legacy;
-float_1
-    '.' .emit 0x00 .and integer_ne .error MISSING_FRACTION_OR_EXPONENT .and optional_exponent;
-float_2
-    integer_ne .and float_3;
-float_3
-    float_4 .or float_5;
-float_4
-    '.' .and optional_integer .and optional_exponent;
-float_5
-    exponent .emit 0x00;
-float_legacy
-    integer_ne .and .true .emit 0x00 .emit 0x00;
-
-/*
-    Below is a correct version of <float> definiton.
-*/
-/*
-float
-    float_1 .or float_2;
-float_1
-    '.' .emit 0x00 .and integer_ne .error MISSING_FRACTION_OR_EXPONENT .and optional_exponent;
-float_2
-    integer_ne .and float_3 .error MISSING_DOT_OR_EXPONENT;
-float_3
-    float_4 .or float_5;
-float_4
-    '.' .and optional_integer .and optional_exponent;
-float_5
-    exponent .emit 0x00;
-*/
-
-integer_ne
-    integer_ne_1 .and .true .emit 0x00 .emit $;
-integer_ne_1
-    digit10 .emit * .and .loop digit10 .emit *;
-
-optional_integer
-    integer_ne .or .true .emit 0x00;
-
-/*
-NOTE: If exponent part is omited we treat it as if it was "E+1".
-*/
-optional_exponent
-    exponent .or .true .emit 0x00;
-
-exponent
-    exponent_1 .and optional_sign_ne .and integer_ne .error EXPONENT_VALUE_EXPECTED;
-exponent_1
-    'e' .or 'E';
-
-optional_sign_ne
-    minus_ne .or plus_ne .or .true;
-
-plus_ne
-    optional_space .and '+' .and optional_space;
-
-minus_ne
-    optional_space .and '-' .emit '-' .and optional_space;
-
-identifier_ne
-    first_idchar .emit * .and .loop follow_idchar .emit * .and .true .emit 0x00 .emit $;
-
-follow_idchar
-    first_idchar .or digit10;
-
-first_idchar
-    'a'-'z' .or 'A'-'Z' .or '_' .or '$';
-
-digit10
-    '0'-'9';
-
-/*
-    string filtering - if a string is encountered in grammar ("blabla"), the symbol below is
-    executed to create the string. The symbol must not throw any errors and emit bytes - it should
-    stop if it encounters invalid character. After this the resulting string (from starting
-    position up to the invalid character (but without it) is compared with the grammar string.
-*/
-.string __string_filter;
-
-__string_filter
-    .loop __identifier_char;
-
-__identifier_char
-    'a'-'z' .or 'A'-'Z' .or '_' .or '$' .or '0'-'9';
-
-/*
-    error token filtering
-*/
-e_signature
-    e_signature_char .and .loop e_signature_char;
-e_signature_char
-    '!' .or '.' .or 'A'-'Z' .or 'a'-'z' .or '0'-'9';
-
-e_statement
-    .loop e_statement_not_term;
-/* All ASCII characters to one of '\r', '\n', '\0' and ';' */
-e_statement_not_term
-    '\x3C'-'\xFF' .or '\x0E'-'\x3A' .or '\x01'-'\x09' .or '\x0B'-'\x0C';
-
-e_identifier
-    e_identifier_first .and .loop e_identifier_next;
-e_identifier_first
-    'a'-'z' .or 'A'-'Z' .or '_' .or '$';
-e_identifier_next
-    e_identifier_first .or '0'-'9';
-
-e_token
-    e_identifier .or e_token_number .or '[' .or ']' .or '.' .or '{' .or '}' .or '=' .or '+' .or
-    '-' .or ',' .or ';';
-e_token_number
-    e_token_digit .and .loop e_token_digit;
-e_token_digit
-    '0'-'9';
-
-e_charordigit
-    'A'-'Z' .or 'a'-'z' .or '0'-'9';
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/asmopcodes.reg b/nx-X11/extras/Mesa/src/mesa/shader/asmopcodes.reg
deleted file mode 100644
index efd8918f2..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/asmopcodes.reg
+++ /dev/null
@@ -1,78 +0,0 @@
-/* */
-/* ARB program opcode registry */
-/* each instruction code has its own unique number */
-/* this registry exists to ensure that this relation retains */
-/* */
-
-/* GL_ARB_vertex_program */
-ABS         0x00
-ADD         0x01
-ARL         0x02
-DP3         0x03
-DP4         0x04
-DPH         0x05
-DST         0x06
-EX2         0x07
-EXP         0x08
-FLR         0x09
-FRC         0x0A
-LG2         0x0B
-LIT         0x0C
-LOG         0x0D
-MAD         0x0E
-MAX         0x0F
-MIN         0x10
-MOV         0x11
-MUL         0x12
-POW         0x13
-RCP         0x14
-RSQ         0x15
-SGE         0x16
-SLT         0x17
-SUB         0x18
-SWZ         0x19
-XPD         0x1A
-
-/* GL_ARB_fragment_program */
-ABS_SAT     0x1B
-ADD_SAT     0x1C
-CMP         0x1D
-CMP_SAT     0x1E
-COS         0x1F
-COS_SAT     0x20
-DP3_SAT     0x21
-DP4_SAT     0x22
-DPH_SAT     0x23
-DST_SAT     0x24
-EX2_SAT     0x25
-FLR_SAT     0x26
-FRC_SAT     0x27
-KIL         0x28
-LG2_SAT     0x29
-LIT_SAT     0x2A
-LRP         0x2B
-LRP_SAT     0x2C
-MAD_SAT     0x2D
-MAX_SAT     0x2E
-MIN_SAT     0x2F
-MOV_SAT     0x30
-MUL_SAT     0x31
-POW_SAT     0x32
-RCP_SAT     0x33
-RSQ_SAT     0x34
-SCS         0x35
-SCS_SAT     0x36
-SGE_SAT     0x37
-SIN         0x38
-SIN_SAT     0x39
-SLT_SAT     0x3A
-SUB_SAT     0x3B
-SWZ_SAT     0x3C
-TEX         0x3D
-TEX_SAT     0x3E
-TXB         0x3F
-TXB_SAT     0x40
-TXP         0x41
-TXP_SAT     0x42
-XPD_SAT     0x43
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/descrip.mms b/nx-X11/extras/Mesa/src/mesa/shader/descrip.mms
deleted file mode 100644
index e52479c9a..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/descrip.mms
+++ /dev/null
@@ -1,83 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 1 June 2005
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define swrast [-.swrast]
-	define array_cache [-.array_cache]
-
-.include [---]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[.grammar],[-.main],[-.glapi],[.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
-
-SOURCES = \
-	atifragshader.c \
-	arbfragparse.c \
-	arbprogparse.c \
-	arbprogram.c \
-	arbvertparse.c \
-	nvfragparse.c \
-	nvprogram.c \
-	nvvertexec.c \
-	nvvertparse.c \
-	program.c \
-	shaderobjects.c \
-	shaderobjects_3dlabs.c
-
-OBJECTS = \
-	atifragshader.obj,\
-	arbfragparse.obj,\
-	arbprogparse.obj,\
-	arbprogram.obj,\
-	arbvertparse.obj,\
-	nvfragparse.obj,\
-	nvprogram.obj,\
-	nvvertexec.obj,\
-	nvvertparse.obj,\
-	program.obj,\
-	shaderobjects.obj,\
-	shaderobjects_3dlabs.obj
-
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all : 
-	$(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
-	set def [.slang]
-	$(MMS)$(MMSQUALIFIERS)
-	set def [-.grammar]
-	$(MMS)$(MMSQUALIFIERS)
-	set def [-]
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-atifragshader.obj : atifragshader.c
-arbfragparse.obj : arbfragparse.c
-arbprogparse.obj : arbprogparse.c
-arbprogram.obj : arbprogram.c
-arbvertparse.obj : arbvertparse.c
-nvfragparse.obj : nvfragparse.c
-nvprogram.obj : nvprogram.c
-nvvertexec.obj : nvvertexec.c
-nvvertparse.obj : nvvertparse.c
-program.obj : program.c
-shaderobjects.obj : shaderobjects.c
-	cc$(CFLAGS)/nowarn shaderobjects.c
-shaderobjects_3dlabs.obj : shaderobjects_3dlabs.c
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/grammar/descrip.mms b/nx-X11/extras/Mesa/src/mesa/shader/grammar/descrip.mms
deleted file mode 100644
index b6736af15..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/grammar/descrip.mms
+++ /dev/null
@@ -1,41 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 1 June 2005
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define swrast [--.swrast]
-	define array_cache [--.array_cache]
-
-.include [----]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[],[--.main],[--.glapi],[-.slang]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
-
-SOURCES = grammar_mesa.c
-
-OBJECTS = grammar_mesa.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all : 
-	$(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-grammar_mesa.obj : grammar_mesa.c grammar.c
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.syn b/nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.syn
deleted file mode 100644
index 5d99f65bf..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.syn
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.2
- *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
- 
- /**
- * \file grammar.syn
- * syntax of .syn script - used to validate other syntax files
- * \author Michal Krol
- */
- 
-.syntax grammar;
-
-/* declaration */
-.emtcode DECLARATION_END                            0
-.emtcode DECLARATION_EMITCODE                       1
-.emtcode DECLARATION_ERRORTEXT                      2
-.emtcode DECLARATION_REGBYTE                        3
-.emtcode DECLARATION_LEXER                          4
-.emtcode DECLARATION_RULE                           5
-
-/* specifier */
-.emtcode SPECIFIER_END                              0
-.emtcode SPECIFIER_AND_TAG                          1
-.emtcode SPECIFIER_OR_TAG                           2
-.emtcode SPECIFIER_CHARACTER_RANGE                  3
-.emtcode SPECIFIER_CHARACTER                        4
-.emtcode SPECIFIER_STRING                           5
-.emtcode SPECIFIER_IDENTIFIER                       6
-.emtcode SPECIFIER_TRUE                             7
-.emtcode SPECIFIER_FALSE                            8
-.emtcode SPECIFIER_DEBUG                            9
-
-/* identifier */
-.emtcode IDENTIFIER_SIMPLE                          0
-.emtcode IDENTIFIER_LOOP                            1
-
-/* error */
-.emtcode ERROR_NOT_PRESENT                          0
-.emtcode ERROR_PRESENT                              1
-
-/* emit */
-.emtcode EMIT_NULL                                  0
-.emtcode EMIT_INTEGER                               1
-.emtcode EMIT_IDENTIFIER                            2
-.emtcode EMIT_CHARACTER                             3
-.emtcode EMIT_LAST_CHARACTER                        4
-.emtcode EMIT_CURRENT_POSITION                      5
-
-.errtext INVALID_GRAMMAR                            "internal error 2001: invalid grammar script"
-.errtext SYNTAX_EXPECTED                            "internal error 2002: '.syntax' keyword expected"
-.errtext IDENTIFIER_EXPECTED                        "internal error 2003: identifier expected"
-.errtext MISSING_SEMICOLON                          "internal error 2004: missing ';'"
-.errtext INTEGER_EXPECTED                           "internal error 2005: integer value expected"
-.errtext STRING_EXPECTED                            "internal error 2006: string expected"
-
-/*
-    <grammar>                           ::= ".syntax" <identifier> ";" <declaration_list>
-*/
-grammar
-    grammar_1 .error INVALID_GRAMMAR;
-grammar_1
-    optional_space .and ".syntax" .error SYNTAX_EXPECTED .and space .and identifier .and
-    semicolon .and declaration_list .and optional_space .and '\0' .emit DECLARATION_END;
-
-/*
-    <optional_space>                    ::= <space>
-                                          | ""
-*/
-optional_space
-    space .or .true;
-
-/*
-    <space>                             ::= <single_space> <single_space>*
-*/
-space
-    single_space .and .loop single_space;
-
-/*
-    <single_space>                      ::= <white_char>
-                                          | <comment_block>
-*/
-single_space
-    white_char .or comment_block;
-
-/*
-    <white_char>                        ::= " " 
-                                          | "\t"
-                                          | "\n"
-                                          | "\r"
-*/
-white_char
-    ' ' .or '\t' .or '\n' .or '\r';
-
-/*
-    <comment_block>                     ::= "/" "*" <comment_rest>
-*/
-comment_block
-    '/' .and '*' .and comment_rest;
-
-/*
-    <comment_rest>                      ::= <comment_char_no_star>* <comment_end>
-                                          | <comment_char_no_star>* "*" <comment_rest>
-*/
-comment_rest
-    .loop comment_char_no_star .and comment_rest_1;
-comment_rest_1
-    comment_end .or comment_rest_2;
-comment_rest_2
-    '*' .and comment_rest;
-
-/*
-    <comment_char_no_star>              ::= All ASCII characters except "*" and "\0"
-*/
-comment_char_no_star
-    '\x2B'-'\xFF' .or '\x01'-'\x29';
-
-/*
-    <comment_end>                       ::= "*" "/"
-*/
-comment_end
-    '*' .and '/';
-
-/*
-    <identifier>                        ::= <identifier>
-*/
-identifier
-    identifier_ne .error IDENTIFIER_EXPECTED;
-
-/*
-    <identifier_ne>                     ::= <first_idchar> <follow_idchar>*
-*/
-identifier_ne
-    first_idchar .emit * .and .loop follow_idchar .emit * .and .true .emit '\0';
-
-/*
-    <first_idchar>                      ::= "a"-"z"
-                                          | "A"-"Z"
-                                          | "_"
-*/
-first_idchar
-    'a'-'z' .or 'A'-'Z' .or '_';
-
-/*
-    <follow_idchar>                     ::= <first_idchar>
-                                          | <digit_dec>
-*/
-follow_idchar
-    first_idchar .or digit_dec;
-
-/*
-    <digit_dec>                         ::= "0"-"9"
-*/
-digit_dec
-    '0'-'9';
-
-/*
-    <semicolon>                         ::= ";"
-*/
-semicolon
-    optional_space .and ';' .error MISSING_SEMICOLON .and optional_space;
-
-/*
-    <declaration_list>                  ::= <declaration>
-                                          | <declaration_list> <declaration>
-*/
-declaration_list
-    declaration .and .loop declaration;
-
-/*
-    <declaration>                       ::= <emitcode_definition>
-                                          | <errortext_definition>
-                                          | <lexer_definition>
-                                          | <rule_definition>
-*/
-declaration
-    emitcode_definition .emit DECLARATION_EMITCODE .or
-    errortext_definition .emit DECLARATION_ERRORTEXT .or
-    regbyte_definition .emit DECLARATION_REGBYTE .or
-    lexer_definition .emit DECLARATION_LEXER .or
-    rule_definition .emit DECLARATION_RULE;
-
-/*
-    <emitcode_definition>               ::= ".emtcode" <identifier> <integer>
-*/
-emitcode_definition
-    ".emtcode" .and space .and identifier .and space .and integer .and space_or_null;
-
-/*
-    <integer>                           ::= <integer_ne>
-*/
-integer
-    integer_ne .error INTEGER_EXPECTED;
-
-/*
-    <integer_ne>                        ::= <hex_integer>
-                                          | <dec_integer>
-*/
-integer_ne
-    hex_integer .emit 0x10 .or dec_integer .emit 10;
-
-/*
-    <hex_integer>                       :: <hex_prefix> <digit_hex> <digit_hex>*
-*/
-hex_integer
-    hex_prefix .and digit_hex .emit * .and .loop digit_hex .emit * .and .true .emit '\0';
-
-/*
-    <hex_prefix>                        ::= "0x"
-                                          | "0X"
-*/
-hex_prefix
-    '0' .and hex_prefix_1;
-hex_prefix_1
-    'x' .or 'X';
-
-/*
-    <digit_hex>                         ::= "0"-"9"
-                                          | "a"-"f"
-                                          | "A"-"F"
-*/
-digit_hex
-    '0'-'9' .or 'a'-'f' .or 'A'-'F';
-
-/*
-    <dec_integer>                       :: <digit_dec> <digit_dec>*
-*/
-dec_integer
-    digit_dec .emit * .and .loop digit_dec .emit * .and .true .emit '\0';
-
-/*
-    <space_or_null>                     ::= <space>
-                                          | "\0"
-*/
-space_or_null
-    space .or '\0';
-
-/*
-    <errortext_definition>              ::= ".errtext" <identifier> <string>
-*/
-errortext_definition
-    ".errtext" .and space .and identifier .and space .and string .and space_or_null;
-
-/*
-    <string>                            ::= <string_ne>
-*/
-string
-    string_ne .error STRING_EXPECTED;
-
-/*
-    <string_ne>                         ::= "\"" <string_char_double_quotes> "\""
-*/
-string_ne
-    '"' .and .loop string_char_double_quotes .and '"' .emit '\0';
-
-/*
-    <string_char_double_quotes>         ::= <escape_sequence>
-                                          | <string_char>
-                                          | "\'"
-*/
-string_char_double_quotes
-    escape_sequence .or string_char .emit * .or '\'' .emit *;
-
-/*
-    <string_char>                       ::= All ASCII characters except "\'", "\"", "\n", "\r",
-                                            "\0" and "\\"
-*/
-string_char
-    '\x5D'-'\xFF' .or '\x28'-'\x5B' .or '\x23'-'\x26' .or '\x0E'-'\x21' .or '\x0B'-'\x0C' .or
-    '\x01'-'\x09';
-
-/*
-    <escape_sequence>                   ::= "\\" <escape_code>
-*/
-escape_sequence
-    '\\' .emit * .and escape_code;
-
-/*
-    <escape_code>                       ::= <simple_escape_code>
-                                          | <hex_escape_code>
-                                          | <oct_escape_code>
-*/
-escape_code
-    simple_escape_code .emit * .or hex_escape_code .or oct_escape_code;
-
-/*
-    <simple_escape_code>                ::= "\'"
-                                          | "\""
-                                          | "?"
-                                          | "\\"
-                                          | "a"
-                                          | "b"
-                                          | "f"
-                                          | "n"
-                                          | "r"
-                                          | "t"
-                                          | "v"
-*/
-simple_escape_code
-    '\'' .or '"' .or '?' .or '\\' .or 'a' .or 'b' .or 'f' .or 'n' .or 'r' .or 't' .or 'v';
-
-/*
-    <hex_escape_code>                   ::= "x" <digit_hex> <digit_hex>*
-*/
-hex_escape_code
-    'x' .emit * .and digit_hex .emit * .and .loop digit_hex .emit *;
-
-/*
-    <oct_escape_code>                   ::= <digit_oct> <optional_digit_oct> <optional_digit_oct>
-*/
-oct_escape_code
-    digit_oct .emit * .and optional_digit_oct .and optional_digit_oct;
-
-/*
-    <digit_oct>                         ::= "0"-"7"
-*/
-digit_oct
-    '0'-'7';
-
-/*
-    <optional_digit_oct>                ::= <digit_oct>
-                                          | ""
-*/
-optional_digit_oct
-    digit_oct .emit * .or .true;
-
-/*
-    <regbyte_definition>                ::= ".regbyte" <identifier> <integer>
-*/
-regbyte_definition
-    ".regbyte" .and space .and identifier .and space .and integer .and space_or_null;
-
-/*
-    <lexer_definition>                  ::= ".string" <identifier> ";"
-*/
-lexer_definition
-    ".string" .and space .and identifier .and semicolon;
-
-/*
-    <rule_definition>                   ::= <identifier_ne> <definition>
-*/
-rule_definition
-    identifier_ne .and space .and definition;
-
-/*
-    <definition>                        ::= <specifier> <optional_specifiers_and_or> ";"
-*/
-definition
-    specifier .and optional_specifiers_and_or .and semicolon .emit SPECIFIER_END;
-
-/*
-    <optional_specifiers_and_or>        ::= <and_specifiers>
-                                          | <or_specifiers>
-                                          | ""
-*/
-optional_specifiers_and_or
-    and_specifiers .emit SPECIFIER_AND_TAG .or or_specifiers .emit SPECIFIER_OR_TAG .or .true;
-
-/*
-    <specifier>                         ::= <specifier_condition> <specifier_rule>
-*/
-specifier
-    specifier_condition .and optional_space .and specifier_rule;
-
-/*
-    <specifier_condition>               ::= ".if" "(" <left_operand> <operator> <right_operand> ")"
-*/
-specifier_condition
-    specifier_condition_1 .or .true;
-specifier_condition_1
-    ".if" .and optional_space .and '(' .and optional_space .and left_operand .and operator .and
-    right_operand .and optional_space .and ')';
-
-/*
-    <left_operand>                      ::= <identifier>
-*/
-left_operand
-    identifier;
-
-/*
-    <operator>                          ::= "!="
-                                          | "=="
-*/
-operator
-    operator_1 .or operator_2;
-operator_1
-    optional_space .and '!' .and '=' .and optional_space;
-operator_2
-    optional_space .and '=' .and '=' .and optional_space;
-
-/*
-    <right_operand>                     ::= <integer>
-*/
-right_operand
-    integer;
-
-/*
-    <specifier_rule>                    ::= <character_range> <optional_error> <emit>*
-                                          | <character> <optional_error> <emit>*
-                                          | <string> <optional_error> <emit>*
-                                          | ".true" <optional_error> <emit>*
-                                          | ".false" <optional_error> <emit>*
-                                          | ".debug" <optional_error> <emit>*
-                                          | <advanced_identifier> <optional_error> <emit>*
-*/
-specifier_rule
-    specifier_rule_1 .and optional_error .and .loop emit .and .true .emit EMIT_NULL;
-specifier_rule_1
-    character_range .emit SPECIFIER_CHARACTER_RANGE .or
-    character .emit SPECIFIER_CHARACTER .or
-    string_ne .emit SPECIFIER_STRING .or
-    ".true" .emit SPECIFIER_TRUE .or
-    ".false" .emit SPECIFIER_FALSE .or
-    ".debug" .emit SPECIFIER_DEBUG .or
-    advanced_identifier .emit SPECIFIER_IDENTIFIER;
-
-/*
-    <character>                         ::= "\'" <string_char_single_quotes "\'"
-*/
-character
-    '\'' .and string_char_single_quotes .and '\'' .emit '\0';
-
-/*
-    <string_char_single_quotes>         ::= <escape_sequence>
-                                          | <string_char>
-                                          | "\""
-*/
-string_char_single_quotes
-    escape_sequence .or string_char .emit * .or '"' .emit *;
-
-/*
-    <character_range>                   ::= <character> "-" <character>
-*/
-character_range
-    character .and optional_space .and '-' .and optional_space .and character;
-
-/*
-    <advanced_identifier>               ::= <optional_loop> <identifier>
-*/
-advanced_identifier
-    optional_loop .and identifier;
-
-/*
-    <optional_loop>                     ::= ".loop"
-                                          | ""
-*/
-optional_loop
-    optional_loop_1 .emit IDENTIFIER_LOOP .or .true .emit IDENTIFIER_SIMPLE;
-optional_loop_1
-    ".loop" .and space;
-
-/*
-    <optional_error>                    ::= <error>
-                                          | ""
-*/
-optional_error
-    error .emit ERROR_PRESENT .or .true .emit ERROR_NOT_PRESENT;
-
-/*
-    <error>                             :: ".error" <identifier>
-*/
-error
-    space .and ".error" .and space .and identifier;
-
-/*
-    <emit>                              ::= <emit_output>
-                                          | <emit_regbyte>
-*/
-emit
-    emit_output .or emit_regbyte;
-
-/*
-    <emit_output>                       ::= ".emit" <emit_param>
-*/
-emit_output
-    space .and ".emit" .and space .and emit_param;
-
-/*
-    <emit_param>                        ::= <integer>
-                                          | <identifier>
-                                          | <character>
-                                          | "*"
-                                          | "$"
-*/
-emit_param
-    integer_ne .emit EMIT_INTEGER .or
-    identifier_ne .emit EMIT_IDENTIFIER .or
-    character .emit EMIT_CHARACTER .or
-    '*' .emit EMIT_LAST_CHARACTER .or
-    '$' .emit EMIT_CURRENT_POSITION;
-
-/*
-    <emit_regbyte>                      ::= ".load" <identifier> <emit_param>
-*/
-emit_regbyte
-    space .and ".load" .and space .and identifier .and space .and emit_param;
-
-/*
-    <and_specifiers>                    ::= <and_specifier> <and_specifier>*
-*/
-and_specifiers
-    and_specifier .and .loop and_specifier;
-
-/*
-    <or_specifiers>                     ::= <or_specifier> <or_specifier>*
-*/
-or_specifiers
-    or_specifier .and .loop or_specifier;
-
-/*
-    <and_specifier>                     ::= ".and" <specifier>
-*/
-and_specifier
-    space .and ".and" .and space .and specifier;
-
-/*
-    <or_specifier>                      ::= ".or" <specifier>
-*/
-or_specifier
-    space .and ".or" .and space .and specifier;
-
-
-.string __string_filter;
-
-/*
-    <__string_filter>                   ::= <__first_identifier_char> <__next_identifier_char>*
-*/
-__string_filter
-    __first_identifier_char .and .loop __next_identifier_char;
-
-/*
-    <__first_identifier_char>           ::= "a"-"z"
-                                          | "A"-"Z"
-                                          | "_"
-                                          | "."
-*/
-__first_identifier_char
-    'a'-'z' .or 'A'-'Z' .or '_' .or '.';
-
-/*
-    <__next_identifier_char>            ::= "a"-"z"
-                                          | "A"-"Z"
-                                          | "_"
-                                          | "0"-"9"
-*/
-__next_identifier_char
-    'a'-'z' .or 'A'-'Z' .or '_' .or '0'-'9';
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.c b/nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.c
deleted file mode 100755
index 8db87358c..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "grammar_crt.h"
-
-#define GRAMMAR_PORT_BUILD 1
-#include "grammar.c"
-#undef GRAMMAR_PORT_BUILD
-
-
-void grammar_alloc_free (void *ptr)
-{
-    free (ptr);
-}
-
-void *grammar_alloc_malloc (unsigned int size)
-{
-    return malloc (size);
-}
-
-void *grammar_alloc_realloc (void *ptr, unsigned int old_size, unsigned int size)
-{
-    return realloc (ptr, size);
-}
-
-void *grammar_memory_copy (void *dst, const void * src, unsigned int size)
-{
-    return memcpy (dst, src, size);
-}
-
-int grammar_string_compare (const byte *str1, const byte *str2)
-{
-    return strcmp ((const char *) str1, (const char *) str2);
-}
-
-int grammar_string_compare_n (const byte *str1, const byte *str2, unsigned int n)
-{
-    return strncmp ((const char *) str1, (const char *) str2, n);
-}
-
-byte *grammar_string_copy (byte *dst, const byte *src)
-{
-    return (byte *) strcpy ((char *) dst, (const char *) src);
-}
-
-byte *grammar_string_copy_n (byte *dst, const byte *src, unsigned int n)
-{
-    return (byte *) strncpy ((char *) dst, (const char *) src, n);
-}
-
-unsigned int grammar_string_length (const byte *str)
-{
-    return strlen ((const char *) str);
-}
-
-byte *grammar_string_duplicate (const byte *src)
-{
-    const unsigned int size = grammar_string_length (src);
-    byte *str = grammar_alloc_malloc (size + 1);
-    if (str != NULL)
-    {
-        grammar_memory_copy (str, src, size);
-        str[size] = '\0';
-    }
-    return str;
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.h b/nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.h
deleted file mode 100755
index f0827ce96..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef GRAMMAR_CRT_H
-#define GRAMMAR_CRT_H
-
-
-#include <stdlib.h>
-#include <malloc.h>
-#include <string.h>
-
-
-typedef unsigned long grammar;
-typedef unsigned char byte;
-
-
-#define GRAMMAR_PORT_INCLUDE 1
-#include "grammar.h"
-#undef GRAMMAR_PORT_INCLUDE
-
-
-#endif
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/BaseTypes.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/BaseTypes.h
deleted file mode 100755
index c5bf8de17..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/BaseTypes.h
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _BASICTYPES_INCLUDED_
-#define _BASICTYPES_INCLUDED_
-
-//
-// Basic type.  Arrays, vectors, etc., are orthogonal to this.
-//
-enum TBasicType {
-    EbtVoid,
-    EbtFloat,
-    EbtInt,
-    EbtBool,
-    EbtSampler1D,
-    EbtSampler2D,
-    EbtSampler3D,
-    EbtSamplerCube,
-    EbtSampler1DShadow,
-    EbtSampler2DShadow,
-    EbtStruct,
-    EbtAddress
-};
-
-__inline bool IsSampler(TBasicType type)
-{   
-    return type >= EbtSampler1D && type <= EbtSampler2DShadow;
-}
-
-//
-// Qualifiers and built-ins.  These are mainly used to see what can be read
-// or written, and by the machine dependent translator to know which registers
-// to allocate variables in.  Since built-ins tend to go to different registers
-// than varying or uniform, it makes sense they are peers, not sub-classes.
-//
-enum TQualifier {
-    EvqTemporary,     // For temporaries (within a function), read/write
-    EvqGlobal,        // For globals read/write
-    EvqConst,         // User defined constants and non-output parameters in functions
-    EvqAttribute,     // Readonly 
-    EvqVaryingIn,     // readonly, fragment shaders only
-    EvqVaryingOut,    // vertex shaders only  read/write
-    EvqUniform,       // Readonly, vertex and fragment
-
-    // pack/unpack input and output
-    EvqInput,
-    EvqOutput,
-
-    // parameters
-    EvqIn,
-    EvqOut,
-    EvqInOut,
-    EvqConstReadOnly,
-
-    // built-ins written by vertex shader
-    EvqPosition,
-    EvqPointSize,
-    EvqClipVertex,
-
-    // built-ins read by fragment shader
-    EvqFace,
-    EvqFragCoord,
-
-    // built-ins written by fragment shader
-    EvqFragColor,
-    EvqFragDepth,
-
-    // end of list
-    EvqLast
-};
-
-//
-// This is just for debug print out, carried along with the definitions above.
-//
-__inline const char* getQualifierString(TQualifier q) 
-{
-    switch (q) {
-    case EvqTemporary:      return "Temporary";      break;
-    case EvqGlobal:         return "Global";         break;
-    case EvqConst:          return "const";          break;
-    case EvqConstReadOnly:  return "const";          break;
-    case EvqAttribute:      return "attribute";      break;
-    case EvqVaryingIn:      return "varying";        break;
-    case EvqVaryingOut:     return "varying";        break;
-    case EvqUniform:        return "uniform";        break;
-    case EvqIn:             return "in";             break;
-    case EvqOut:            return "out";            break;
-    case EvqInOut:          return "inout";          break;
-    case EvqInput:          return "input";          break;
-    case EvqOutput:         return "output";         break;
-    case EvqPosition:       return "Position";       break;
-    case EvqPointSize:      return "PointSize";      break;
-    case EvqClipVertex:     return "ClipVertex";     break;
-    case EvqFace:           return "Face";           break;
-    case EvqFragCoord:      return "FragCoord";      break;
-    case EvqFragColor:      return "FragColor";      break;
-    case EvqFragDepth:      return "FragDepth";      break;
-    default:                return "unknown qualifier";
-    }
-}
-
-#endif // _BASICTYPES_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Common.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Common.h
deleted file mode 100755
index 4a9c0d34a..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Common.h
+++ /dev/null
@@ -1,288 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _COMMON_INCLUDED_
-#define _COMMON_INCLUDED_
-
-#ifdef _WIN32
-    #include <basetsd.h>
-#elif defined (solaris)
-    #include <sys/int_types.h>
-    #define UINT_PTR uintptr_t
-#else
-    #include <stdint.h>
-    #define UINT_PTR uintptr_t
-#endif
-
-/* windows only pragma */
-#ifdef _MSC_VER
-    #pragma warning(disable : 4786) // Don't warn about too long identifiers
-    #pragma warning(disable : 4514) // unused inline method
-    #pragma warning(disable : 4201) // nameless union
-#endif
-
-//
-// Doing the push and pop below for warnings does not leave the warning state
-// the way it was.  This seems like a defect in the compiler.  We would like
-// to do this, but since it does not work correctly right now, it is turned
-// off.
-//
-//??#pragma warning(push, 3)
-
-	#include <set>
-    #include <vector>
-    #include <map>
-    #include <list>
-    #include <string>
-    #include <stdio.h>
-
-//??#pragma warning(pop)
-
-typedef int TSourceLoc;
-
-#include <assert.h>
-#include "PoolAlloc.h"
-
-//
-// Put POOL_ALLOCATOR_NEW_DELETE in base classes to make them use this scheme.
-//
-#define POOL_ALLOCATOR_NEW_DELETE(A)                                  \
-    void* operator new(size_t s) { return (A).allocate(s); }          \
-    void* operator new(size_t, void *_Where) { return (_Where);	}     \
-    void operator delete(void*) { }                                   \
-    void operator delete(void *, void *) { }                          \
-    void* operator new[](size_t s) { return (A).allocate(s); }        \
-    void* operator new[](size_t, void *_Where) { return (_Where);	} \
-    void operator delete[](void*) { }                                 \
-    void operator delete[](void *, void *) { }
-
-#ifdef _M_AMD64
-//
-// The current version of STL that comes with the PSDK (as required for the AMD64 compiler)
-// has a very old version of the STL which is very out of date.  As a result, various additions needed
-// making to it to get the compilers compiling!
-//
-
-//
-// A new version of the Map template class - the operator[] now returns the correct type reference
-//
-template <class _K, class _Ty, class _Pr = std::less<_K>, class _A = std::allocator<_Ty> >
-class TBaseMap : public std::map <_K, _Ty, _Pr, _A >
-{
-public :
-	_Ty& operator[] (const _K& _Kv)
-	{
-		iterator _P = insert(value_type(_Kv, _Ty())).first;
-		return ((*_P).second); 
-	}
-	
-	explicit TBaseMap(const _Pr& _Pred = _Pr(), const _A& _Al = _A())
-		: std::map<_K, _Ty, _Pr, _A >(_Pred, _Al) {};
-
-
-};
-
-//
-// A new version of the List template class - the begin function now checks for NULL to eliminate access violations
-//
-template <class _Ty, class _A = std::allocator<_Ty> >
-class TBaseList : public std::list <_Ty, _A >
-{
-public :
-	iterator begin()
-	{
-		return (iterator(_Head == 0 ? 0 : _Acc::_Next(_Head))); 
-	}
-	
-	const_iterator begin() const
-	{
-		return (const_iterator(_Head == 0 ? 0 : _Acc::_Next(_Head))); 
-	}
-	
-	// 
-	// These are required - apparently!
-	//
-	explicit TBaseList(const _A& _Al = _A()) 
-		: std::list<_Ty, _A >(_Al) {};
-	explicit TBaseList(size_type _N, const _Ty& _V = _Ty(),	const _A& _Al = _A())
-		: std::list<_Ty, _A >(N, _V, _Al) {};
-
-};
-
-//
-// A new version of the set class - this defines the required insert method
-//
-template<class _K, class _Pr = std::less<_K>, class _A = std::allocator<_K> >
-class TBaseSet : public std::set <_K, _Pr, _A>
-{
-public :
-
-	//
-	// This method wasn't defined
-	//
-	template<class _Iter>
-	void insert(_Iter _First, _Iter _Last)
-	{	// insert [_First, _Last)
-		for (; _First != _Last; ++_First)
-			this->insert(*_First);
-	}
-	
-	// 
-	// These methods were not resolved if I declared the previous method??
-	//
-	_Pairib insert(const value_type& _X)
-	{
-		_Imp::_Pairib _Ans = _Tr.insert(_X);
-		return (_Pairib(_Ans.first, _Ans.second)); 
-	}
-	
-	iterator insert(iterator _P, const value_type& _X)
-	{
-		return (_Tr.insert((_Imp::iterator&)_P, _X)); 
-	}
-	
-	void insert(_It _F, _It _L)
-	{
-		for (; _F != _L; ++_F)
-			_Tr.insert(*_F); 
-	}
-
-};
-
-#else
-
-#define TBaseMap std::map
-#define TBaseList std::list
-#define TBaseSet std::set
-
-#endif //_M_AMD64
-
-//
-// Pool version of string.
-//
-typedef pool_allocator<char> TStringAllocator;
-typedef std::basic_string <char, std::char_traits<char>, TStringAllocator > TString;
-inline TString* NewPoolTString(const char* s)
-{
-	void* memory = GlobalPoolAllocator.allocate(sizeof(TString));
-	return new(memory) TString(s);
-}
-
-//
-// Pool allocator versions of vectors, lists, and maps
-//
-template <class T> class TVector : public std::vector<T, pool_allocator<T> > {
-public:
-    typedef typename std::vector<T, pool_allocator<T> >::size_type size_type;
-    TVector() : std::vector<T, pool_allocator<T> >() {}
-    TVector(const pool_allocator<T>& a) : std::vector<T, pool_allocator<T> >(a) {}
-    TVector(size_type i): std::vector<T, pool_allocator<T> >(i) {}
-};
-
-template <class T> class TList   : public TBaseList  <T, pool_allocator<T> > {
-public:
-    typedef typename TBaseList<T, pool_allocator<T> >::size_type size_type;
-    TList() : TBaseList<T, pool_allocator<T> >() {}
-    TList(const pool_allocator<T>& a) : TBaseList<T, pool_allocator<T> >(a) {}
-    TList(size_type i): TBaseList<T, pool_allocator<T> >(i) {}
-};
-
-// This is called TStlSet, because TSet is taken by an existing compiler class.
-template <class T, class CMP> class TStlSet : public std::set<T, CMP, pool_allocator<T> > {
-    // No pool allocator versions of constructors in std::set.
-};
-
-
-template <class K, class D, class CMP = std::less<K> > class TMap :
-    public TBaseMap<K, D, CMP, pool_allocator<std::pair<K, D> > > {
-public:
-    typedef pool_allocator<std::pair <K, D> > tAllocator;
-
-    TMap() : TBaseMap<K, D, CMP, tAllocator >() {}
-/*
-    TMap(const tAllocator& a) : TBaseMap<K, D, CMP, tAllocator >(key_compare(), a) {}
-*/
-    TMap(const tAllocator& a) : TBaseMap<K, D, CMP, tAllocator >() {}
-};
-
-//
-// Persistent string memory.  Should only be used for strings that survive
-// across compiles/links.
-//
-typedef std::basic_string<char> TPersistString;
-
-//
-// templatized min and max functions.
-//
-template <class T> T Min(const T a, const T b) { return a < b ? a : b; }
-template <class T> T Max(const T a, const T b) { return a > b ? a : b; }
-
-//
-// Create a TString object from an integer.
-//
-inline const TString String(const int i, const int base = 10)
-{
-    char text[16];     // 32 bit ints are at most 10 digits in base 10
-    
-    #ifdef _WIN32
-        itoa(i, text, base);
-    #else
-        // we assume base 10 for all cases
-        sprintf(text, "%d", i);
-    #endif
-
-    return text;
-}
-
-const unsigned int SourceLocLineMask = 0xffff;
-const unsigned int SourceLocStringShift = 16;
-
-__inline TPersistString FormatSourceLoc(const TSourceLoc loc)
-{
-    char locText[64];
-
-    int string = loc >> SourceLocStringShift;
-    int line = loc & SourceLocLineMask;
-
-    if (line)
-        sprintf(locText, "%d:%d", string, line);
-    else
-        sprintf(locText, "%d:? ", string);
-
-    return TPersistString(locText);
-}
-typedef TMap<TString, TString> TPragmaTable;
-typedef TMap<TString, TString>::tAllocator TPragmaTableAllocator;
-
-#endif // _COMMON_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ConstantUnion.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ConstantUnion.h
deleted file mode 100755
index a60ae114f..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ConstantUnion.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _CONSTANT_UNION_INCLUDED_
-#define _CONSTANT_UNION_INCLUDED_
-
-
-class constUnion {
-public:
-
-    POOL_ALLOCATOR_NEW_DELETE(GlobalPoolAllocator)        
-    union  {
-        int iConst;  // used for ivec
-        bool bConst; // used for bvec
-        float fConst;   // used for vec, mat
-    } ;
-};
-
-#endif // _CONSTANT_UNION_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h
deleted file mode 100755
index 14d44a34a..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _INFOSINK_INCLUDED_
-#define _INFOSINK_INCLUDED_
-
-#include "../Include/Common.h"
-#include <math.h>
-
-//
-// TPrefixType is used to centralize how info log messages start.
-// See below.
-//
-enum TPrefixType {
-    EPrefixNone,
-    EPrefixWarning,
-    EPrefixError,
-    EPrefixInternalError,
-    EPrefixUnimplemented
-};
-
-enum TOutputStream {
-    ENull = 0,
-    EDebugger = 0x01,
-    EStdOut = 0x02,
-    EString = 0x04
-};
-//
-// Encapsulate info logs for all objects that have them.
-//
-// The methods are a general set of tools for getting a variety of
-// messages and types inserted into the log.
-//
-class TInfoSinkBase {
-public:
-    TInfoSinkBase() : outputStream(4) {}
-    void erase() { sink.erase(); }
-    TInfoSinkBase& operator<<(const TPersistString& t) { append(t); return *this; }
-    TInfoSinkBase& operator<<(char c)                  { append(1, c); return *this; }
-    TInfoSinkBase& operator<<(const char* s)           { append(s); return *this; }
-    TInfoSinkBase& operator<<(int n)                   { append(String(n)); return *this; }
-    TInfoSinkBase& operator<<(const unsigned int n)    { append(String(n)); return *this; }
-    TInfoSinkBase& operator<<(float n)                 { char buf[40]; 
-                                                     sprintf(buf, (fabs(n) > 1e-8 && fabs(n) < 1e8) || n == 0.0f ?
-                                                             "%f" : "%g", n);
-                                                     append(buf); 
-                                                     return *this; }
-    TInfoSinkBase& operator+(const TPersistString& t)  { append(t); return *this; }
-    TInfoSinkBase& operator+(const TString& t)         { append(t); return *this; }
-    TInfoSinkBase& operator<<(const TString& t)        { append(t); return *this; }
-    TInfoSinkBase& operator+(const char* s)            { append(s); return *this; }
-    const char* c_str() const { return sink.c_str(); }
-    void prefix(TPrefixType message) {
-        switch(message) {
-        case EPrefixNone:                                      break;
-        case EPrefixWarning:       append("WARNING: ");        break;
-        case EPrefixError:         append("ERROR: ");          break;
-        case EPrefixInternalError: append("INTERNAL ERROR: "); break;
-        case EPrefixUnimplemented: append("UNIMPLEMENTED: ");  break;
-        default:                   append("UNKOWN ERROR: ");   break;
-        }
-    }
-    void location(TSourceLoc loc) {
-        append(FormatSourceLoc(loc).c_str());
-        append(": ");
-    }
-    void message(TPrefixType message, const char* s) {
-        prefix(message);
-        append(s);
-        append("\n");
-    }
-    void message(TPrefixType message, const char* s, TSourceLoc loc) {
-        prefix(message);
-        location(loc);
-        append(s);
-        append("\n");
-    }
-    
-    void setOutputStream(int output = 4)
-    {
-        outputStream = output;
-    }
-
-protected:
-    void append(const char *s); 
-
-    void append(int count, char c);
-    void append(const TPersistString& t);
-    void append(const TString& t);
-
-    void checkMem(size_t growth) { if (sink.capacity() < sink.size() + growth + 2)  
-                                       sink.reserve(sink.capacity() +  sink.capacity() / 2); }
-    void appendToStream(const char* s);
-    TPersistString sink;
-    int outputStream;
-};
-
-class TInfoSink {
-public:
-    TInfoSinkBase info;
-    TInfoSinkBase debug;
-};
-
-#endif // _INFOSINK_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeGlobals.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeGlobals.h
deleted file mode 100755
index 3d9a42a2b..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeGlobals.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef __INITIALIZE_GLOBALS_INCLUDED_
-#define __INITIALIZE_GLOBALS_INCLUDED_
-
-void InitializeGlobalPools();
-void FreeGlobalPools();
-bool InitializePoolIndex();
-void FreePoolIndex();
-
-#endif // __INITIALIZE_GLOBALS_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeParseContext.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeParseContext.h
deleted file mode 100755
index 7d565b313..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeParseContext.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef __INITIALIZE_PARSE_CONTEXT_INCLUDED_
-#define __INITIALIZE_PARSE_CONTEXT_INCLUDED_
-#include "osinclude.h"
-
-bool InitializeParseContextIndex();
-bool InitializeGlobalParseContext();
-bool FreeParseContext();
-bool FreeParseContextIndex();
-
-#endif // __INITIALIZE_PARSE_CONTEXT_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/PoolAlloc.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/PoolAlloc.h
deleted file mode 100755
index e224d3b86..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/PoolAlloc.h
+++ /dev/null
@@ -1,346 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _POOLALLOC_INCLUDED_
-#define _POOLALLOC_INCLUDED_
-
-#ifdef _DEBUG
-#  define GUARD_BLOCKS  // define to enable guard block sanity checking
-#endif
-
-//
-// This header defines an allocator that can be used to efficiently
-// allocate a large number of small requests for heap memory, with the 
-// intention that they are not individually deallocated, but rather 
-// collectively deallocated at one time.
-//
-// This simultaneously
-//
-// * Makes each individual allocation much more efficient; the
-//     typical allocation is trivial.
-// * Completely avoids the cost of doing individual deallocation.
-// * Saves the trouble of tracking down and plugging a large class of leaks.
-//
-// Individual classes can use this allocator by supplying their own
-// new and delete methods.
-//
-// STL containers can use this allocator by using the pool_allocator
-// class as the allocator (second) template argument.
-//
-
-#include <stddef.h>
-#include <vector>
-
-// If we are using guard blocks, we must track each indivual
-// allocation.  If we aren't using guard blocks, these
-// never get instantiated, so won't have any impact.
-// 
-
-class TAllocation {
-public:
-    TAllocation(size_t size, unsigned char* mem, TAllocation* prev = 0) :
-        size(size), mem(mem), prevAlloc(prev) {
-        // Allocations are bracketed:
-        //    [allocationHeader][initialGuardBlock][userData][finalGuardBlock]
-        // This would be cleaner with if (guardBlockSize)..., but that
-        // makes the compiler print warnings about 0 length memsets,
-        // even with the if() protecting them.
-#       ifdef GUARD_BLOCKS
-            memset(preGuard(),  guardBlockBeginVal, guardBlockSize);
-            memset(data(),      userDataFill,       size);
-            memset(postGuard(), guardBlockEndVal,   guardBlockSize);
-#       endif
-    }
-    
-    void check() const {
-        checkGuardBlock(preGuard(),  guardBlockBeginVal, "before");
-        checkGuardBlock(postGuard(), guardBlockEndVal,   "after");
-    }
-
-    void checkAllocList() const;
-
-    // Return total size needed to accomodate user buffer of 'size',
-    // plus our tracking data.
-    inline static size_t allocationSize(size_t size) {
-        return size + 2 * guardBlockSize + headerSize();
-    }
-    
-    // Offset from surrounding buffer to get to user data buffer.
-    inline static unsigned char* offsetAllocation(unsigned char* m) {
-        return m + guardBlockSize + headerSize();
-    }
-
-private:
-    void checkGuardBlock(unsigned char* blockMem, unsigned char val, char* locText) const;
-
-    // Find offsets to pre and post guard blocks, and user data buffer
-    unsigned char* preGuard()  const { return mem + headerSize(); }
-    unsigned char* data()      const { return preGuard() + guardBlockSize; }
-    unsigned char* postGuard() const { return data() + size; }
-
-    size_t size;                  // size of the user data area
-    unsigned char* mem;           // beginning of our allocation (pts to header)
-    TAllocation* prevAlloc;       // prior allocation in the chain
-
-    // Support MSVC++ 6.0
-    const static unsigned char guardBlockBeginVal;
-    const static unsigned char guardBlockEndVal;
-    const static unsigned char userDataFill;
-
-#   ifdef GUARD_BLOCKS
-    const static size_t guardBlockSize;
-    inline static size_t headerSize() { return sizeof(TAllocation); }
-#   else
-    const static size_t guardBlockSize;
-    inline static size_t headerSize() { return 0; }
-#   endif
-};
-    
-//
-// There are several stacks.  One is to track the pushing and popping
-// of the user, and not yet implemented.  The others are simply a 
-// repositories of free pages or used pages.
-//
-// Page stacks are linked together with a simple header at the beginning
-// of each allocation obtained from the underlying OS.  Multi-page allocations
-// are returned to the OS.  Individual page allocations are kept for future
-// re-use.
-//
-// The "page size" used is not, nor must it match, the underlying OS
-// page size.  But, having it be about that size or equal to a set of 
-// pages is likely most optimal.
-//
-class TPoolAllocator {
-public:
-    TPoolAllocator(bool global = false, int growthIncrement = 8*1024, int allocationAlignment = 16);
-
-    //
-    // Don't call the destructor just to free up the memory, call pop()
-    //
-    ~TPoolAllocator();
-
-    //
-    // Call push() to establish a new place to pop memory too.  Does not
-    // have to be called to get things started.
-    //
-    void push();
-
-    //
-    // Call pop() to free all memory allocated since the last call to push(),
-    // or if no last call to push, frees all memory since first allocation.
-    //
-    void pop();
-
-    //
-    // Call popAll() to free all memory allocated.
-    //
-    void popAll();
-
-    //
-    // Call allocate() to actually acquire memory.  Returns 0 if no memory
-    // available, otherwise a properly aligned pointer to 'numBytes' of memory.
-    //
-    void* allocate(size_t numBytes);
-
-    //
-    // There is no deallocate.  The point of this class is that
-    // deallocation can be skipped by the user of it, as the model
-    // of use is to simultaneously deallocate everything at once
-    // by calling pop(), and to not have to solve memory leak problems.
-    //
-
-protected:
-    friend struct tHeader;
-    
-    struct tHeader {
-        tHeader(tHeader* nextPage, size_t pageCount) :
-#ifdef GUARD_BLOCKS
-        lastAllocation(0),
-#endif
-        nextPage(nextPage), pageCount(pageCount) { }
-
-        ~tHeader() {
-#ifdef GUARD_BLOCKS
-            if (lastAllocation)
-                lastAllocation->checkAllocList();
-#endif
-        }
-
-        tHeader* nextPage;
-        size_t pageCount;
-#ifdef GUARD_BLOCKS
-        TAllocation* lastAllocation;
-#endif
-    };
-
-    struct tAllocState {
-        size_t offset;
-        tHeader* page;
-    };
-    typedef std::vector<tAllocState> tAllocStack;
-
-    // Track allocations if and only if we're using guard blocks
-    void* initializeAllocation(tHeader* block, unsigned char* memory, size_t numBytes) {
-#       ifdef GUARD_BLOCKS
-        new(memory) TAllocation(numBytes, memory, block->lastAllocation);
-        block->lastAllocation = reinterpret_cast<TAllocation*>(memory);
-#       endif
-
-        // This is optimized entirely away if GUARD_BLOCKS is not defined.
-        return TAllocation::offsetAllocation(memory);
-    }
-
-    bool global;            // should be true if this object is globally scoped
-    size_t pageSize;        // granularity of allocation from the OS
-    size_t alignment;       // all returned allocations will be aligned at 
-                            //      this granularity, which will be a power of 2
-    size_t alignmentMask;
-    size_t headerSkip;      // amount of memory to skip to make room for the
-                            //      header (basically, size of header, rounded
-                            //      up to make it aligned
-    size_t currentPageOffset;  // next offset in top of inUseList to allocate from
-    tHeader* freeList;      // list of popped memory
-    tHeader* inUseList;     // list of all memory currently being used
-    tAllocStack stack;      // stack of where to allocate from, to partition pool
-
-    int numCalls;           // just an interesting statistic
-    size_t totalBytes;      // just an interesting statistic
-private:
-    TPoolAllocator& operator=(const TPoolAllocator&);  // dont allow assignment operator
-    TPoolAllocator(const TPoolAllocator&);  // dont allow default copy constructor
-};
-
-
-//
-// There could potentially be many pools with pops happening at
-// different times.  But a simple use is to have a global pop
-// with everyone using the same global allocator.
-//
-typedef TPoolAllocator* PoolAllocatorPointer;
-extern TPoolAllocator& GetGlobalPoolAllocator();
-#define GlobalPoolAllocator GetGlobalPoolAllocator()
-struct TThreadGlobalPools
-{
-        TPoolAllocator* globalPoolAllocator;
-};
-
-//
-// This STL compatible allocator is intended to be used as the allocator
-// parameter to templatized STL containers, like vector and map.
-//
-// It will use the pools for allocation, and not
-// do any deallocation, but will still do destruction.
-//
-template<class T>
-class pool_allocator {
-public:
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef T *pointer;
-    typedef const T *const_pointer;
-    typedef T& reference;
-    typedef const T& const_reference;
-    typedef T value_type;
-    template<class Other> 
-        struct rebind {
-            typedef pool_allocator<Other> other;
-        };
-    pointer address(reference x) const { return &x; }
-    const_pointer address(const_reference x) const { return &x; }
-
-#ifdef USING_SGI_STL
-	pool_allocator()  { }
-#else
-    pool_allocator() : allocator(GlobalPoolAllocator) { }
-    pool_allocator(TPoolAllocator& a) : allocator(a) { }
-    pool_allocator(const pool_allocator<T>& p) : allocator(p.allocator) { }
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER >= 1300
-    template<class Other>
-#ifdef USING_SGI_STL
-        pool_allocator(const pool_allocator<Other>& p) /*: allocator(p.getAllocator())*/ { }
-#else
-        pool_allocator(const pool_allocator<Other>& p) : allocator(p.getAllocator()) { }
-#endif
-#endif
-
-#ifndef _WIN32
-        template<class Other>
-            pool_allocator(const pool_allocator<Other>& p) : allocator(p.getAllocator()) { }
-#endif
-
-#ifdef USING_SGI_STL
-    static pointer allocate(size_type n) { 
-        return reinterpret_cast<pointer>(getAllocator().allocate(n)); }
-    pointer allocate(size_type n, const void*) { 
-        return reinterpret_cast<pointer>(getAllocator().allocate(n)); }
-
-	static void deallocate(void*, size_type) { }
-    static void deallocate(pointer, size_type) { }
-#else
-    pointer allocate(size_type n) { 
-        return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T))); }
-    pointer allocate(size_type n, const void*) { 
-        return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T))); }
-
-	void deallocate(void*, size_type) { }
-    void deallocate(pointer, size_type) { }
-#endif
-
-	pointer _Charalloc(size_t n) {
-        return reinterpret_cast<pointer>(getAllocator().allocate(n)); }
-
-    void construct(pointer p, const T& val) { new ((void *)p) T(val); }
-    void destroy(pointer p) { p->T::~T(); }
-
-    bool operator==(const pool_allocator& rhs) const { return &getAllocator() == &rhs.getAllocator(); }
-    bool operator!=(const pool_allocator& rhs) const { return &getAllocator() != &rhs.getAllocator(); }
-
-    size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
-    size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
-
-#ifdef USING_SGI_STL
-    //void setAllocator(TPoolAllocator* a) { allocator = a; }
-    static  TPoolAllocator& getAllocator() { return GlobalPoolAllocator; }
-#else
-    void setAllocator(TPoolAllocator* a) { allocator = *a; }
-    TPoolAllocator& getAllocator() const { return allocator; }
-
-protected:
-    TPoolAllocator& allocator;
-#endif
-};
-
-#endif // _POOLALLOC_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ResourceLimits.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ResourceLimits.h
deleted file mode 100755
index ef24244c2..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ResourceLimits.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef _RESOURCE_LIMITS_INCLUDED_
-#define _RESOURCE_LIMITS_INCLUDED_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct TBuiltInResource_ {
-    int maxLights;
-    int maxClipPlanes;
-    int maxTextureUnits;
-    int maxTextureCoords;
-    int maxVertexAttribs;
-    int maxVertexUniformComponents;
-    int maxVaryingFloats;
-    int maxVertexTextureImageUnits;
-    int maxCombinedTextureImageUnits;
-    int maxTextureImageUnits;
-    int maxFragmentUniformComponents;
-    int maxDrawBuffers;
-} TBuiltInResource;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RESOURCE_LIMITS_INCLUDED_ */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ShHandle.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ShHandle.h
deleted file mode 100755
index 82c0314f3..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ShHandle.h
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _SHHANDLE_INCLUDED_
-#define _SHHANDLE_INCLUDED_
-
-//
-// Machine independent part of the compiler private objects
-// sent as ShHandle to the driver.
-//
-// This should not be included by driver code.
-//
-
-#define SH_EXPORTING
-#include "../Public/ShaderLangExt.h"
-#include "InfoSink.h"
-
-class TCompiler;
-class TLinker;
-class TUniformMap;
-namespace Lf {
-    class TBindingList;
-    class TLinker;
-    class TLibrary;
-}
-
-//
-// The base class used to back handles returned to the driver.
-//
-class TShHandleBase {
-public:
-    TShHandleBase() { }
-    virtual ~TShHandleBase() { }
-    virtual TCompiler* getAsCompiler() { return 0; }
-    virtual TLinker* getAsLinker() { return 0; }
-    virtual Lf::TLinker* getAsNewLinker() { return 0; }
-    virtual TUniformMap* getAsUniformMap() { return 0; }
-    virtual Lf::TBindingList* getAsBindingList() { return 0; }
-    virtual Lf::TLibrary* getAsLibrary() { return 0; }
-};
-//
-// The base class for the machine dependent linker to derive from
-// for managing where uniforms live.
-//
-class TUniformMap : public TShHandleBase {
-public:
-    TUniformMap() { }
-    virtual ~TUniformMap() { }
-    virtual TUniformMap* getAsUniformMap() { return this; }
-    virtual int getLocation(const char* name) = 0;    
-    virtual TInfoSink& getInfoSink() { return infoSink; }
-    TInfoSink infoSink;
-};
-
-class TIntermNode;
-
-//
-// The base class for the machine dependent compiler to derive from
-// for managing object code from the compile.
-//
-class TCompiler : public TShHandleBase {
-public:
-    TCompiler(EShLanguage l, TInfoSink& sink) : infoSink(sink) , language(l), haveValidObjectCode(false) { }
-    virtual ~TCompiler() { }
-    EShLanguage getLanguage() { return language; }
-    virtual TInfoSink& getInfoSink() { return infoSink; }
-
-    virtual bool compile(TIntermNode* root) = 0;
-
-    virtual TCompiler* getAsCompiler() { return this; }
-    virtual bool linkable() { return haveValidObjectCode; }
-    
-    TInfoSink& infoSink;
-protected:
-    EShLanguage language;
-    bool haveValidObjectCode;        
-};
-
-//
-// Link operations are base on a list of compile results...
-//
-typedef TVector<TCompiler*> TCompilerList;
-typedef TVector<TShHandleBase*> THandleList;
-
-//
-// The base class for the machine dependent linker to derive from
-// to manage the resulting executable.
-//
-
-class TLinker : public TShHandleBase {
-public:
-    TLinker(EShExecutable e, TInfoSink& iSink) : 
-        infoSink(iSink),
-        executable(e), 
-        haveReturnableObjectCode(false),
-        appAttributeBindings(0),
-        fixedAttributeBindings(0),
-		excludedAttributes(0),
-		excludedCount(0),
-        uniformBindings(0) { }
-    virtual TLinker* getAsLinker() { return this; }
-    virtual ~TLinker() { }
-    virtual bool link(TCompilerList&, TUniformMap*) = 0;
-    virtual bool link(THandleList&) { return false; }
-    virtual void setAppAttributeBindings(const ShBindingTable* t)   { appAttributeBindings = t; }
-    virtual void setFixedAttributeBindings(const ShBindingTable* t) { fixedAttributeBindings = t; }
-	virtual void getAttributeBindings(ShBindingTable const **t) const = 0;
-	virtual void setExcludedAttributes(const int* attributes, int count) { excludedAttributes = attributes; excludedCount = count; }
-    virtual ShBindingTable* getUniformBindings() const  { return uniformBindings; }
-    virtual const void* getObjectCode() const { return 0; } // a real compiler would be returning object code here
-    virtual TInfoSink& getInfoSink() { return infoSink; }
-    TInfoSink& infoSink;
-protected:
-    EShExecutable executable;
-    bool haveReturnableObjectCode;  // true when objectCode is acceptable to send to driver
-
-    const ShBindingTable* appAttributeBindings;
-    const ShBindingTable* fixedAttributeBindings;
-	const int* excludedAttributes;
-	int excludedCount;
-    ShBindingTable* uniformBindings;                // created by the linker    
-};
-
-//
-// This is the interface between the machine independent code
-// and the machine dependent code.
-//
-// The machine dependent code should derive from the classes
-// above. Then Construct*() and Delete*() will create and 
-// destroy the machine dependent objects, which contain the
-// above machine independent information.
-//
-TCompiler* ConstructCompiler(EShLanguage, int);
-
-TShHandleBase* ConstructLinker(EShExecutable, int);
-TShHandleBase* ConstructBindings();
-TShHandleBase* ConstructLibrary();
-void DeleteLinker(TShHandleBase*);
-    
-TUniformMap* ConstructUniformMap();
-void DeleteCompiler(TCompiler*);
-
-void DeleteUniformMap(TUniformMap*);
-void freeTargetDependentData(void*);
-
-#endif // _SHHANDLE_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Types.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Types.h
deleted file mode 100755
index 9415879af..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Types.h
+++ /dev/null
@@ -1,297 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _TYPES_INCLUDED
-#define _TYPES_INCLUDED
-
-#include "../Include/Common.h"
-#include "../Include/BaseTypes.h"
-
-//
-// Need to have association of line numbers to types in a list for building structs.
-//
-class TType;
-struct TTypeLine {
-    TType* type;
-    int line;
-};
-typedef TVector<TTypeLine> TTypeList;
-
-inline TTypeList* NewPoolTTypeList()
-{
-	void* memory = GlobalPoolAllocator.allocate(sizeof(TTypeList));
-	return new(memory) TTypeList;
-}
-
-//
-// This is a workaround for a problem with the yacc stack,  It can't have
-// types that the compiler thinks non-trivial constructors.  It should 
-// just be used while recognizing the grammar, not anything else.  Pointers
-// could be used, but also trying to avoid lots of memory management overhead.
-//
-// Not as bad as it looks, there is no actual assumption that the fields
-// match up or are name the same or anything like that.
-//
-class TPublicType {
-public:
-    TBasicType type;
-    TQualifier qualifier;
-    int size;          // size of vector or matrix, not size of array
-    bool matrix;
-    bool array;
-    TType* userDef;
-    int line;
-};
-
-typedef std::map<TTypeList*, TTypeList*> TStructureMap;
-typedef std::map<TTypeList*, TTypeList*>::iterator TStructureMapIterator;
-//
-// Base class for things that have a type.
-//
-class TType {
-public:
-    POOL_ALLOCATOR_NEW_DELETE(GlobalPoolAllocator)
-    explicit TType(TBasicType t, TQualifier q = EvqTemporary, int s = 1, bool m = false, bool a = false) :
-                            type(t), qualifier(q), size(s), matrix(m), array(a), arraySize(0), structure(0),
-                            structureSize(0), maxArraySize(0), arrayInformationType(0), fieldName(0), typeName(0), mangled(0)
-                            { }
-    explicit TType(TPublicType p) :  
-                            type(p.type), qualifier(p.qualifier), size(p.size), matrix(p.matrix), array(p.array), arraySize(0), 
-                            structure(0), structureSize(0), maxArraySize(0), arrayInformationType(0), fieldName(0), typeName(0), mangled(0)
-                            {
-                              if (p.userDef) {
-                                  structure = p.userDef->getStruct();
-                                  structureSize = setStructSize(p.userDef->getStruct());
-                                  typeName = NewPoolTString(p.userDef->getTypeName().c_str());
-                              }
-                            }
-    explicit TType(TTypeList* userDef, TString n) : 
-                            type(EbtStruct), qualifier(EvqTemporary), size(1), matrix(false), array(false), arraySize(0),
-                            structure(userDef), maxArraySize(0), arrayInformationType(0), fieldName(0), mangled(0) {
-                                structureSize = setStructSize(userDef);
-								typeName = NewPoolTString(n.c_str());
-                            }
-	explicit TType() {}
-    virtual ~TType() {}
-
-	TType (const TType& type) { *this = type; }
-    
-	void copyType(const TType& copyOf, TStructureMap& remapper)
-	{
-		type = copyOf.type;
-		qualifier = copyOf.qualifier;
-		size = copyOf.size;
-		matrix = copyOf.matrix;
-		array = copyOf.array;
-		arraySize = copyOf.arraySize;
-		
-		TStructureMapIterator iter;
-		if (copyOf.structure) {
-	        if ((iter = remapper.find(structure)) == remapper.end()) {
-				// create the new structure here
-				structure = NewPoolTTypeList();
-				for (unsigned int i = 0; i < copyOf.structure->size(); ++i) {
-					TTypeLine typeLine;
-					typeLine.line = (*copyOf.structure)[i].line;
-					typeLine.type = (*copyOf.structure)[i].type->clone(remapper);
-					structure->push_back(typeLine);
-				}
-			} else {
-				structure = iter->second;
-			}
-		} else
-			structure = 0;
-
-		fieldName = 0;
-		if (copyOf.fieldName)
-			fieldName = NewPoolTString(copyOf.fieldName->c_str());
-		typeName = 0;
-		if (copyOf.typeName)
-			typeName = NewPoolTString(copyOf.typeName->c_str());
-		
-		mangled = 0;
-		if (copyOf.mangled)
-			mangled = NewPoolTString(copyOf.mangled->c_str());
-
-		structureSize = copyOf.structureSize;
-		maxArraySize = copyOf.maxArraySize;
-		assert (copyOf.arrayInformationType == 0);
-		arrayInformationType = 0; // arrayInformationType should not be set for builtIn symbol table level
-	}
-
-	TType* clone(TStructureMap& remapper)
-	{
-		TType *newType = new TType();
-		newType->copyType(*this, remapper);
-
-		return newType;
-	}
-    
-    int setStructSize(TTypeList* userDef)
-    {
-        int stSize = 0;
-        for (TTypeList::iterator tl = userDef->begin(); tl != userDef->end(); tl++) {
-            if (((*tl).type)->isArray()) { 
-				if (((*tl).type)->getStruct()) {
-					int structSize = setStructSize(((*tl).type)->getStruct());
-					stSize += structSize * ((*tl).type)->getArraySize();
-				} else {
-                stSize += ((*tl).type)->getInstanceSize() * ((*tl).type)->getArraySize();
-				}
-            } else if (((*tl).type)->isMatrix() || ((*tl).type)->isVector()){
-                stSize += ((*tl).type)->getInstanceSize();
-            } else if (((*tl).type)->getStruct()) {
-                //?? We should actually be calling getStructSize() function and not setStructSize. This problem occurs in case
-                // of nested/embedded structs.
-                stSize += setStructSize(((*tl).type)->getStruct());
-            } else 
-                stSize += 1;
-        }
-        structureSize = stSize;
-        return stSize;
-    }
-
-    virtual void setType(TBasicType t, int s, bool m, bool a, int aS = 0)
-                            { type = t; size = s; matrix = m; array = a; arraySize = aS; }
-    virtual void setType(TBasicType t, int s, bool m, TType* userDef = 0)
-                            { type = t; 
-                              size = s; 
-                              matrix = m; 
-                              if (userDef)
-                                  structure = userDef->getStruct(); 
-                              // leave array information intact.
-                            }
-    virtual void setTypeName(const TString& n) { typeName = NewPoolTString(n.c_str()); }
-    virtual void setFieldName(const TString& n) { fieldName = NewPoolTString(n.c_str()); }
-    virtual const TString& getTypeName() const
-    { 
-		assert (typeName);    		
-    	return *typeName; 
-    }
-
-    virtual const TString& getFieldName() const
-    { 
-    	assert (fieldName);
-		return *fieldName; 
-    }
-    
-    virtual TBasicType getBasicType() const { return type; }
-    virtual TQualifier getQualifier() const { return qualifier; }
-    virtual void changeQualifier(TQualifier q) { qualifier = q; }
-
-    // One-dimensional size of single instance type
-    virtual int getNominalSize() const { return size; }  
-    
-    // Full-dimensional size of single instance of type
-    virtual int getInstanceSize() const  
-    {
-        if (matrix)
-            return size * size;
-        else
-            return size;
-    }
-    
-	virtual bool isMatrix() const { return matrix ? true : false; }
-    virtual bool isArray() const  { return array ? true : false; }
-    int getArraySize() const { return arraySize; }
-    void setArraySize(int s) { array = true; arraySize = s; }
-    void setMaxArraySize (int s) { maxArraySize = s; }
-    int getMaxArraySize () const { return maxArraySize; }
-    void setArrayInformationType(TType* t) { arrayInformationType = t; }
-    TType* getArrayInformationType() { return arrayInformationType; }
-    virtual bool isVector() const { return size > 1 && !matrix; }
-    static char* getBasicString(TBasicType t) {
-        switch (t) {
-        case EbtVoid:            return "void";              break;
-        case EbtFloat:           return "float";             break;
-        case EbtInt:             return "int";               break;
-        case EbtBool:            return "bool";              break;
-        case EbtSampler1D:       return "sampler1D";         break;
-        case EbtSampler2D:       return "sampler2D";         break;
-        case EbtSampler3D:       return "sampler3D";         break;
-        case EbtSamplerCube:     return "samplerCube";       break;
-        case EbtSampler1DShadow: return "sampler1DShadow";   break;
-        case EbtSampler2DShadow: return "sampler2DShadow";   break;
-        case EbtStruct:          return "structure";         break;
-        default:                 return "unknown type";
-        }
-    }
-    const char* getBasicString() const { return TType::getBasicString(type); }
-    const char* getQualifierString() const { return ::getQualifierString(qualifier); }
-    TTypeList* getStruct() { return structure; }
-    int getStructSize() const { return structureSize; }
-    TTypeList* getStruct() const { return structure; }
-    TString& getMangledName() {
-        if (!mangled) {
-			mangled = NewPoolTString("");
-            buildMangledName(*mangled);            
-            *mangled+=';';
-        }
-    
-        return *mangled;
-    }
-    bool operator==(const TType& right) const {
-        return      type == right.type   &&
-                    size == right.size   &&
-                  matrix == right.matrix &&
-                   array == right.array  &&
-               structure == right.structure;
-        // don't check the qualifier, it's not ever what's being sought after
-    }
-    bool operator!=(const TType& right) const {
-        return !operator==(right);
-    }
-    TString getCompleteString() const;
-        
-protected:
-    void buildMangledName(TString&);
-
-	TBasicType type      : 6;
-	TQualifier qualifier : 7;
-	int size             : 8; // size of vector or matrix, not size of array
-	unsigned int matrix  : 1;
-	unsigned int array   : 1;
-
-    int arraySize;
-    TTypeList* structure;      // 0 unless this is a struct
-    int structureSize;
-    int maxArraySize;
-    TType* arrayInformationType;
-    TString *fieldName;         // for structure field names
-    TString *typeName;          // for structure field type name
-    TString *mangled;
-
-};
-
-#endif // _TYPES_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/intermediate.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/intermediate.h
deleted file mode 100755
index 13e22c274..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/intermediate.h
+++ /dev/null
@@ -1,516 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-//
-// Definition of the in-memory high-level intermediate representation
-// of shaders.  This is a tree that parser creates.
-//
-// Nodes in the tree are defined as a hierarchy of classes derived from 
-// TIntermNode. Each is a node in a tree.  There is no preset branching factor;
-// each node can have it's own type of list of children.
-//
-
-#ifndef __INTERMEDIATE_H
-#define __INTERMEDIATE_H
-
-#include "../Include/Common.h"
-#include "../Include/Types.h"
-#include "../Include/ConstantUnion.h"
-
-//
-// Operators used by the high-level (parse tree) representation.
-//
-enum TOperator {
-    EOpNull,            // if in a node, should only mean a node is still being built
-    EOpSequence,        // denotes a list of statements, or parameters, etc.
-    EOpFunctionCall,    
-    EOpFunction,        // For function definition
-    EOpParameters,      // an aggregate listing the parameters to a function
-
-    //
-    // Unary operators
-    //
-    
-    EOpNegative,
-    EOpLogicalNot,
-    EOpVectorLogicalNot,
-    EOpBitwiseNot,
-
-    EOpPostIncrement,
-    EOpPostDecrement,
-    EOpPreIncrement,
-    EOpPreDecrement,
-
-    EOpConvIntToBool,
-    EOpConvFloatToBool,
-    EOpConvBoolToFloat,
-    EOpConvIntToFloat,
-    EOpConvFloatToInt,
-    EOpConvBoolToInt,
-
-    //
-    // binary operations
-    //
-
-    EOpAdd,
-    EOpSub,
-    EOpMul,
-    EOpDiv,
-    EOpMod,
-    EOpRightShift,
-    EOpLeftShift,
-    EOpAnd,
-    EOpInclusiveOr,
-    EOpExclusiveOr,
-    EOpEqual,
-    EOpNotEqual,
-    EOpVectorEqual,
-    EOpVectorNotEqual,
-    EOpLessThan,
-    EOpGreaterThan,
-    EOpLessThanEqual,
-    EOpGreaterThanEqual,
-    EOpComma,
-
-    EOpVectorTimesScalar,
-    EOpVectorTimesMatrix,
-    EOpMatrixTimesVector,
-    EOpMatrixTimesScalar,
-
-    EOpLogicalOr,
-    EOpLogicalXor,
-    EOpLogicalAnd,
-
-    EOpIndexDirect,
-    EOpIndexIndirect,
-    EOpIndexDirectStruct,
-
-    EOpVectorSwizzle,
-
-    //
-    // Built-in functions potentially mapped to operators
-    //
-
-    EOpRadians,
-    EOpDegrees,
-    EOpSin,
-    EOpCos,
-    EOpTan,
-    EOpAsin,
-    EOpAcos,
-    EOpAtan,
-
-    EOpPow,
-    EOpExp,
-    EOpLog,
-    EOpExp2,
-    EOpLog2,
-    EOpSqrt,
-    EOpInverseSqrt,
-
-    EOpAbs,
-    EOpSign,
-    EOpFloor,
-    EOpCeil,
-    EOpFract,
-    EOpMin,
-    EOpMax,
-    EOpClamp,
-    EOpMix,
-    EOpStep,
-    EOpSmoothStep,
-
-    EOpLength,
-    EOpDistance,
-    EOpDot,
-    EOpCross,
-    EOpNormalize,
-    EOpFaceForward,
-    EOpReflect,
-    EOpRefract,
-
-    EOpDPdx,            // Fragment only
-    EOpDPdy,            // Fragment only
-    EOpFwidth,          // Fragment only
-
-    EOpMatrixTimesMatrix,
-
-    EOpAny,
-    EOpAll,
-    
-    EOpItof,         // pack/unpack only
-    EOpFtoi,         // pack/unpack only    
-    EOpSkipPixels,   // pack/unpack only
-    EOpReadInput,    // unpack only
-    EOpWritePixel,   // unpack only
-    EOpBitmapLsb,    // unpack only
-    EOpBitmapMsb,    // unpack only
-    EOpWriteOutput,  // pack only
-    EOpReadPixel,    // pack only
-    
-    //
-    // Branch
-    //
-
-    EOpKill,            // Fragment only
-    EOpReturn,
-    EOpBreak,
-    EOpContinue,
-
-    //
-    // Constructors
-    //
-
-    EOpConstructInt,
-    EOpConstructBool,
-    EOpConstructFloat,
-    EOpConstructVec2,
-    EOpConstructVec3,
-    EOpConstructVec4,
-    EOpConstructBVec2,
-    EOpConstructBVec3,
-    EOpConstructBVec4,
-    EOpConstructIVec2,
-    EOpConstructIVec3,
-    EOpConstructIVec4,
-    EOpConstructMat2,
-    EOpConstructMat3,
-    EOpConstructMat4,
-    EOpConstructStruct,
-
-    //
-    // moves
-    //
-    
-    EOpAssign,
-    EOpAddAssign,
-    EOpSubAssign,
-    EOpMulAssign,
-    EOpVectorTimesMatrixAssign,
-    EOpVectorTimesScalarAssign,
-    EOpMatrixTimesScalarAssign,
-    EOpMatrixTimesMatrixAssign,
-    EOpDivAssign,
-    EOpModAssign,
-    EOpAndAssign,
-    EOpInclusiveOrAssign,
-    EOpExclusiveOrAssign,
-    EOpLeftShiftAssign,
-    EOpRightShiftAssign
-};
-
-class TIntermTraverser;
-class TIntermAggregate;
-class TIntermBinary;
-class TIntermConstantUnion;
-class TIntermSelection;
-class TIntermTyped;
-class TIntermSymbol;
-class TInfoSink;
-
-//
-// Base class for the tree nodes
-//
-class TIntermNode {
-public:
-    POOL_ALLOCATOR_NEW_DELETE(GlobalPoolAllocator)
-
-    TIntermNode() : line(0) {}
-    virtual TSourceLoc getLine() const { return line; }
-    virtual void setLine(TSourceLoc l) { line = l; }
-    virtual void traverse(TIntermTraverser*) = 0;
-    virtual TIntermTyped*     getAsTyped()         { return 0; }
-    virtual TIntermConstantUnion*     getAsConstantUnion()         { return 0; }
-    virtual TIntermAggregate* getAsAggregate()     { return 0; }
-    virtual TIntermBinary*    getAsBinaryNode()    { return 0; }
-    virtual TIntermSelection* getAsSelectionNode() { return 0; }
-    virtual TIntermSymbol*    getAsSymbolNode()    { return 0; }
-    virtual ~TIntermNode() { }
-protected:
-    TSourceLoc line;
-};
-
-//
-// This is just to help yacc.
-//
-struct TIntermNodePair {
-    TIntermNode* node1;
-    TIntermNode* node2;
-};
-
-class TIntermSymbol;
-class TIntermBinary;
-
-//
-// Intermediate class for nodes that have a type.
-//
-class TIntermTyped : public TIntermNode {
-public:
-	TIntermTyped(const TType& t) : type(t)  { }
-    virtual TIntermTyped* getAsTyped()         { return this; }
-    virtual void setType(const TType& t) { type = t; }
-    virtual TType getType() const { return type; }
-    virtual TType* getTypePointer() { return &type; }
-    
-    virtual TBasicType getBasicType() const { return type.getBasicType(); }
-    virtual TQualifier getQualifier() const { return type.getQualifier(); }
-    virtual int getNominalSize() const { return type.getNominalSize(); }
-    virtual int getSize() const { return type.getInstanceSize(); }
-    virtual bool isMatrix() const { return type.isMatrix(); }
-    virtual bool isArray()  const { return type.isArray(); }
-    virtual bool isVector() const { return type.isVector(); }
-    const char* getBasicString()      const { return type.getBasicString(); }
-    const char* getQualifierString()  const { return type.getQualifierString(); }
-    TString getCompleteString() const { return type.getCompleteString(); }
-
-protected:
-    TType type;
-};
-
-//
-// Handle for, do-while, and while loops.
-//
-class TIntermLoop : public TIntermNode {
-public:
-    TIntermLoop(TIntermNode* aBody, TIntermTyped* aTest, TIntermTyped* aTerminal, bool testFirst) : 
-        body(aBody),
-        test(aTest),
-        terminal(aTerminal),
-        first(testFirst) { }
-    virtual void traverse(TIntermTraverser*);
-    TIntermNode*  getBody() { return body; }
-    TIntermTyped* getTest() { return test; }
-    TIntermTyped* getTerminal() { return terminal; }
-    bool testFirst() { return first; }
-protected:
-    TIntermNode* body;       // code to loop over
-    TIntermTyped* test;      // exit condition associated with loop, could be 0 for 'for' loops
-    TIntermTyped* terminal;  // exists for for-loops
-    bool first;              // true for while and for, not for do-while
-};
-
-//
-// Handle break, continue, return, and kill.
-//
-class TIntermBranch : public TIntermNode {
-public:
-    TIntermBranch(TOperator op, TIntermTyped* e) :
-        flowOp(op),
-        expression(e) { }
-    virtual void traverse(TIntermTraverser*);
-    TOperator getFlowOp() { return flowOp; }
-    TIntermTyped* getExpression() { return expression; }
-protected:
-    TOperator flowOp;
-    TIntermTyped* expression;  // non-zero except for "return exp;" statements
-};
-
-//
-// Nodes that correspond to symbols or constants in the source code.
-//
-class TIntermSymbol : public TIntermTyped {
-public:
-	// if symbol is initialized as symbol(sym), the memory comes from the poolallocator of sym. If sym comes from
-	// per process globalpoolallocator, then it causes increased memory usage per compile
-	// it is essential to use "symbol = sym" to assign to symbol
-    TIntermSymbol(int i, const TString& sym, const TType& t) : 
-        TIntermTyped(t), id(i)  { symbol = sym;} 
-    virtual int getId() const { return id; }
-    virtual const TString& getSymbol() const { return symbol;  }
-    virtual void traverse(TIntermTraverser*);
-    virtual TIntermSymbol* getAsSymbolNode() { return this; }
-protected:
-    int id;
-    TString symbol;
-};
-
-class TIntermConstantUnion : public TIntermTyped {
-public:
-    TIntermConstantUnion(constUnion *unionPointer, const TType& t) : TIntermTyped(t), unionArrayPointer(unionPointer) { }
-    constUnion* getUnionArrayPointer() const { return unionArrayPointer; }
-    void setUnionArrayPointer(constUnion *c) { unionArrayPointer = c; }
-    virtual TIntermConstantUnion* getAsConstantUnion()  { return this; }
-    virtual void traverse(TIntermTraverser* );
-    virtual TIntermTyped* fold(TOperator, TIntermTyped*, TInfoSink&, bool);
-protected:
-    constUnion *unionArrayPointer;
-};
-
-//
-// Intermediate class for node types that hold operators.
-//
-class TIntermOperator : public TIntermTyped {
-public:
-    TOperator getOp() { return op; }
-    bool modifiesState() const;
-    bool isConstructor() const;
-    virtual bool promote(TInfoSink&) { return true; }
-protected:
-    TIntermOperator(TOperator o) : TIntermTyped(TType(EbtFloat)), op(o) {}
-    TIntermOperator(TOperator o, TType& t) : TIntermTyped(t), op(o) {}   
-    TOperator op;
-};
-
-//
-// Nodes for all the basic binary math operators.
-//
-class TIntermBinary : public TIntermOperator {
-public:
-    TIntermBinary(TOperator o) : TIntermOperator(o) {}
-    virtual void traverse(TIntermTraverser*);
-    virtual void setLeft(TIntermTyped* n) { left = n; }
-    virtual void setRight(TIntermTyped* n) { right = n; }
-    virtual TIntermTyped* getLeft() const { return left; }
-    virtual TIntermTyped* getRight() const { return right; }
-    virtual TIntermBinary* getAsBinaryNode() { return this; }
-    virtual bool promote(TInfoSink&);
-protected:
-    TIntermTyped* left;
-    TIntermTyped* right;
-};
-
-//
-// Nodes for unary math operators.
-//
-class TIntermUnary : public TIntermOperator {
-public:
-    TIntermUnary(TOperator o, TType& t) : TIntermOperator(o, t), operand(0) {}
-    TIntermUnary(TOperator o) : TIntermOperator(o), operand(0) {}
-    virtual void traverse(TIntermTraverser*);
-    virtual void setOperand(TIntermTyped* o) { operand = o; }
-    virtual TIntermTyped* getOperand() { return operand; }
-    virtual bool promote(TInfoSink&);
-protected:
-    TIntermTyped* operand;
-};
-
-typedef TVector<TIntermNode*> TIntermSequence;
-typedef TVector<int> TQualifierList;
-//
-// Nodes that operate on an arbitrary sized set of children.
-//
-class TIntermAggregate : public TIntermOperator {
-public:
-    TIntermAggregate() : TIntermOperator(EOpNull), userDefined(false), pragmaTable(0) { }
-    TIntermAggregate(TOperator o) : TIntermOperator(o), pragmaTable(0) { }
-	~TIntermAggregate() { delete pragmaTable; }
-    virtual TIntermAggregate* getAsAggregate() { return this; }
-    virtual void setOperator(TOperator o) { op = o; }
-    virtual TIntermSequence& getSequence() { return sequence; }
-	virtual void setName(const TString& n) { name = n; }
-    virtual const TString& getName() const { return name; }
-    virtual void traverse(TIntermTraverser*);
-    virtual void setUserDefined() { userDefined = true; }
-    virtual bool isUserDefined() { return userDefined; }
-    virtual TQualifierList& getQualifier() { return qualifier; }
-	void setOptimize(bool o) { optimize = o; }
-	void setDebug(bool d) { debug = d; }
-	bool getOptimize() { return optimize; }
-	bool getDebug() { return debug; }
-	void addToPragmaTable(const TPragmaTable& pTable);
-	const TPragmaTable& getPragmaTable() const { return *pragmaTable; }
-protected:
-	TIntermAggregate(const TIntermAggregate&); // disallow copy constructor
-	TIntermAggregate& operator=(const TIntermAggregate&); // disallow assignment operator
-    TIntermSequence sequence;
-    TQualifierList qualifier;
-	TString name;
-    bool userDefined; // used for user defined function names
-	bool optimize;
-	bool debug;
-	TPragmaTable *pragmaTable;
-};
-
-//
-// For if tests.  Simplified since there is no switch statement.
-//
-class TIntermSelection : public TIntermTyped {
-public:
-    TIntermSelection(TIntermTyped* cond, TIntermNode* trueB, TIntermNode* falseB) :
-        TIntermTyped(TType(EbtVoid)), condition(cond), trueBlock(trueB), falseBlock(falseB) {}
-    TIntermSelection(TIntermTyped* cond, TIntermNode* trueB, TIntermNode* falseB, const TType& type) :
-        TIntermTyped(type), condition(cond), trueBlock(trueB), falseBlock(falseB) {}
-    virtual void traverse(TIntermTraverser*);
-    virtual TIntermNode* getCondition() const { return condition; }
-    virtual TIntermNode* getTrueBlock() const { return trueBlock; }
-    virtual TIntermNode* getFalseBlock() const { return falseBlock; }
-    virtual TIntermSelection* getAsSelectionNode() { return this; }
-protected:
-    TIntermTyped* condition;
-    TIntermNode* trueBlock;
-    TIntermNode* falseBlock;
-};
-
-//
-// For traversing the tree.  User should derive from this, 
-// put their traversal specific data in it, and then pass
-// it to a Traverse method.
-//
-// When using this, just fill in the methods for nodes you want visited.
-// Return false from a pre-visit to skip visiting that node's subtree.
-//
-class TIntermTraverser {
-public:
-    POOL_ALLOCATOR_NEW_DELETE(GlobalPoolAllocator)
-
-    TIntermTraverser() : 
-        visitSymbol(0), 
-        visitConstantUnion(0),
-        visitBinary(0),
-        visitUnary(0),
-        visitSelection(0),
-        visitAggregate(0),
-        visitLoop(0),
-        visitBranch(0),
-        depth(0),
-        preVisit(true),
-        postVisit(false),
-        rightToLeft(false) {}
-
-    void (*visitSymbol)(TIntermSymbol*, TIntermTraverser*);
-    void (*visitConstantUnion)(TIntermConstantUnion*, TIntermTraverser*);
-    bool (*visitBinary)(bool preVisit, TIntermBinary*, TIntermTraverser*);
-    bool (*visitUnary)(bool preVisit, TIntermUnary*, TIntermTraverser*);
-    bool (*visitSelection)(bool preVisit, TIntermSelection*, TIntermTraverser*);
-    bool (*visitAggregate)(bool preVisit, TIntermAggregate*, TIntermTraverser*);
-    bool (*visitLoop)(bool preVisit, TIntermLoop*, TIntermTraverser*);
-    bool (*visitBranch)(bool preVisit, TIntermBranch*,  TIntermTraverser*);
-
-    int  depth;
-    bool preVisit;
-    bool postVisit;
-    bool rightToLeft;
-};
-
-#endif // __INTERMEDIATE_H
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang.cpp
deleted file mode 100755
index 3b741048d..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang.cpp
+++ /dev/null
@@ -1,2942 +0,0 @@
-#line 2 "Gen_glslang.cpp"
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header: /cvs/xorg/xc/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang.cpp,v 1.1.1.1 2005/07/31 16:46:33 ajax Exp $
- */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-#include <stdio.h>
-#include <unistd.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-
-#define yywrap() 1
-#define YY_SKIP_YYWRAP
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 144
-#define YY_END_OF_BUFFER 145
-static yyconst short int yy_accept[428] =
-    {   0,
-        0,    0,    0,    0,  145,  143,  142,  142,  127,  133,
-      138,  122,  123,  131,  130,  119,  128,  126,  132,  143,
-      143,  120,  116,  134,  121,  135,  139,  143,  124,  125,
-      137,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-      143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-      143,  117,  136,  118,  129,  141,  144,  143,  143,  113,
-       99,  118,  107,  102,   97,  105,   95,  106,   96,    0,
-       94,    0,   98,   90,    0,    0,    0,  125,  117,  124,
-      114,  110,  112,  111,  115,   86,  103,  109,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    8,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   11,   13,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  104,  108,  140,
-       93,    0,    1,   92,    0,    0,   88,   89,    0,  100,
-      101,    0,    0,   43,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    9,    0,    0,    0,    0,    0,    0,    0,   17,
-        0,    0,    0,    0,    0,   14,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   87,   86,    0,   19,    0,    0,
-       83,    0,    0,    0,    0,    0,    0,    0,   12,   46,
-        0,    0,    0,    0,    0,   51,   65,    0,    0,    0,
-        0,    0,    0,   62,   24,   25,   26,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       49,   20,    0,    0,    0,    0,    0,    0,   27,   28,
-       29,   18,    0,    0,  140,    0,    0,   92,    0,    0,
-        0,    0,    6,   33,   34,   35,   44,    3,    0,    0,
-        0,    0,   76,   77,   78,    0,   21,   66,   16,   73,
-
-       74,   75,   70,   71,   72,    0,   15,   68,    0,   30,
-       31,   32,    0,    0,    0,    0,    0,    0,    0,   63,
-        0,    0,    0,    0,    0,    0,    0,   45,    0,   85,
-        0,    0,   10,    0,    0,   91,    0,    0,    0,    0,
-       64,   59,   54,    0,    0,    0,   69,   50,   57,   23,
-        0,   82,   58,   42,   52,    0,    0,    0,    0,    0,
-        0,   93,   92,    0,    0,   53,   22,    0,    0,    0,
-        0,    0,    0,   47,    4,    0,    5,    0,    0,    7,
-       60,    0,    0,   55,    0,    0,    0,    0,   48,   67,
-       56,    2,   61,   84,   36,   37,   38,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,   39,    0,    0,
-        0,    0,    0,   79,    0,   80,    0,    0,    0,   40,
-        0,   41,    0,    0,    0,   81,    0
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        2,    2,    4,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    5,    1,    1,    1,    6,    7,    1,    8,
-        9,   10,   11,   12,   13,   14,   15,   16,   17,   18,
-       19,   20,   21,   21,   21,   22,   22,   23,   24,   25,
-       26,   27,   28,    1,   29,   29,   30,   31,   32,   29,
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-       33,   34,   35,   33,   33,   33,   33,   36,   33,   33,
-       37,    1,   38,   39,   33,    1,   40,   41,   42,   43,
-
-       44,   45,   46,   47,   48,   33,   49,   50,   51,   52,
-       53,   54,   33,   55,   56,   57,   58,   59,   60,   61,
-       62,   63,   64,   65,   66,   67,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[68] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    2,    2,    2,    2,    2,
-        2,    2,    1,    1,    1,    1,    1,    1,    2,    2,
-        2,    2,    3,    3,    3,    3,    1,    1,    1,    2,
-        2,    2,    2,    2,    2,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    1,    1,    1,    1
-    } ;
-
-static yyconst short int yy_base[432] =
-    {   0,
-        0,    0,   67,    0,  678,  679,  679,  679,  651,  109,
-      130,  679,  679,  650,  127,  679,  126,  124,  139,  151,
-      671,  647,  679,  151,  647,  121,  679,  668,  679,  679,
-      124,  147,  154,  155,  158,  171,  174,  157,  156,  184,
-      175,  160,  178,  162,  176,  181,  190,  197,  193,  195,
-      179,  679,  193,  679,  679,  679,  679,  656,  666,  679,
-      679,  679,  679,  679,  679,  679,  679,  679,  679,  665,
-      679,  665,  679,  246,  663,  662,    0,  679,  679,  679,
-      639,  679,  679,  679,  638,  253,  679,  679,  612,  605,
-      608,  616,  615,  602,  617,  604,  610,  598,  595,  608,
-
-      595,  592,  592,  598,  586,  593,  590,  600,  586,  592,
-      597,  679,  136,  596,  587,  581,  586,  588,  578,  592,
-      592,  575,  580,  577,  566,  200,  580,  576,  578,  567,
-      570,  136,  575,  567,  579,  203,  572,  679,  679,  263,
-      275,  616,  679,  282,  614,  311,  318,  325,  613,  679,
-      679,  612,  611,  679,  559,  563,  572,  569,  553,  553,
-      200,  568,  565,  565,  563,  560,  552,  558,  545,  556,
-      559,  679,  556,  544,  551,  553,  546,  535,  534,  547,
-      548,  543,  268,  544,  535,  532,  536,  534,  525,  528,
-      526,  536,  522,  520,  520,  522,  519,  530,  529,  201,
-
-      524,  519,  508,  290,  526,  528,  517,  562,  561,  337,
-      560,  349,  356,  559,    0,  363,  514,  679,  512,  293,
-      679,  504,  502,  510,  499,  516,  505,  297,  679,  679,
-      499,  509,  509,  494,  368,  679,  679,  371,  498,  492,
-      491,  492,  374,  679,  679,  679,  679,  490,  495,  486,
-      499,  494,  486,  490,  482,  485,  489,  494,  493,  484,
-      679,  679,  490,  479,  479,  484,  483,  480,  679,  679,
-      679,  679,  470,  482,  379,  386,  521,  393,  400,  520,
-      422,  482,  679,  679,  679,  679,  679,  679,  470,  471,
-      465,  475,  679,  679,  679,  466,  679,  679,  679,  679,
-
-      679,  679,  679,  679,  679,  473,  679,  679,  471,  679,
-      679,  679,  461,  466,  456,  469,  469,  458,  465,  679,
-      463,  465,  449,  458,  464,  459,  447,  679,  449,  679,
-      448,  451,  679,  429,  448,  679,  440,  439,  439,  452,
-      679,  454,  679,  453,  452,  439,  679,  679,  679,  679,
-      435,  679,  679,  679,  679,  432,  443,  436,  442,  439,
-      434,  679,  679,  426,  438,  679,  679,  431,  438,  437,
-      419,  441,  418,  679,  679,  418,  679,  413,  412,  679,
-      679,  411,  410,  679,  422,  405,  404,  376,  679,  679,
-      679,  679,  679,  679,  397,  242,  397,  389,  382,  384,
-
-      380,  380,  379,  324,  321,  321,  310,  679,  308,  292,
-      282,  266,  268,  285,  265,  679,  246,  258,  229,  679,
-      221,  679,  199,  145,  131,  679,  679,  471,  179,  473,
-      475
-    } ;
-
-static yyconst short int yy_def[432] =
-    {   0,
-      427,    1,  427,    3,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  428,  427,  427,  427,  427,  429,  427,  427,  427,
-      427,  427,  427,  427,  427,  430,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  431,
-      427,  428,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  429,  430,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  431,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,    0,  427,  427,  427,
-      427
-    } ;
-
-static yyconst short int yy_nxt[747] =
-    {   0,
-        6,    7,    8,    7,    9,   10,   11,   12,   13,   14,
-       15,   16,   17,   18,   19,   20,   21,   21,   21,   21,
-       21,   21,   22,   23,   24,   25,   26,   27,   28,   28,
-       28,   28,   28,   28,   28,   28,   29,   30,   31,   32,
-       33,   34,   35,   36,   37,   38,   39,   40,   28,   41,
-       42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-       28,   28,   28,   52,   53,   54,   55,    6,   56,   57,
-       56,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-        6,   58,    6,    6,    6,    6,    6,    6,    6,    6,
-        6,    6,    6,    6,    6,   59,   59,   59,   59,   59,
-
-       59,   59,   59,    6,    6,    6,   59,   59,   59,   59,
-       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
-       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
-        6,    6,    6,    6,   61,   62,   63,   66,   68,   70,
-       70,   70,   70,   70,   70,   70,   84,   85,   71,   87,
-       86,   69,   67,   72,   74,   64,   79,   86,   86,   86,
-       86,   86,   88,   86,   73,   86,   75,   75,   75,   75,
-       75,   75,   76,   80,   86,   81,   82,   86,   86,   86,
-      149,   86,   86,  200,   86,  177,   77,   86,  178,  179,
-      426,  201,  180,   86,   94,  110,   86,  425,   86,  116,
-
-       86,   97,   89,   90,   95,   98,   91,   96,   92,  109,
-       99,   77,   93,  104,  111,  120,  100,  117,  138,  119,
-      101,  105,  102,  106,  122,  137,  107,  115,  112,  123,
-      118,  103,  108,  121,  134,  113,  124,  125,  135,  193,
-      128,  424,  114,  129,  132,  264,  126,  136,  133,  127,
-      205,  130,  206,  265,  194,  223,  224,  139,  131,  144,
-      423,  145,  145,  145,  145,  145,  145,  145,  152,  152,
-      152,  152,  152,  152,  152,  400,  401,  146,  208,  208,
-      208,  208,  208,  208,  208,  245,  246,  247,  422,  146,
-       70,   70,   70,   70,   70,   70,   70,  211,  211,  211,
-
-      211,  211,  211,  211,  421,  420,  210,  269,  270,  271,
-      284,  285,  286,  212,  293,  294,  295,  419,  210,  418,
-      417,  213,  416,  213,  415,  212,  214,  214,  214,  214,
-      214,  214,  214,   75,   75,   75,   75,   75,   75,   76,
-       76,   76,   76,   76,   76,   76,   76,  276,  414,  276,
-      413,  412,  277,  277,  277,  277,  277,  277,  277,  279,
-      411,  279,  410,  409,  280,  280,  280,  280,  280,  280,
-      280,  214,  214,  214,  214,  214,  214,  214,  152,  152,
-      152,  152,  152,  152,  152,  300,  301,  302,  303,  304,
-      305,  310,  311,  312,  208,  208,  208,  208,  208,  208,
-
-      208,  277,  277,  277,  277,  277,  277,  277,  211,  211,
-      211,  211,  211,  211,  211,  280,  280,  280,  280,  280,
-      280,  280,  408,  407,  212,  336,  406,  405,  404,  403,
-      402,  399,  362,  398,  397,  396,  212,  214,  214,  214,
-      214,  214,  214,  214,  277,  277,  277,  277,  277,  277,
-      277,  363,  395,  394,  393,  392,  391,  385,  386,  387,
-      390,  389,  384,  280,  280,  280,  280,  280,  280,  280,
-      388,  142,  142,  142,  153,  153,  209,  209,  383,  382,
-      381,  380,  379,  378,  377,  376,  375,  374,  373,  372,
-      371,  370,  369,  368,  367,  366,  365,  364,  361,  360,
-
-      359,  358,  357,  356,  355,  354,  353,  352,  351,  350,
-      349,  348,  347,  346,  345,  344,  343,  342,  341,  340,
-      339,  338,  337,  335,  334,  333,  332,  331,  330,  329,
-      328,  327,  326,  325,  324,  323,  322,  321,  320,  319,
-      318,  317,  316,  315,  314,  313,  309,  308,  307,  306,
-      299,  298,  297,  296,  292,  291,  290,  289,  288,  287,
-      283,  282,  281,  278,  275,  275,  274,  273,  272,  268,
-      267,  266,  263,  262,  261,  260,  259,  258,  257,  256,
-      255,  254,  253,  252,  251,  250,  249,  248,  244,  243,
-      242,  241,  240,  239,  238,  237,  236,  235,  234,  233,
-
-      232,  231,  230,  229,  228,  227,  226,  225,  222,  221,
-      220,  219,  218,  217,  216,  216,  215,   74,  143,  207,
-      204,  203,  202,  199,  198,  197,  196,  195,  192,  191,
-      190,  189,  188,  187,  186,  185,  184,  183,  182,  181,
-      176,  175,  174,  173,  172,  171,  170,  169,  168,  167,
-      166,  165,  164,  163,  162,  161,  160,  159,  158,  157,
-      156,  155,  154,  151,  150,  148,  147,  143,  141,  140,
-       72,   86,   83,   78,   74,   65,   60,  427,    5,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427
-    } ;
-
-static yyconst short int yy_chk[747] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,   10,   10,   11,   15,   17,   18,
-       18,   18,   18,   18,   18,   18,   26,   26,   19,   31,
-       32,   17,   15,   19,   20,   11,   24,   33,   34,   39,
-       38,   35,   31,   42,   19,   44,   20,   20,   20,   20,
-       20,   20,   20,   24,   36,   24,   24,   37,   41,   45,
-      429,   43,   51,  132,   46,  113,   20,   40,  113,  113,
-      425,  132,  113,   47,   34,   39,   49,  424,   50,   42,
-
-       48,   35,   32,   32,   34,   35,   33,   34,   33,   38,
-       35,   20,   33,   37,   39,   45,   35,   43,   53,   44,
-       36,   37,   36,   37,   46,   51,   37,   41,   40,   47,
-       43,   36,   37,   45,   50,   40,   47,   47,   50,  126,
-       48,  423,   40,   48,   49,  200,   47,   50,   49,   47,
-      136,   48,  136,  200,  126,  161,  161,   53,   48,   74,
-      421,   74,   74,   74,   74,   74,   74,   74,   86,   86,
-       86,   86,   86,   86,   86,  396,  396,   74,  140,  140,
-      140,  140,  140,  140,  140,  183,  183,  183,  419,   74,
-      141,  141,  141,  141,  141,  141,  141,  144,  144,  144,
-
-      144,  144,  144,  144,  418,  417,  141,  204,  204,  204,
-      220,  220,  220,  144,  228,  228,  228,  415,  141,  414,
-      413,  146,  412,  146,  411,  144,  146,  146,  146,  146,
-      146,  146,  146,  147,  147,  147,  147,  147,  147,  147,
-      148,  148,  148,  148,  148,  148,  148,  210,  410,  210,
-      409,  407,  210,  210,  210,  210,  210,  210,  210,  212,
-      406,  212,  405,  404,  212,  212,  212,  212,  212,  212,
-      212,  213,  213,  213,  213,  213,  213,  213,  216,  216,
-      216,  216,  216,  216,  216,  235,  235,  235,  238,  238,
-      238,  243,  243,  243,  275,  275,  275,  275,  275,  275,
-
-      275,  276,  276,  276,  276,  276,  276,  276,  278,  278,
-      278,  278,  278,  278,  278,  279,  279,  279,  279,  279,
-      279,  279,  403,  402,  278,  281,  401,  400,  399,  398,
-      397,  395,  334,  388,  387,  386,  278,  281,  281,  281,
-      281,  281,  281,  281,  334,  334,  334,  334,  334,  334,
-      334,  335,  385,  383,  382,  379,  378,  372,  372,  372,
-      376,  373,  371,  335,  335,  335,  335,  335,  335,  335,
-      372,  428,  428,  428,  430,  430,  431,  431,  370,  369,
-      368,  365,  364,  361,  360,  359,  358,  357,  356,  351,
-      346,  345,  344,  342,  340,  339,  338,  337,  332,  331,
-
-      329,  327,  326,  325,  324,  323,  322,  321,  319,  318,
-      317,  316,  315,  314,  313,  309,  306,  296,  292,  291,
-      290,  289,  282,  280,  277,  274,  273,  268,  267,  266,
-      265,  264,  263,  260,  259,  258,  257,  256,  255,  254,
-      253,  252,  251,  250,  249,  248,  242,  241,  240,  239,
-      234,  233,  232,  231,  227,  226,  225,  224,  223,  222,
-      219,  217,  214,  211,  209,  208,  207,  206,  205,  203,
-      202,  201,  199,  198,  197,  196,  195,  194,  193,  192,
-      191,  190,  189,  188,  187,  186,  185,  184,  182,  181,
-      180,  179,  178,  177,  176,  175,  174,  173,  171,  170,
-
-      169,  168,  167,  166,  165,  164,  163,  162,  160,  159,
-      158,  157,  156,  155,  153,  152,  149,  145,  142,  137,
-      135,  134,  133,  131,  130,  129,  128,  127,  125,  124,
-      123,  122,  121,  120,  119,  118,  117,  116,  115,  114,
-      111,  110,  109,  108,  107,  106,  105,  104,  103,  102,
-      101,  100,   99,   98,   97,   96,   95,   94,   93,   92,
-       91,   90,   89,   85,   81,   76,   75,   72,   70,   59,
-       58,   28,   25,   22,   21,   14,    9,    5,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "glslang.l"
-#define INITIAL 0
-/*
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-*/
-/* Based on
-ANSI C grammar, Lex specification
-
-In 1985, Jeff Lee published this Lex specification together with a Yacc 
-grammar for the April 30, 1985 ANSI C draft.  Tom Stockfisch reposted 
-both to net.sources in 1987; that original, as mentioned in the answer 
-to question 17.25 of the comp.lang.c FAQ, can be ftp'ed from ftp.uu.net, 
-file usenet/net.sources/ansi.c.grammar.Z. 
-
-I intend to keep this version as close to the current C Standard grammar 
-as possible; please let me know if you discover discrepancies. 
-
-Jutta Degener, 1995 
-*/
-#define YY_NO_UNPUT 1
-#line 59 "glslang.l"
-#include <stdio.h>
-#include <stdlib.h>
-#include "ParseHelper.h"
-#include "glslang_tab.h"
-
-/* windows only pragma */
-#ifdef _MSC_VER
-#pragma warning(disable : 4102)
-#endif
-
-int yy_input(char* buf, int max_size);
-TSourceLoc yylineno;
-
-#ifdef _WIN32
-    extern int yyparse(TParseContext&);
-    #define YY_DECL int yylex(YYSTYPE* pyylval, TParseContext& parseContext)    
-#else
-    extern int yyparse(void*);
-    #define YY_DECL int yylex(YYSTYPE* pyylval, void* parseContextLocal)
-    #define parseContext (*((TParseContext*)(parseContextLocal)))
-#endif
- 
-#define YY_INPUT(buf,result,max_size) (result = yy_input(buf, max_size))
-
-#define YY_NEVER_INTERACTIVE 1
-#define FIELDS 1
-
-#line 753 "Gen_glslang.cpp"
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = '*', n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-#line 91 "glslang.l"
-
-#line 906 "Gen_glslang.cpp"
-
-	if ( yy_init )
-		{
-		yy_init = 0;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 428 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 679 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-
-do_action:	/* This label is used only to access EOF actions. */
-
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 92 "glslang.l"
-{ /* ?? carriage and/or line-feed? */ };
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 94 "glslang.l"
-{  pyylval->lex.line = yylineno; return(ATTRIBUTE); }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 95 "glslang.l"
-{  pyylval->lex.line = yylineno; return(CONST_QUAL); }
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 96 "glslang.l"
-{  pyylval->lex.line = yylineno; return(UNIFORM); }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 97 "glslang.l"
-{  pyylval->lex.line = yylineno; return(VARYING); }
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 99 "glslang.l"
-{  pyylval->lex.line = yylineno; return(BREAK); }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 100 "glslang.l"
-{  pyylval->lex.line = yylineno; return(CONTINUE); }
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 101 "glslang.l"
-{  pyylval->lex.line = yylineno; return(DO); }
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 102 "glslang.l"
-{  pyylval->lex.line = yylineno; return(FOR); }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 103 "glslang.l"
-{  pyylval->lex.line = yylineno; return(WHILE); }
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 105 "glslang.l"
-{  pyylval->lex.line = yylineno; return(IF); }
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 106 "glslang.l"
-{  pyylval->lex.line = yylineno; return(ELSE); }
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 108 "glslang.l"
-{  pyylval->lex.line = yylineno; return(IN_QUAL); }
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 109 "glslang.l"
-{  pyylval->lex.line = yylineno; return(OUT_QUAL); }
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 110 "glslang.l"
-{  pyylval->lex.line = yylineno; return(INOUT_QUAL); }
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 112 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(FLOAT_TYPE); }
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 113 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(INT_TYPE); }
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 114 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(VOID_TYPE); }
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 115 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(BOOL_TYPE); }
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 116 "glslang.l"
-{  pyylval->lex.line = yylineno; pyylval->lex.b = true;  return(BOOLCONSTANT); }
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 117 "glslang.l"
-{  pyylval->lex.line = yylineno; pyylval->lex.b = false; return(BOOLCONSTANT); }
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 119 "glslang.l"
-{  pyylval->lex.line = yylineno; return(DISCARD); }
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 120 "glslang.l"
-{  pyylval->lex.line = yylineno; return(RETURN); }
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 122 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(MATRIX2); }
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 123 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(MATRIX3); }
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 124 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(MATRIX4); }
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 126 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (VEC2); }
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 127 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (VEC3); }
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 128 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (VEC4); }
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 129 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (IVEC2); }
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 130 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (IVEC3); }
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 131 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (IVEC4); }
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 132 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (BVEC2); }
-	YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 133 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (BVEC3); }
-	YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 134 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (BVEC4); }
-	YY_BREAK
-case 36:
-YY_RULE_SETUP
-#line 136 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER1D; }
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 137 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER2D; }
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 138 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER3D; }
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 139 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLERCUBE; }
-	YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 140 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER1DSHADOW; }
-	YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 141 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER2DSHADOW; }
-	YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 143 "glslang.l"
-{  pyylval->lex.line = yylineno; return(STRUCT); }
-	YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 145 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 147 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 45:
-YY_RULE_SETUP
-#line 148 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 46:
-YY_RULE_SETUP
-#line 149 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 150 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 151 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 152 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 50:
-YY_RULE_SETUP
-#line 153 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 155 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 156 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 53:
-YY_RULE_SETUP
-#line 157 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 54:
-YY_RULE_SETUP
-#line 159 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 55:
-YY_RULE_SETUP
-#line 160 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 56:
-YY_RULE_SETUP
-#line 161 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 57:
-YY_RULE_SETUP
-#line 162 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 58:
-YY_RULE_SETUP
-#line 163 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 59:
-YY_RULE_SETUP
-#line 164 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 60:
-YY_RULE_SETUP
-#line 165 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 61:
-YY_RULE_SETUP
-#line 166 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 62:
-YY_RULE_SETUP
-#line 168 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 63:
-YY_RULE_SETUP
-#line 169 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 64:
-YY_RULE_SETUP
-#line 170 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 65:
-YY_RULE_SETUP
-#line 171 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 66:
-YY_RULE_SETUP
-#line 172 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 67:
-YY_RULE_SETUP
-#line 173 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 68:
-YY_RULE_SETUP
-#line 175 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 69:
-YY_RULE_SETUP
-#line 176 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 70:
-YY_RULE_SETUP
-#line 178 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 71:
-YY_RULE_SETUP
-#line 179 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 72:
-YY_RULE_SETUP
-#line 180 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 73:
-YY_RULE_SETUP
-#line 181 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 74:
-YY_RULE_SETUP
-#line 182 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 75:
-YY_RULE_SETUP
-#line 183 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 76:
-YY_RULE_SETUP
-#line 184 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 77:
-YY_RULE_SETUP
-#line 185 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 78:
-YY_RULE_SETUP
-#line 186 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 79:
-YY_RULE_SETUP
-#line 188 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 80:
-YY_RULE_SETUP
-#line 189 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 81:
-YY_RULE_SETUP
-#line 190 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 82:
-YY_RULE_SETUP
-#line 192 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 83:
-YY_RULE_SETUP
-#line 193 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 84:
-YY_RULE_SETUP
-#line 195 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 85:
-YY_RULE_SETUP
-#line 196 "glslang.l"
-{  PaReservedWord(); return 0; }
-	YY_BREAK
-case 86:
-YY_RULE_SETUP
-#line 198 "glslang.l"
-{  
-   pyylval->lex.line = yylineno; 
-   pyylval->lex.string = NewPoolTString(yytext); 
-   return PaIdentOrType(*pyylval->lex.string, parseContext, pyylval->lex.symbol); 
-}
-	YY_BREAK
-case 87:
-YY_RULE_SETUP
-#line 204 "glslang.l"
-{ pyylval->lex.line = yylineno; pyylval->lex.i = strtol(yytext, 0, 0); return(INTCONSTANT); }
-	YY_BREAK
-case 88:
-YY_RULE_SETUP
-#line 205 "glslang.l"
-{ pyylval->lex.line = yylineno; pyylval->lex.i = strtol(yytext, 0, 0); return(INTCONSTANT); }
-	YY_BREAK
-case 89:
-YY_RULE_SETUP
-#line 206 "glslang.l"
-{ pyylval->lex.line = yylineno; parseContext.error(yylineno, "Invalid Octal number.", yytext, "", ""); parseContext.recover(); return 0;}
-	YY_BREAK
-case 90:
-YY_RULE_SETUP
-#line 207 "glslang.l"
-{ pyylval->lex.line = yylineno; pyylval->lex.i = strtol(yytext, 0, 0); return(INTCONSTANT); }
-	YY_BREAK
-case 91:
-YY_RULE_SETUP
-#line 209 "glslang.l"
-{ pyylval->lex.line = yylineno; pyylval->lex.f = static_cast<float>(atof(yytext)); return(FLOATCONSTANT); }
-	YY_BREAK
-case 92:
-YY_RULE_SETUP
-#line 210 "glslang.l"
-{ pyylval->lex.line = yylineno; pyylval->lex.f = static_cast<float>(atof(yytext)); return(FLOATCONSTANT); }
-	YY_BREAK
-case 93:
-YY_RULE_SETUP
-#line 211 "glslang.l"
-{ pyylval->lex.line = yylineno; pyylval->lex.f = static_cast<float>(atof(yytext)); return(FLOATCONSTANT); }
-	YY_BREAK
-case 94:
-YY_RULE_SETUP
-#line 213 "glslang.l"
-{  int ret = PaParseComment(pyylval->lex.line, parseContext); if (!ret) return ret; }   
-	YY_BREAK
-case 95:
-YY_RULE_SETUP
-#line 215 "glslang.l"
-{  pyylval->lex.line = yylineno; return(ADD_ASSIGN); }
-	YY_BREAK
-case 96:
-YY_RULE_SETUP
-#line 216 "glslang.l"
-{  pyylval->lex.line = yylineno; return(SUB_ASSIGN); }
-	YY_BREAK
-case 97:
-YY_RULE_SETUP
-#line 217 "glslang.l"
-{  pyylval->lex.line = yylineno; return(MUL_ASSIGN); }
-	YY_BREAK
-case 98:
-YY_RULE_SETUP
-#line 218 "glslang.l"
-{  pyylval->lex.line = yylineno; return(DIV_ASSIGN); }
-	YY_BREAK
-case 99:
-YY_RULE_SETUP
-#line 219 "glslang.l"
-{  pyylval->lex.line = yylineno; return(MOD_ASSIGN); }
-	YY_BREAK
-case 100:
-YY_RULE_SETUP
-#line 220 "glslang.l"
-{  pyylval->lex.line = yylineno; return(LEFT_ASSIGN); }
-	YY_BREAK
-case 101:
-YY_RULE_SETUP
-#line 221 "glslang.l"
-{  pyylval->lex.line = yylineno; return(RIGHT_ASSIGN); }
-	YY_BREAK
-case 102:
-YY_RULE_SETUP
-#line 222 "glslang.l"
-{  pyylval->lex.line = yylineno; return(AND_ASSIGN); }
-	YY_BREAK
-case 103:
-YY_RULE_SETUP
-#line 223 "glslang.l"
-{  pyylval->lex.line = yylineno; return(XOR_ASSIGN); }
-	YY_BREAK
-case 104:
-YY_RULE_SETUP
-#line 224 "glslang.l"
-{  pyylval->lex.line = yylineno; return(OR_ASSIGN); }
-	YY_BREAK
-case 105:
-YY_RULE_SETUP
-#line 226 "glslang.l"
-{  pyylval->lex.line = yylineno; return(INC_OP); }
-	YY_BREAK
-case 106:
-YY_RULE_SETUP
-#line 227 "glslang.l"
-{  pyylval->lex.line = yylineno; return(DEC_OP); }
-	YY_BREAK
-case 107:
-YY_RULE_SETUP
-#line 228 "glslang.l"
-{  pyylval->lex.line = yylineno; return(AND_OP); }
-	YY_BREAK
-case 108:
-YY_RULE_SETUP
-#line 229 "glslang.l"
-{  pyylval->lex.line = yylineno; return(OR_OP); }
-	YY_BREAK
-case 109:
-YY_RULE_SETUP
-#line 230 "glslang.l"
-{  pyylval->lex.line = yylineno; return(XOR_OP); }
-	YY_BREAK
-case 110:
-YY_RULE_SETUP
-#line 231 "glslang.l"
-{  pyylval->lex.line = yylineno; return(LE_OP); }
-	YY_BREAK
-case 111:
-YY_RULE_SETUP
-#line 232 "glslang.l"
-{  pyylval->lex.line = yylineno; return(GE_OP); }
-	YY_BREAK
-case 112:
-YY_RULE_SETUP
-#line 233 "glslang.l"
-{  pyylval->lex.line = yylineno; return(EQ_OP); }
-	YY_BREAK
-case 113:
-YY_RULE_SETUP
-#line 234 "glslang.l"
-{  pyylval->lex.line = yylineno; return(NE_OP); }
-	YY_BREAK
-case 114:
-YY_RULE_SETUP
-#line 235 "glslang.l"
-{  pyylval->lex.line = yylineno; return(LEFT_OP); }
-	YY_BREAK
-case 115:
-YY_RULE_SETUP
-#line 236 "glslang.l"
-{  pyylval->lex.line = yylineno; return(RIGHT_OP); }
-	YY_BREAK
-case 116:
-YY_RULE_SETUP
-#line 237 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = false; return(SEMICOLON); }
-	YY_BREAK
-case 117:
-YY_RULE_SETUP
-#line 238 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = false; return(LEFT_BRACE); }
-	YY_BREAK
-case 118:
-YY_RULE_SETUP
-#line 239 "glslang.l"
-{  pyylval->lex.line = yylineno; return(RIGHT_BRACE); }
-	YY_BREAK
-case 119:
-YY_RULE_SETUP
-#line 240 "glslang.l"
-{  pyylval->lex.line = yylineno; if (parseContext.inTypeParen) parseContext.lexAfterType = false; return(COMMA); }
-	YY_BREAK
-case 120:
-YY_RULE_SETUP
-#line 241 "glslang.l"
-{  pyylval->lex.line = yylineno; return(COLON); }
-	YY_BREAK
-case 121:
-YY_RULE_SETUP
-#line 242 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = false; return(EQUAL); }
-	YY_BREAK
-case 122:
-YY_RULE_SETUP
-#line 243 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.lexAfterType = false; parseContext.inTypeParen = true; return(LEFT_PAREN); }
-	YY_BREAK
-case 123:
-YY_RULE_SETUP
-#line 244 "glslang.l"
-{  pyylval->lex.line = yylineno; parseContext.inTypeParen = false; return(RIGHT_PAREN); }
-	YY_BREAK
-case 124:
-YY_RULE_SETUP
-#line 245 "glslang.l"
-{  pyylval->lex.line = yylineno; return(LEFT_BRACKET); }
-	YY_BREAK
-case 125:
-YY_RULE_SETUP
-#line 246 "glslang.l"
-{  pyylval->lex.line = yylineno; return(RIGHT_BRACKET); }
-	YY_BREAK
-case 126:
-YY_RULE_SETUP
-#line 247 "glslang.l"
-{ BEGIN(FIELDS);  return(DOT); }
-	YY_BREAK
-case 127:
-YY_RULE_SETUP
-#line 248 "glslang.l"
-{  pyylval->lex.line = yylineno; return(BANG); }
-	YY_BREAK
-case 128:
-YY_RULE_SETUP
-#line 249 "glslang.l"
-{  pyylval->lex.line = yylineno; return(DASH); }
-	YY_BREAK
-case 129:
-YY_RULE_SETUP
-#line 250 "glslang.l"
-{  pyylval->lex.line = yylineno; return(TILDE); }
-	YY_BREAK
-case 130:
-YY_RULE_SETUP
-#line 251 "glslang.l"
-{  pyylval->lex.line = yylineno; return(PLUS); }
-	YY_BREAK
-case 131:
-YY_RULE_SETUP
-#line 252 "glslang.l"
-{  pyylval->lex.line = yylineno; return(STAR); }
-	YY_BREAK
-case 132:
-YY_RULE_SETUP
-#line 253 "glslang.l"
-{  pyylval->lex.line = yylineno; return(SLASH); }
-	YY_BREAK
-case 133:
-YY_RULE_SETUP
-#line 254 "glslang.l"
-{  pyylval->lex.line = yylineno; return(PERCENT); }
-	YY_BREAK
-case 134:
-YY_RULE_SETUP
-#line 255 "glslang.l"
-{  pyylval->lex.line = yylineno; return(LEFT_ANGLE); }
-	YY_BREAK
-case 135:
-YY_RULE_SETUP
-#line 256 "glslang.l"
-{  pyylval->lex.line = yylineno; return(RIGHT_ANGLE); }
-	YY_BREAK
-case 136:
-YY_RULE_SETUP
-#line 257 "glslang.l"
-{  pyylval->lex.line = yylineno; return(VERTICAL_BAR); }
-	YY_BREAK
-case 137:
-YY_RULE_SETUP
-#line 258 "glslang.l"
-{  pyylval->lex.line = yylineno; return(CARET); }
-	YY_BREAK
-case 138:
-YY_RULE_SETUP
-#line 259 "glslang.l"
-{  pyylval->lex.line = yylineno; return(AMPERSAND); }
-	YY_BREAK
-case 139:
-YY_RULE_SETUP
-#line 260 "glslang.l"
-{  pyylval->lex.line = yylineno; return(QUESTION); }
-	YY_BREAK
-case 140:
-YY_RULE_SETUP
-#line 262 "glslang.l"
-{ 
-BEGIN(INITIAL);      
-    pyylval->lex.line = yylineno;     
-    pyylval->lex.string = NewPoolTString(yytext); 
-    return FIELD_SELECTION; }
-	YY_BREAK
-case 141:
-YY_RULE_SETUP
-#line 267 "glslang.l"
-{}
-	YY_BREAK
-case 142:
-YY_RULE_SETUP
-#line 269 "glslang.l"
-{  }
-	YY_BREAK
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(FIELDS):
-#line 270 "glslang.l"
-{ (&parseContext)->AfterEOF = true; yy_delete_buffer(YY_CURRENT_BUFFER); yyterminate();}
-	YY_BREAK
-case 143:
-YY_RULE_SETUP
-#line 271 "glslang.l"
-{ parseContext.infoSink.info << "FLEX: Unknown char " << yytext << "\n";
-          return 0; }
-	YY_BREAK
-case 144:
-YY_RULE_SETUP
-#line 274 "glslang.l"
-ECHO;
-	YY_BREAK
-#line 1723 "Gen_glslang.cpp"
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-	yy_current_state = yy_start;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 428 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 428 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 427);
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin );
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						return EOF;
-
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-
-	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
-	if ( ! b )
-		return;
-
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
-
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-	{
-	yy_flush_buffer( b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-	{
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
-	}
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer( b );
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
-
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer( buf, n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 274 "glslang.l"
-
-
-
-//Including Pre-processor.
-extern "C" {
-  #include "./preprocessor/preprocess.h"
-} 
-
-//
-// The YY_INPUT macro just calls this.  Maybe this could be just put into
-// the macro directly.
-//
-
-int yy_input(char* buf, int max_size)
-{
-     char *char_token =NULL;
-     int len;
-
-    if ((len = yylex_CPP(buf, max_size)) == 0)
-        return 0;
-    if (len >= max_size) 
-        YY_FATAL_ERROR( "input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-
- 	buf[len] = ' ';
-	return len+1;
-}
-
-
-//
-// Parse an array of strings using yyparse.  We set up globals used by
-// yywrap.
-//
-// Returns 0 for success, as per yyparse().
-//
-int PaParseStrings(char* argv[], int strLen[], int argc, TParseContext& parseContextLocal)
-{
-    int argv0len;
-    ScanFromString(argv[0]); 
-    
-    //Storing the Current Compiler Parse context into the cpp structure.
-	cpp->pC = (void*)&parseContextLocal;
-	
-	if (!argv || argc == 0 || !argv[0])
-        return 1;
-    
-    if (!strLen) {
-        argv0len = (int) strlen(argv[0]);
-        strLen   = &argv0len;
-    }
-    yyrestart(0);
-    (&parseContextLocal)->AfterEOF = false;
-    cpp->PaWhichStr = 0;
-    cpp->PaArgv     = argv;
-    cpp->PaArgc     = argc;
-    cpp->PaStrLen   = strLen;
-    yylineno   = 1;
-   
-    if (*cpp->PaStrLen >= 0) {    
-        int ret;
-        #ifdef _WIN32
-            ret = yyparse(parseContextLocal);
-        #else
-            ret = yyparse((void*)(&parseContextLocal));
-        #endif
-        if (cpp->CompileError == 1 || parseContextLocal.recoveredFromError || parseContextLocal.numErrors > 0)
-             return 1;
-        else
-             return 0;
-    }
-    else
-        return 0;
-}
-
-void yyerror(char *s) 
-{
-    if (((TParseContext *)cpp->pC)->AfterEOF) {
-        if (cpp->tokensBeforeEOF == 1) {
-            GlobalParseContext->error(yylineno, "syntax error", "pre-mature EOF", s, "");
-            GlobalParseContext->recover();
-        }
-    } else {
-        GlobalParseContext->error(yylineno, "syntax error", yytext, s, "");
-        GlobalParseContext->recover();
-    }            
-}
-
-void PaReservedWord()
-{
-    GlobalParseContext->error(yylineno, "Reserved word.", yytext, "", "");
-    GlobalParseContext->recover();
-}
-
-int PaIdentOrType(TString& id, TParseContext& parseContextLocal, TSymbol*& symbol)
-{
-    symbol = parseContextLocal.symbolTable.find(id);
-    if (parseContextLocal.lexAfterType == false && symbol && symbol->isVariable()) {
-        TVariable* variable = static_cast<TVariable*>(symbol);
-        if (variable->isUserType()) {
-            parseContextLocal.lexAfterType = true;
-            return TYPE_NAME;
-        }
-    }
-    
-    return IDENTIFIER;
-}
-
-int PaParseComment(int &lineno, TParseContext& parseContextLocal)
-{
-    int transitionFlag = 0;
-    int nextChar;
-    
-    while (transitionFlag != 2) {
-        nextChar = yyinput();
-        if (nextChar == '\n')
-             lineno++;
-        switch (nextChar) {
-        case '*' :
-            transitionFlag = 1;
-            break;
-        case '/' :  /* if star is the previous character, then it is the end of comment */
-            if (transitionFlag == 1) {
-                return 1 ;
-            }
-            break;
-        case EOF :
-            /* Raise error message here */
-            parseContextLocal.error(yylineno, "End of shader found before end of comment.", "", "", "");
-            GlobalParseContext->recover();
-            return YY_NULL; 
-        default :  /* Any other character will be a part of the comment */
-            transitionFlag = 0;
-        }
-    }
-    return 1;
-}
-
-extern "C" {
-
-void CPPDebugLogMsg(const char *msg)
-{
-    ((TParseContext *)cpp->pC)->infoSink.debug.message(EPrefixNone, msg);
-}
-
-void CPPWarningToInfoLog(const char *msg)
-{
-    ((TParseContext *)cpp->pC)->infoSink.info.message(EPrefixWarning, msg, yylineno); 
-}
-
-void CPPShInfoLogMsg(const char *msg)
-{
-    ((TParseContext *)cpp->pC)->error(yylineno,"", "",msg,"");
-    GlobalParseContext->recover();
-}
-
-void CPPErrorToInfoLog(char *msg)
-{
-    ((TParseContext *)cpp->pC)->error(yylineno,"syntax error", "",msg,"");
-    GlobalParseContext->recover();
-}
-
-void SetLineNumber(int line)
-{
-    yylineno &= ~SourceLocLineMask;
-    yylineno |= line;
-}
-
-void SetStringNumber(int string)
-{
-    yylineno = (string << SourceLocStringShift) | (yylineno & SourceLocLineMask);
-}
-
-int GetStringNumber(void)
-{
-    return yylineno >> 16;
-}
-
-int GetLineNumber(void)
-{
-    return yylineno & SourceLocLineMask;
-}
-
-void IncLineNumber(void)
-{
-    if ((yylineno & SourceLocLineMask) <= SourceLocLineMask)
-        ++yylineno;
-}
-
-void DecLineNumber(void)
-{
-    if ((yylineno & SourceLocLineMask) > 0)
-        --yylineno;
-}
-
-void HandlePragma(const char **tokens, int numTokens)
-{
-    if (!strcmp(tokens[0], "optimize")) {
-        if (numTokens != 4) {
-            CPPShInfoLogMsg("optimize pragma syntax is incorrect");
-            return;
-        }
-        
-        if (strcmp(tokens[1], "(")) {
-            CPPShInfoLogMsg("\"(\" expected after 'optimize' keyword");
-            return;
-        }
-            
-        if (!strcmp(tokens[2], "on"))
-            ((TParseContext *)cpp->pC)->contextPragma.optimize = true;
-        else if (!strcmp(tokens[2], "off"))
-            ((TParseContext *)cpp->pC)->contextPragma.optimize = false;
-        else {
-            CPPShInfoLogMsg("\"on\" or \"off\" expected after '(' for 'optimize' pragma");
-            return;
-        }
-        
-        if (strcmp(tokens[3], ")")) {
-            CPPShInfoLogMsg("\")\" expected to end 'optimize' pragma");
-            return;
-        }
-    } else if (!strcmp(tokens[0], "debug")) {
-        if (numTokens != 4) {
-            CPPShInfoLogMsg("debug pragma syntax is incorrect");
-            return;
-        }
-        
-        if (strcmp(tokens[1], "(")) {
-            CPPShInfoLogMsg("\"(\" expected after 'debug' keyword");
-            return;
-        }
-            
-        if (!strcmp(tokens[2], "on"))
-            ((TParseContext *)cpp->pC)->contextPragma.debug = true;
-        else if (!strcmp(tokens[2], "off"))
-            ((TParseContext *)cpp->pC)->contextPragma.debug = false;
-        else {
-            CPPShInfoLogMsg("\"on\" or \"off\" expected after '(' for 'debug' pragma");
-            return;
-        }
-        
-        if (strcmp(tokens[3], ")")) {
-            CPPShInfoLogMsg("\")\" expected to end 'debug' pragma");
-            return;
-        }
-    } else {
-        /*
-        // implementation specific pragma
-        // use ((TParseContext *)cpp->pC)->contextPragma.pragmaTable to store the information about pragma
-        // For now, just ignore the pragma that the implementation cannot recognize
-        // An Example of one such implementation for a pragma that has a syntax like
-        // #pragma pragmaname(pragmavalue)
-        // This implementation stores the current pragmavalue against the pragma name in pragmaTable.
-        if (numTokens == 4 && !strcmp(tokens[1], "(") && !strcmp(tokens[3], ")")) {              
-            TPragmaTable& pragmaTable = ((TParseContext *)cpp->pC)->contextPragma.pragmaTable;
-            TPragmaTable::iterator iter;
-            iter = pragmaTable.find(TString(tokens[0]));
-            if (iter != pragmaTable.end()) {
-                iter->second = tokens[2];
-            } else {
-                pragmaTable[tokens[0]] = tokens[2];
-            }        
-        }
-        */
-    }
-}
-
-void StoreStr(char *string)
-{
-    TString strSrc;
-    strSrc = TString(string);
-
-    ((TParseContext *)cpp->pC)->HashErrMsg = ((TParseContext *)cpp->pC)->HashErrMsg + " " + strSrc;
-}
-
-const char* GetStrfromTStr(void)
-{
-    cpp->ErrMsg = (((TParseContext *)cpp->pC)->HashErrMsg).c_str();
-    return cpp->ErrMsg;
-}
-
-void ResetTString(void)
-{
-    ((TParseContext *)cpp->pC)->HashErrMsg = "";
-}
-
-TBehavior GetBehavior(const char* behavior)
-{
-    if (!strcmp("require", behavior))
-        return EBhRequire;
-    else if (!strcmp("enable", behavior))
-        return EBhEnable;
-    else if (!strcmp("disable", behavior))
-        return EBhDisable;
-    else if (!strcmp("warn", behavior))
-        return EBhWarn;
-    else {
-        CPPShInfoLogMsg((TString("behavior '") + behavior + "' is not supported").c_str());
-        return EBhDisable;
-    }        
-}
-
-void  updateExtensionBehavior(const char* extName, const char* behavior)
-{
-    TBehavior behaviorVal = GetBehavior(behavior);
-    TMap<TString, TBehavior>:: iterator iter;
-    TString msg;
-    
-    // special cased for all extension
-    if (!strcmp(extName, "all")) {
-        if (behaviorVal == EBhRequire || behaviorVal == EBhEnable) {
-            CPPShInfoLogMsg("extension 'all' cannot have 'require' or 'enable' behavior");  
-            return;
-        } else {
-            for (iter =  ((TParseContext *)cpp->pC)->extensionBehavior.begin(); iter != ((TParseContext *)cpp->pC)->extensionBehavior.end(); ++iter)
-                iter->second = behaviorVal;
-        }        
-    } else {
-        iter = ((TParseContext *)cpp->pC)->extensionBehavior.find(TString(extName));
-        if (iter == ((TParseContext *)cpp->pC)->extensionBehavior.end()) {
-            switch (behaviorVal) {
-            case EBhRequire:
-                CPPShInfoLogMsg((TString("extension '") + extName + "' is not supported").c_str());  
-                break;
-            case EBhEnable:
-            case EBhWarn:
-            case EBhDisable:
-                msg = TString("extension '") + extName + "' is not supported";
-                ((TParseContext *)cpp->pC)->infoSink.info.message(EPrefixWarning, msg.c_str(), yylineno); 
-                break;
-            }
-            return;
-        } else
-            iter->second = behaviorVal;
-    }
-}
-        
-}
-
-void setInitialState()
-{
-    yy_start = 1;
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang_tab.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang_tab.cpp
deleted file mode 100755
index 69aa60872..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang_tab.cpp
+++ /dev/null
@@ -1,4354 +0,0 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 1
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ATTRIBUTE = 258,
-     CONST_QUAL = 259,
-     BOOL_TYPE = 260,
-     FLOAT_TYPE = 261,
-     INT_TYPE = 262,
-     BREAK = 263,
-     CONTINUE = 264,
-     DO = 265,
-     ELSE = 266,
-     FOR = 267,
-     IF = 268,
-     DISCARD = 269,
-     RETURN = 270,
-     BVEC2 = 271,
-     BVEC3 = 272,
-     BVEC4 = 273,
-     IVEC2 = 274,
-     IVEC3 = 275,
-     IVEC4 = 276,
-     VEC2 = 277,
-     VEC3 = 278,
-     VEC4 = 279,
-     MATRIX2 = 280,
-     MATRIX3 = 281,
-     MATRIX4 = 282,
-     IN_QUAL = 283,
-     OUT_QUAL = 284,
-     INOUT_QUAL = 285,
-     UNIFORM = 286,
-     VARYING = 287,
-     STRUCT = 288,
-     VOID_TYPE = 289,
-     WHILE = 290,
-     SAMPLER1D = 291,
-     SAMPLER2D = 292,
-     SAMPLER3D = 293,
-     SAMPLERCUBE = 294,
-     SAMPLER1DSHADOW = 295,
-     SAMPLER2DSHADOW = 296,
-     IDENTIFIER = 297,
-     TYPE_NAME = 298,
-     FLOATCONSTANT = 299,
-     INTCONSTANT = 300,
-     BOOLCONSTANT = 301,
-     FIELD_SELECTION = 302,
-     LEFT_OP = 303,
-     RIGHT_OP = 304,
-     INC_OP = 305,
-     DEC_OP = 306,
-     LE_OP = 307,
-     GE_OP = 308,
-     EQ_OP = 309,
-     NE_OP = 310,
-     AND_OP = 311,
-     OR_OP = 312,
-     XOR_OP = 313,
-     MUL_ASSIGN = 314,
-     DIV_ASSIGN = 315,
-     ADD_ASSIGN = 316,
-     MOD_ASSIGN = 317,
-     LEFT_ASSIGN = 318,
-     RIGHT_ASSIGN = 319,
-     AND_ASSIGN = 320,
-     XOR_ASSIGN = 321,
-     OR_ASSIGN = 322,
-     SUB_ASSIGN = 323,
-     LEFT_PAREN = 324,
-     RIGHT_PAREN = 325,
-     LEFT_BRACKET = 326,
-     RIGHT_BRACKET = 327,
-     LEFT_BRACE = 328,
-     RIGHT_BRACE = 329,
-     DOT = 330,
-     COMMA = 331,
-     COLON = 332,
-     EQUAL = 333,
-     SEMICOLON = 334,
-     BANG = 335,
-     DASH = 336,
-     TILDE = 337,
-     PLUS = 338,
-     STAR = 339,
-     SLASH = 340,
-     PERCENT = 341,
-     LEFT_ANGLE = 342,
-     RIGHT_ANGLE = 343,
-     VERTICAL_BAR = 344,
-     CARET = 345,
-     AMPERSAND = 346,
-     QUESTION = 347
-   };
-#endif
-#define ATTRIBUTE 258
-#define CONST_QUAL 259
-#define BOOL_TYPE 260
-#define FLOAT_TYPE 261
-#define INT_TYPE 262
-#define BREAK 263
-#define CONTINUE 264
-#define DO 265
-#define ELSE 266
-#define FOR 267
-#define IF 268
-#define DISCARD 269
-#define RETURN 270
-#define BVEC2 271
-#define BVEC3 272
-#define BVEC4 273
-#define IVEC2 274
-#define IVEC3 275
-#define IVEC4 276
-#define VEC2 277
-#define VEC3 278
-#define VEC4 279
-#define MATRIX2 280
-#define MATRIX3 281
-#define MATRIX4 282
-#define IN_QUAL 283
-#define OUT_QUAL 284
-#define INOUT_QUAL 285
-#define UNIFORM 286
-#define VARYING 287
-#define STRUCT 288
-#define VOID_TYPE 289
-#define WHILE 290
-#define SAMPLER1D 291
-#define SAMPLER2D 292
-#define SAMPLER3D 293
-#define SAMPLERCUBE 294
-#define SAMPLER1DSHADOW 295
-#define SAMPLER2DSHADOW 296
-#define IDENTIFIER 297
-#define TYPE_NAME 298
-#define FLOATCONSTANT 299
-#define INTCONSTANT 300
-#define BOOLCONSTANT 301
-#define FIELD_SELECTION 302
-#define LEFT_OP 303
-#define RIGHT_OP 304
-#define INC_OP 305
-#define DEC_OP 306
-#define LE_OP 307
-#define GE_OP 308
-#define EQ_OP 309
-#define NE_OP 310
-#define AND_OP 311
-#define OR_OP 312
-#define XOR_OP 313
-#define MUL_ASSIGN 314
-#define DIV_ASSIGN 315
-#define ADD_ASSIGN 316
-#define MOD_ASSIGN 317
-#define LEFT_ASSIGN 318
-#define RIGHT_ASSIGN 319
-#define AND_ASSIGN 320
-#define XOR_ASSIGN 321
-#define OR_ASSIGN 322
-#define SUB_ASSIGN 323
-#define LEFT_PAREN 324
-#define RIGHT_PAREN 325
-#define LEFT_BRACKET 326
-#define RIGHT_BRACKET 327
-#define LEFT_BRACE 328
-#define RIGHT_BRACE 329
-#define DOT 330
-#define COMMA 331
-#define COLON 332
-#define EQUAL 333
-#define SEMICOLON 334
-#define BANG 335
-#define DASH 336
-#define TILDE 337
-#define PLUS 338
-#define STAR 339
-#define SLASH 340
-#define PERCENT 341
-#define LEFT_ANGLE 342
-#define RIGHT_ANGLE 343
-#define VERTICAL_BAR 344
-#define CARET 345
-#define AMPERSAND 346
-#define QUESTION 347
-
-
-
-
-/* Copy the first part of user declarations.  */
-#line 39 "glslang.y"
-
-
-/* Based on:
-ANSI C Yacc grammar
-
-In 1985, Jeff Lee published his Yacc grammar (which is accompanied by a 
-matching Lex specification) for the April 30, 1985 draft version of the 
-ANSI C standard.  Tom Stockfisch reposted it to net.sources in 1987; that
-original, as mentioned in the answer to question 17.25 of the comp.lang.c
-FAQ, can be ftp'ed from ftp.uu.net, file usenet/net.sources/ansi.c.grammar.Z.
- 
-I intend to keep this version as close to the current C Standard grammar as 
-possible; please let me know if you discover discrepancies. 
-
-Jutta Degener, 1995 
-*/
-
-#include "SymbolTable.h"
-#include "ParseHelper.h"
-#include "../Public/ShaderLang.h"
-
-#ifdef _WIN32
-    #define YYPARSE_PARAM parseContext
-    #define YYPARSE_PARAM_DECL TParseContext&
-    #define YY_DECL int yylex(YYSTYPE* pyylval, TParseContext& parseContext)
-    #define YYLEX_PARAM parseContext
-#else
-    #define YYPARSE_PARAM parseContextLocal
-    #define parseContext (*((TParseContext*)(parseContextLocal)))
-    #define YY_DECL int yylex(YYSTYPE* pyylval, void* parseContextLocal)
-    #define YYLEX_PARAM (void*)(parseContextLocal)
-    extern void yyerror(char*);    
-#endif
-
-#define FRAG_VERT_ONLY(S, L) {                                                  \
-    if (parseContext.language != EShLangFragment &&                             \
-        parseContext.language != EShLangVertex) {                               \
-        parseContext.error(L, " supported in vertex/fragment shaders only ", S, "", "");   \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define VERTEX_ONLY(S, L) {                                                     \
-    if (parseContext.language != EShLangVertex) {                               \
-        parseContext.error(L, " supported in vertex shaders only ", S, "", "");            \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define FRAG_ONLY(S, L) {                                                       \
-    if (parseContext.language != EShLangFragment) {                             \
-        parseContext.error(L, " supported in fragment shaders only ", S, "", "");          \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define PACK_ONLY(S, L) {                                                       \
-    if (parseContext.language != EShLangPack) {                                 \
-        parseContext.error(L, " supported in pack shaders only ", S, "", "");              \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define UNPACK_ONLY(S, L) {                                                     \
-    if (parseContext.language != EShLangUnpack) {                               \
-        parseContext.error(L, " supported in unpack shaders only ", S, "", "");            \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define PACK_UNPACK_ONLY(S, L) {                                                \
-    if (parseContext.language != EShLangUnpack &&                               \
-        parseContext.language != EShLangPack) {                                 \
-        parseContext.error(L, " supported in pack/unpack shaders only ", S, "", "");       \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 117 "glslang.y"
-typedef union YYSTYPE {
-    struct {
-        TSourceLoc line;
-        union {
-            TString *string;
-            float f;
-            int i;
-            bool b;
-        };
-        TSymbol* symbol;
-    } lex;
-    struct {
-        TSourceLoc line;
-        TOperator op;
-        union {
-            TIntermNode* intermNode;
-            TIntermNodePair nodePair;
-            TIntermTyped* intermTypedNode;
-            TIntermAggregate* intermAggregate;
-        };
-        union {
-            TPublicType type;
-            TQualifier qualifier;
-            TFunction* function;
-            TParameter param;
-            TTypeLine typeLine;
-            TTypeList* typeList;
-        };
-    } interm;
-} YYSTYPE;
-/* Line 191 of yacc.c.  */
-#line 369 "glslang.tab.c"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-/* Copy the second part of user declarations.  */
-#line 148 "glslang.y"
-
-#ifndef _WIN32
-    extern int yylex(YYSTYPE*, void*);
-#endif
-
-
-/* Line 214 of yacc.c.  */
-#line 386 "glslang.tab.c"
-
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
-#   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
-# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
-
-
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short yyss;
-  YYSTYPE yyvs;
-  };
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
-      + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  register YYSIZE_T yyi;		\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (0)
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
-
-#endif
-
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  59
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1231
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  93
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  75
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  214
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  331
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   347
-
-#define YYTRANSLATE(YYX) 						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92
-};
-
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const unsigned short yyprhs[] =
-{
-       0,     0,     3,     5,     7,     9,    11,    13,    17,    19,
-      24,    26,    30,    33,    36,    38,    40,    43,    46,    49,
-      51,    54,    58,    61,    63,    65,    67,    69,    71,    73,
-      75,    77,    79,    81,    83,    85,    87,    89,    91,    93,
-      95,    97,    99,   102,   105,   108,   110,   112,   114,   116,
-     118,   122,   126,   130,   132,   136,   140,   142,   146,   150,
-     152,   156,   160,   164,   168,   170,   174,   178,   180,   184,
-     186,   190,   192,   196,   198,   202,   204,   208,   210,   214,
-     216,   222,   224,   228,   230,   232,   234,   236,   238,   240,
-     242,   244,   246,   248,   250,   252,   256,   258,   261,   264,
-     267,   269,   271,   274,   278,   282,   285,   291,   295,   298,
-     302,   305,   306,   308,   310,   312,   314,   319,   321,   325,
-     331,   338,   344,   346,   349,   354,   360,   365,   367,   370,
-     372,   374,   376,   378,   380,   382,   384,   386,   388,   390,
-     392,   394,   396,   398,   400,   402,   404,   406,   408,   410,
-     412,   414,   416,   418,   420,   422,   424,   426,   432,   437,
-     439,   442,   446,   448,   452,   454,   459,   461,   463,   465,
-     467,   469,   471,   473,   475,   477,   480,   481,   482,   488,
-     490,   492,   495,   499,   501,   504,   506,   509,   515,   519,
-     521,   523,   528,   529,   536,   537,   546,   547,   555,   557,
-     559,   561,   562,   565,   569,   572,   575,   578,   582,   585,
-     587,   590,   592,   594,   595
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short yyrhs[] =
-{
-     164,     0,    -1,    42,    -1,    94,    -1,    45,    -1,    44,
-      -1,    46,    -1,    69,   121,    70,    -1,    95,    -1,    96,
-      71,    97,    72,    -1,    98,    -1,    96,    75,    47,    -1,
-      96,    50,    -1,    96,    51,    -1,   121,    -1,    99,    -1,
-     101,    70,    -1,   100,    70,    -1,   102,    34,    -1,   102,
-      -1,   102,   119,    -1,   101,    76,   119,    -1,   103,    69,
-      -1,   104,    -1,    42,    -1,     6,    -1,     7,    -1,     5,
-      -1,    22,    -1,    23,    -1,    24,    -1,    16,    -1,    17,
-      -1,    18,    -1,    19,    -1,    20,    -1,    21,    -1,    25,
-      -1,    26,    -1,    27,    -1,    43,    -1,    96,    -1,    50,
-     105,    -1,    51,   105,    -1,   106,   105,    -1,    83,    -1,
-      81,    -1,    80,    -1,    82,    -1,   105,    -1,   107,    84,
-     105,    -1,   107,    85,   105,    -1,   107,    86,   105,    -1,
-     107,    -1,   108,    83,   107,    -1,   108,    81,   107,    -1,
-     108,    -1,   109,    48,   108,    -1,   109,    49,   108,    -1,
-     109,    -1,   110,    87,   109,    -1,   110,    88,   109,    -1,
-     110,    52,   109,    -1,   110,    53,   109,    -1,   110,    -1,
-     111,    54,   110,    -1,   111,    55,   110,    -1,   111,    -1,
-     112,    91,   111,    -1,   112,    -1,   113,    90,   112,    -1,
-     113,    -1,   114,    89,   113,    -1,   114,    -1,   115,    56,
-     114,    -1,   115,    -1,   116,    58,   115,    -1,   116,    -1,
-     117,    57,   116,    -1,   117,    -1,   117,    92,   121,    77,
-     119,    -1,   118,    -1,   105,   120,   119,    -1,    78,    -1,
-      59,    -1,    60,    -1,    62,    -1,    61,    -1,    68,    -1,
-      63,    -1,    64,    -1,    65,    -1,    66,    -1,    67,    -1,
-     119,    -1,   121,    76,   119,    -1,   118,    -1,   124,    79,
-      -1,   132,    79,    -1,   125,    70,    -1,   127,    -1,   126,
-      -1,   127,   129,    -1,   126,    76,   129,    -1,   134,    42,
-      69,    -1,   136,    42,    -1,   136,    42,    71,   122,    72,
-      -1,   135,   130,   128,    -1,   130,   128,    -1,   135,   130,
-     131,    -1,   130,   131,    -1,    -1,    28,    -1,    29,    -1,
-      30,    -1,   136,    -1,   136,    71,   122,    72,    -1,   133,
-      -1,   132,    76,    42,    -1,   132,    76,    42,    71,    72,
-      -1,   132,    76,    42,    71,   122,    72,    -1,   132,    76,
-      42,    78,   142,    -1,   134,    -1,   134,    42,    -1,   134,
-      42,    71,    72,    -1,   134,    42,    71,   122,    72,    -1,
-     134,    42,    78,   142,    -1,   136,    -1,   135,   136,    -1,
-       4,    -1,     3,    -1,    32,    -1,    31,    -1,    34,    -1,
-       6,    -1,     7,    -1,     5,    -1,    22,    -1,    23,    -1,
-      24,    -1,    16,    -1,    17,    -1,    18,    -1,    19,    -1,
-      20,    -1,    21,    -1,    25,    -1,    26,    -1,    27,    -1,
-      36,    -1,    37,    -1,    38,    -1,    39,    -1,    40,    -1,
-      41,    -1,   137,    -1,    43,    -1,    33,    42,    73,   138,
-      74,    -1,    33,    73,   138,    74,    -1,   139,    -1,   138,
-     139,    -1,   136,   140,    79,    -1,   141,    -1,   140,    76,
-     141,    -1,    42,    -1,    42,    71,   122,    72,    -1,   119,
-      -1,   123,    -1,   146,    -1,   145,    -1,   143,    -1,   152,
-      -1,   153,    -1,   156,    -1,   163,    -1,    73,    74,    -1,
-      -1,    -1,    73,   147,   151,   148,    74,    -1,   150,    -1,
-     145,    -1,    73,    74,    -1,    73,   151,    74,    -1,   144,
-      -1,   151,   144,    -1,    79,    -1,   121,    79,    -1,    13,
-      69,   121,    70,   154,    -1,   144,    11,   144,    -1,   144,
-      -1,   121,    -1,   134,    42,    78,   142,    -1,    -1,    35,
-      69,   157,   155,    70,   149,    -1,    -1,    10,   158,   144,
-      35,    69,   121,    70,    79,    -1,    -1,    12,    69,   159,
-     160,   162,    70,   149,    -1,   152,    -1,   143,    -1,   155,
-      -1,    -1,   161,    79,    -1,   161,    79,   121,    -1,     9,
-      79,    -1,     8,    79,    -1,    15,    79,    -1,    15,   121,
-      79,    -1,    14,    79,    -1,   165,    -1,   164,   165,    -1,
-     166,    -1,   123,    -1,    -1,   124,   167,   150,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
-{
-       0,   210,   210,   245,   248,   261,   266,   271,   277,   280,
-     348,   351,   460,   470,   483,   491,   586,   590,   597,   601,
-     608,   614,   623,   629,   640,   656,   657,   658,   659,   660,
-     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
-     671,   682,   685,   695,   705,   727,   728,   729,   730,   736,
-     737,   746,   755,   767,   768,   776,   787,   788,   797,   809,
-     810,   820,   830,   840,   853,   854,   864,   877,   878,   890,
-     891,   903,   904,   916,   917,   930,   931,   944,   945,   958,
-     959,   976,   977,   990,   991,   992,   993,   994,   995,   996,
-     997,   998,   999,  1000,  1004,  1007,  1018,  1026,  1027,  1035,
-    1071,  1074,  1081,  1089,  1110,  1129,  1140,  1167,  1172,  1182,
-    1187,  1197,  1200,  1203,  1206,  1212,  1217,  1235,  1238,  1246,
-    1254,  1262,  1284,  1288,  1297,  1306,  1315,  1405,  1408,  1425,
-    1429,  1436,  1444,  1453,  1458,  1463,  1468,  1479,  1484,  1489,
-    1494,  1499,  1504,  1509,  1514,  1519,  1524,  1530,  1536,  1542,
-    1548,  1554,  1560,  1566,  1572,  1578,  1583,  1596,  1606,  1614,
-    1617,  1632,  1650,  1654,  1660,  1665,  1681,  1685,  1689,  1690,
-    1696,  1697,  1698,  1699,  1700,  1704,  1705,  1705,  1705,  1713,
-    1714,  1719,  1722,  1730,  1733,  1739,  1740,  1744,  1752,  1756,
-    1766,  1771,  1788,  1788,  1793,  1793,  1800,  1800,  1813,  1816,
-    1822,  1825,  1831,  1835,  1842,  1849,  1856,  1863,  1874,  1883,
-    1887,  1894,  1897,  1903,  1903
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "ATTRIBUTE", "CONST_QUAL", "BOOL_TYPE", 
-  "FLOAT_TYPE", "INT_TYPE", "BREAK", "CONTINUE", "DO", "ELSE", "FOR", 
-  "IF", "DISCARD", "RETURN", "BVEC2", "BVEC3", "BVEC4", "IVEC2", "IVEC3", 
-  "IVEC4", "VEC2", "VEC3", "VEC4", "MATRIX2", "MATRIX3", "MATRIX4", 
-  "IN_QUAL", "OUT_QUAL", "INOUT_QUAL", "UNIFORM", "VARYING", "STRUCT", 
-  "VOID_TYPE", "WHILE", "SAMPLER1D", "SAMPLER2D", "SAMPLER3D", 
-  "SAMPLERCUBE", "SAMPLER1DSHADOW", "SAMPLER2DSHADOW", "IDENTIFIER", 
-  "TYPE_NAME", "FLOATCONSTANT", "INTCONSTANT", "BOOLCONSTANT", 
-  "FIELD_SELECTION", "LEFT_OP", "RIGHT_OP", "INC_OP", "DEC_OP", "LE_OP", 
-  "GE_OP", "EQ_OP", "NE_OP", "AND_OP", "OR_OP", "XOR_OP", "MUL_ASSIGN", 
-  "DIV_ASSIGN", "ADD_ASSIGN", "MOD_ASSIGN", "LEFT_ASSIGN", "RIGHT_ASSIGN", 
-  "AND_ASSIGN", "XOR_ASSIGN", "OR_ASSIGN", "SUB_ASSIGN", "LEFT_PAREN", 
-  "RIGHT_PAREN", "LEFT_BRACKET", "RIGHT_BRACKET", "LEFT_BRACE", 
-  "RIGHT_BRACE", "DOT", "COMMA", "COLON", "EQUAL", "SEMICOLON", "BANG", 
-  "DASH", "TILDE", "PLUS", "STAR", "SLASH", "PERCENT", "LEFT_ANGLE", 
-  "RIGHT_ANGLE", "VERTICAL_BAR", "CARET", "AMPERSAND", "QUESTION", 
-  "$accept", "variable_identifier", "primary_expression", 
-  "postfix_expression", "integer_expression", "function_call", 
-  "function_call_generic", "function_call_header_no_parameters", 
-  "function_call_header_with_parameters", "function_call_header", 
-  "function_identifier", "constructor_identifier", "unary_expression", 
-  "unary_operator", "multiplicative_expression", "additive_expression", 
-  "shift_expression", "relational_expression", "equality_expression", 
-  "and_expression", "exclusive_or_expression", "inclusive_or_expression", 
-  "logical_and_expression", "logical_xor_expression", 
-  "logical_or_expression", "conditional_expression", 
-  "assignment_expression", "assignment_operator", "expression", 
-  "constant_expression", "declaration", "function_prototype", 
-  "function_declarator", "function_header_with_parameters", 
-  "function_header", "parameter_declarator", "parameter_declaration", 
-  "parameter_qualifier", "parameter_type_specifier", 
-  "init_declarator_list", "single_declaration", "fully_specified_type", 
-  "type_qualifier", "type_specifier", "struct_specifier", 
-  "struct_declaration_list", "struct_declaration", 
-  "struct_declarator_list", "struct_declarator", "initializer", 
-  "declaration_statement", "statement", "simple_statement", 
-  "compound_statement", "@1", "@2", "statement_no_new_scope", 
-  "compound_statement_no_new_scope", "statement_list", 
-  "expression_statement", "selection_statement", 
-  "selection_rest_statement", "condition", "iteration_statement", "@3", 
-  "@4", "@5", "for_init_statement", "conditionopt", "for_rest_statement", 
-  "jump_statement", "translation_unit", "external_declaration", 
-  "function_definition", "@6", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347
-};
-# endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
-{
-       0,    93,    94,    95,    95,    95,    95,    95,    96,    96,
-      96,    96,    96,    96,    97,    98,    99,    99,   100,   100,
-     101,   101,   102,   103,   103,   104,   104,   104,   104,   104,
-     104,   104,   104,   104,   104,   104,   104,   104,   104,   104,
-     104,   105,   105,   105,   105,   106,   106,   106,   106,   107,
-     107,   107,   107,   108,   108,   108,   109,   109,   109,   110,
-     110,   110,   110,   110,   111,   111,   111,   112,   112,   113,
-     113,   114,   114,   115,   115,   116,   116,   117,   117,   118,
-     118,   119,   119,   120,   120,   120,   120,   120,   120,   120,
-     120,   120,   120,   120,   121,   121,   122,   123,   123,   124,
-     125,   125,   126,   126,   127,   128,   128,   129,   129,   129,
-     129,   130,   130,   130,   130,   131,   131,   132,   132,   132,
-     132,   132,   133,   133,   133,   133,   133,   134,   134,   135,
-     135,   135,   135,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   137,   137,   138,
-     138,   139,   140,   140,   141,   141,   142,   143,   144,   144,
-     145,   145,   145,   145,   145,   146,   147,   148,   146,   149,
-     149,   150,   150,   151,   151,   152,   152,   153,   154,   154,
-     155,   155,   157,   156,   158,   156,   159,   156,   160,   160,
-     161,   161,   162,   162,   163,   163,   163,   163,   163,   164,
-     164,   165,   165,   167,   166
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
-{
-       0,     2,     1,     1,     1,     1,     1,     3,     1,     4,
-       1,     3,     2,     2,     1,     1,     2,     2,     2,     1,
-       2,     3,     2,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     2,     1,     1,     1,     1,     1,
-       3,     3,     3,     1,     3,     3,     1,     3,     3,     1,
-       3,     3,     3,     3,     1,     3,     3,     1,     3,     1,
-       3,     1,     3,     1,     3,     1,     3,     1,     3,     1,
-       5,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     3,     1,     2,     2,     2,
-       1,     1,     2,     3,     3,     2,     5,     3,     2,     3,
-       2,     0,     1,     1,     1,     1,     4,     1,     3,     5,
-       6,     5,     1,     2,     4,     5,     4,     1,     2,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     5,     4,     1,
-       2,     3,     1,     3,     1,     4,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     0,     0,     5,     1,
-       1,     2,     3,     1,     2,     1,     2,     5,     3,     1,
-       1,     4,     0,     6,     0,     8,     0,     7,     1,     1,
-       1,     0,     2,     3,     2,     2,     2,     3,     2,     1,
-       2,     1,     1,     0,     3
-};
-
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const unsigned char yydefact[] =
-{
-       0,   130,   129,   136,   134,   135,   140,   141,   142,   143,
-     144,   145,   137,   138,   139,   146,   147,   148,   132,   131,
-       0,   133,   149,   150,   151,   152,   153,   154,   156,   212,
-     213,     0,   101,   111,     0,   117,   122,     0,   127,   155,
-       0,   209,   211,     0,     0,    97,     0,    99,   111,   112,
-     113,   114,   102,     0,   111,     0,    98,   123,   128,     1,
-     210,     0,     0,     0,   159,     0,   214,   103,   108,   110,
-     115,     0,   118,   104,     0,     0,     0,   164,     0,   162,
-     158,   160,   136,   134,   135,     0,     0,   194,     0,     0,
-       0,     0,   140,   141,   142,   143,   144,   145,   137,   138,
-     139,   146,   147,   148,     0,     2,   156,     5,     4,     6,
-       0,     0,     0,   176,   181,   185,    47,    46,    48,    45,
-       3,     8,    41,    10,    15,     0,     0,    19,     0,    23,
-      49,     0,    53,    56,    59,    64,    67,    69,    71,    73,
-      75,    77,    79,    81,    94,     0,   167,     0,   170,   183,
-     169,   168,     0,   171,   172,   173,   174,   105,     0,   107,
-     109,     0,     0,    27,    25,    26,    31,    32,    33,    34,
-      35,    36,    28,    29,    30,    37,    38,    39,    40,   124,
-      49,    96,     0,   166,   126,   157,     0,     0,   161,   205,
-     204,     0,   196,     0,   208,   206,     0,   192,    42,    43,
-       0,   175,     0,    12,    13,     0,     0,    17,    16,     0,
-      18,    20,    22,    84,    85,    87,    86,    89,    90,    91,
-      92,    93,    88,    83,     0,    44,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   186,   182,   184,
-       0,     0,   119,     0,   121,   125,     0,   163,     0,     0,
-       0,   207,     0,     7,   177,     0,    14,    11,    21,    82,
-      50,    51,    52,    55,    54,    57,    58,    62,    63,    60,
-      61,    65,    66,    68,    70,    72,    74,    76,    78,     0,
-      95,     0,   116,   120,   165,     0,   199,   198,   201,     0,
-     190,     0,     0,     0,     9,     0,   106,     0,   200,     0,
-       0,   189,   187,     0,     0,   178,    80,     0,   202,     0,
-       0,     0,   180,   193,   179,     0,   203,   197,   188,   191,
-     195
-};
-
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short yydefgoto[] =
-{
-      -1,   120,   121,   122,   265,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   224,   145,   182,
-     146,   147,    31,    32,    33,    68,    52,    53,    69,    34,
-      35,    36,    37,    38,    39,    63,    64,    78,    79,   184,
-     148,   149,   150,   151,   202,   303,   323,   324,   152,   153,
-     154,   312,   302,   155,   262,   191,   259,   298,   309,   310,
-     156,    40,    41,    42,    46
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -297
-static const short yypact[] =
-{
-    1149,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-     -27,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-     -42,   -28,   -32,     4,    18,  -297,    19,  1188,  -297,  -297,
-    1108,  -297,  -297,   -10,  1188,  -297,    -3,  -297,    36,  -297,
-    -297,  -297,  -297,  1188,    83,    33,  -297,    -9,  -297,  -297,
-    -297,  1188,    39,  1025,  -297,   235,  -297,  -297,  -297,  -297,
-     -18,  1188,   -52,  -297,   685,   957,  1064,   -17,    20,  -297,
-    -297,  -297,    29,    45,    63,    21,    23,  -297,    75,    77,
-      66,   753,    78,    79,    81,    82,    84,    85,    87,    89,
-      90,    91,    93,    94,    95,    96,    97,  -297,  -297,  -297,
-     957,   957,   957,   120,  -297,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,     5,  -297,  -297,    98,     1,   821,   100,  -297,
-      57,   957,    42,   -56,    37,   -40,    76,    61,    80,   106,
-     111,   138,   -41,  -297,  -297,    30,  -297,   -42,  -297,  -297,
-    -297,  -297,   316,  -297,  -297,  -297,  -297,   127,   957,  -297,
-    -297,   889,   957,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,   128,  -297,  -297,  -297,   957,    39,  -297,  -297,
-    -297,   397,  -297,   957,  -297,  -297,    31,  -297,  -297,  -297,
-       3,  -297,   397,  -297,  -297,   957,   152,  -297,  -297,   957,
-    -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,  -297,  -297,   957,  -297,   957,   957,   957,   957,
-     957,   957,   957,   957,   957,   957,   957,   957,   957,   957,
-     957,   957,   957,   957,   957,   957,   957,  -297,  -297,  -297,
-     957,   129,  -297,   130,  -297,  -297,   131,  -297,   169,   549,
-      12,  -297,   617,  -297,   397,   133,   134,  -297,  -297,  -297,
-    -297,  -297,  -297,    42,    42,   -56,   -56,    37,    37,    37,
-      37,   -40,   -40,    76,    61,    80,   106,   111,   138,    60,
-    -297,   135,  -297,  -297,  -297,   137,  -297,  -297,   617,   397,
-     134,   167,   141,   140,  -297,   957,  -297,   957,  -297,   136,
-     142,   205,  -297,   143,   478,  -297,  -297,    13,   957,   478,
-     397,   957,  -297,  -297,  -297,   139,   134,  -297,  -297,  -297,
-    -297
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const short yypgoto[] =
-{
-    -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,   -53,  -297,   -91,   -89,  -143,   -97,   -20,   -16,
-     -21,   -15,   -14,   -22,  -297,   -57,   -75,  -297,   -90,  -155,
-       9,    10,  -297,  -297,  -297,   154,   175,   172,   160,  -297,
-    -297,  -257,   -19,   -33,  -297,   171,    -4,  -297,    46,  -160,
-     -25,  -107,  -296,  -297,  -297,  -297,   -84,   190,    35,     6,
-    -297,  -297,   -35,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,   224,  -297,  -297
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -101
-static const short yytable[] =
-{
-     183,   196,   254,   251,    58,   301,   253,     1,     2,    29,
-      30,    62,   233,   234,    54,    43,   244,   181,   322,   161,
-      70,   180,   200,   322,   157,   229,   162,   230,    62,    54,
-      62,   256,    49,    50,    51,    18,    19,    45,    70,     1,
-       2,   301,    47,    62,    48,   249,    44,   235,   236,    29,
-      30,   245,   211,   158,   186,   203,   204,   198,   199,    81,
-      73,    57,    74,    61,    49,    50,    51,    18,    19,    75,
-      65,   208,    81,   263,  -100,    72,   205,   209,   225,   246,
-     206,    77,   299,   325,   258,   231,   232,   183,   246,   246,
-     277,   278,   279,   280,    55,   291,   187,    56,   -27,   188,
-     189,   181,   190,   260,   181,   180,   246,   246,   180,   247,
-     261,    49,    50,    51,   -25,   266,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   226,   227,   228,   181,
-     237,   238,   -26,   180,   268,   223,   246,   305,   273,   274,
-     281,   282,   275,   276,   192,   194,   193,   -31,   -32,   269,
-     -33,   -34,   239,   -35,   -36,   289,   -28,   249,   -29,   -30,
-     -37,   329,   -38,   -39,   197,   -24,   -40,   242,   207,   212,
-     240,   290,   300,   270,   271,   272,   180,   180,   180,   180,
-     180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-     180,   180,   311,   181,   201,   241,   243,   180,   250,   267,
-     255,   292,   293,   294,   295,   304,   307,   306,   300,   313,
-     246,   314,   319,   328,   315,   318,   320,   317,   330,   283,
-     285,   321,   288,    67,   284,   159,    71,   286,   326,   287,
-     316,   160,    76,   257,   296,   327,    66,   264,     1,     2,
-      82,    83,    84,    85,    86,    87,   183,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   308,    60,   297,    18,    19,    20,    21,
-     104,    22,    23,    24,    25,    26,    27,   105,   106,   107,
-     108,   109,     0,     0,     0,   110,   111,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   112,     0,     0,     0,   113,   114,
-       0,     0,     0,     0,   115,   116,   117,   118,   119,     1,
-       2,    82,    83,    84,    85,    86,    87,     0,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,   102,   103,     0,     0,     0,    18,    19,    20,
-      21,   104,    22,    23,    24,    25,    26,    27,   105,   106,
-     107,   108,   109,     0,     0,     0,   110,   111,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   112,     0,     0,     0,   113,
-     248,     0,     0,     0,     0,   115,   116,   117,   118,   119,
-       1,     2,    82,    83,    84,    85,    86,    87,     0,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,     0,     0,     0,    18,    19,
-      20,    21,   104,    22,    23,    24,    25,    26,    27,   105,
-     106,   107,   108,   109,     0,     0,     0,   110,   111,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   112,     0,     0,     0,
-     113,     0,     0,     0,     0,     0,   115,   116,   117,   118,
-     119,     1,     2,    82,    83,    84,    85,    86,    87,     0,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,     0,     0,     0,    18,
-      19,    20,    21,   104,    22,    23,    24,    25,    26,    27,
-     105,   106,   107,   108,   109,     0,     0,     0,   110,   111,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   112,     0,     0,
-       0,    65,     1,     2,    82,    83,    84,   115,   116,   117,
-     118,   119,     0,     0,     0,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,     0,     0,     0,
-      18,    19,    20,    21,     0,    22,    23,    24,    25,    26,
-      27,   105,   106,   107,   108,   109,     0,     0,     0,   110,
-     111,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   112,     0,
-       1,     2,    82,    83,    84,     0,     0,     0,   115,   116,
-     117,   118,   119,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,     0,     0,     0,    18,    19,
-      20,    21,     0,    22,    23,    24,    25,    26,    27,   105,
-     106,   107,   108,   109,     0,     0,     0,   110,   111,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   112,     0,     0,     0,
-     163,   164,   165,     0,     0,     0,     0,   116,   117,   118,
-     119,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   105,   178,   107,
-     108,   109,     0,     0,     0,   110,   111,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   112,     0,     0,   179,   163,   164,
-     165,     0,     0,     0,     0,   116,   117,   118,   119,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   105,   178,   107,   108,   109,
-       0,     0,     0,   110,   111,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   112,     0,     0,     0,   163,   164,   165,     0,
-       0,     0,   195,   116,   117,   118,   119,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,     0,
-       0,     0,     0,     0,     0,   210,     0,     0,     0,     0,
-       0,     0,     0,   105,   178,   107,   108,   109,     0,     0,
-       0,   110,   111,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     112,     0,     0,     0,   163,   164,   165,     0,     0,     0,
-       0,   116,   117,   118,   119,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   105,   178,   107,   108,   109,     0,     0,     0,   110,
-     111,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   112,     0,
-       0,   252,   163,   164,   165,     0,     0,     0,     0,   116,
-     117,   118,   119,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   105,
-     178,   107,   108,   109,     0,     0,     0,   110,   111,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   112,     0,     0,     0,
-       3,     4,     5,     0,     0,     0,     0,   116,   117,   118,
-     119,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,     0,     0,     0,     0,     0,    20,    21,
-       0,    22,    23,    24,    25,    26,    27,     0,    28,     3,
-       4,     5,     0,     0,     0,     0,     0,     0,     0,     0,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,     0,     0,     0,     0,     0,    20,    21,    80,
-      22,    23,    24,    25,    26,    27,     0,    28,    59,     0,
-       0,     1,     2,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,     0,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,     0,     0,   185,    18,
-      19,    20,    21,     0,    22,    23,    24,    25,    26,    27,
-       0,    28,     1,     2,     3,     4,     5,     0,     0,     0,
-       0,     0,     0,     0,     0,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
-      18,    19,    20,    21,     0,    22,    23,    24,    25,    26,
-      27,     0,    28,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,     0,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,     0,     0,     0,     0,
-       0,    20,    21,     0,    22,    23,    24,    25,    26,    27,
-       0,    28
-};
-
-static const short yycheck[] =
-{
-      75,    91,   162,   158,    37,   262,   161,     3,     4,     0,
-       0,    44,    52,    53,    33,    42,    57,    74,   314,    71,
-      53,    74,   112,   319,    42,    81,    78,    83,    61,    48,
-      63,   186,    28,    29,    30,    31,    32,    79,    71,     3,
-       4,   298,    70,    76,    76,   152,    73,    87,    88,    40,
-      40,    92,   127,    71,    71,    50,    51,   110,   111,    63,
-      69,    42,    71,    73,    28,    29,    30,    31,    32,    78,
-      73,    70,    76,    70,    70,    42,    71,    76,   131,    76,
-      75,    42,    70,    70,   191,    48,    49,   162,    76,    76,
-     233,   234,   235,   236,    76,   250,    76,    79,    69,    79,
-      79,   158,    79,   193,   161,   158,    76,    76,   161,    79,
-      79,    28,    29,    30,    69,   205,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    84,    85,    86,   186,
-      54,    55,    69,   186,   209,    78,    76,    77,   229,   230,
-     237,   238,   231,   232,    69,    79,    69,    69,    69,   224,
-      69,    69,    91,    69,    69,   245,    69,   264,    69,    69,
-      69,   321,    69,    69,    69,    69,    69,    56,    70,    69,
-      90,   246,   262,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   299,   250,    74,    89,    58,   250,    71,    47,
-      72,    72,    72,    72,    35,    72,    69,    72,   298,    42,
-      76,    70,    70,   320,    74,    79,    11,   307,    79,   239,
-     241,    78,   244,    48,   240,    71,    54,   242,   318,   243,
-     305,    71,    61,   187,   259,   319,    46,   202,     3,     4,
-       5,     6,     7,     8,     9,    10,   321,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,   298,    40,   259,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    -1,    -1,    -1,    50,    51,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    69,    -1,    -1,    -1,    73,    74,
-      -1,    -1,    -1,    -1,    79,    80,    81,    82,    83,     3,
-       4,     5,     6,     7,     8,     9,    10,    -1,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    -1,    -1,    -1,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    -1,    -1,    -1,    50,    51,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    69,    -1,    -1,    -1,    73,
-      74,    -1,    -1,    -1,    -1,    79,    80,    81,    82,    83,
-       3,     4,     5,     6,     7,     8,     9,    10,    -1,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    -1,    -1,    -1,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    -1,    -1,    -1,    50,    51,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    69,    -1,    -1,    -1,
-      73,    -1,    -1,    -1,    -1,    -1,    79,    80,    81,    82,
-      83,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    -1,    -1,    -1,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    -1,    -1,    -1,    50,    51,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    69,    -1,    -1,
-      -1,    73,     3,     4,     5,     6,     7,    79,    80,    81,
-      82,    83,    -1,    -1,    -1,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    -1,
-      31,    32,    33,    34,    -1,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    -1,    -1,    -1,    50,
-      51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    69,    -1,
-       3,     4,     5,     6,     7,    -1,    -1,    -1,    79,    80,
-      81,    82,    83,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    -1,    -1,    -1,    31,    32,
-      33,    34,    -1,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    -1,    -1,    -1,    50,    51,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    69,    -1,    -1,    -1,
-       5,     6,     7,    -1,    -1,    -1,    -1,    80,    81,    82,
-      83,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    43,    44,
-      45,    46,    -1,    -1,    -1,    50,    51,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    69,    -1,    -1,    72,     5,     6,
-       7,    -1,    -1,    -1,    -1,    80,    81,    82,    83,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    42,    43,    44,    45,    46,
-      -1,    -1,    -1,    50,    51,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    69,    -1,    -1,    -1,     5,     6,     7,    -1,
-      -1,    -1,    79,    80,    81,    82,    83,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
-      -1,    -1,    -1,    -1,    -1,    34,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    42,    43,    44,    45,    46,    -1,    -1,
-      -1,    50,    51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      69,    -1,    -1,    -1,     5,     6,     7,    -1,    -1,    -1,
-      -1,    80,    81,    82,    83,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    42,    43,    44,    45,    46,    -1,    -1,    -1,    50,
-      51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    69,    -1,
-      -1,    72,     5,     6,     7,    -1,    -1,    -1,    -1,    80,
-      81,    82,    83,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,
-      43,    44,    45,    46,    -1,    -1,    -1,    50,    51,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    69,    -1,    -1,    -1,
-       5,     6,     7,    -1,    -1,    -1,    -1,    80,    81,    82,
-      83,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    -1,    -1,    -1,    -1,    -1,    33,    34,
-      -1,    36,    37,    38,    39,    40,    41,    -1,    43,     5,
-       6,     7,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    -1,    -1,    -1,    -1,    -1,    33,    34,    74,
-      36,    37,    38,    39,    40,    41,    -1,    43,     0,    -1,
-      -1,     3,     4,     5,     6,     7,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    -1,    -1,    74,    31,
-      32,    33,    34,    -1,    36,    37,    38,    39,    40,    41,
-      -1,    43,     3,     4,     5,     6,     7,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    -1,
-      31,    32,    33,    34,    -1,    36,    37,    38,    39,    40,
-      41,    -1,    43,     5,     6,     7,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    -1,    -1,    -1,    -1,
-      -1,    33,    34,    -1,    36,    37,    38,    39,    40,    41,
-      -1,    43
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
-{
-       0,     3,     4,     5,     6,     7,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    31,    32,
-      33,    34,    36,    37,    38,    39,    40,    41,    43,   123,
-     124,   125,   126,   127,   132,   133,   134,   135,   136,   137,
-     164,   165,   166,    42,    73,    79,   167,    70,    76,    28,
-      29,    30,   129,   130,   135,    76,    79,    42,   136,     0,
-     165,    73,   136,   138,   139,    73,   150,   129,   128,   131,
-     136,   130,    42,    69,    71,    78,   138,    42,   140,   141,
-      74,   139,     5,     6,     7,     8,     9,    10,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    35,    42,    43,    44,    45,    46,
-      50,    51,    69,    73,    74,    79,    80,    81,    82,    83,
-      94,    95,    96,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   121,   123,   124,   143,   144,
-     145,   146,   151,   152,   153,   156,   163,    42,    71,   128,
-     131,    71,    78,     5,     6,     7,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    43,    72,
-     105,   118,   122,   119,   142,    74,    71,    76,    79,    79,
-      79,   158,    69,    69,    79,    79,   121,    69,   105,   105,
-     121,    74,   147,    50,    51,    71,    75,    70,    70,    76,
-      34,   119,    69,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    78,   120,   105,    84,    85,    86,    81,
-      83,    48,    49,    52,    53,    87,    88,    54,    55,    91,
-      90,    89,    56,    58,    57,    92,    76,    79,    74,   144,
-      71,   122,    72,   122,   142,    72,   122,   141,   144,   159,
-     121,    79,   157,    70,   151,    97,   121,    47,   119,   119,
-     105,   105,   105,   107,   107,   108,   108,   109,   109,   109,
-     109,   110,   110,   111,   112,   113,   114,   115,   116,   121,
-     119,   122,    72,    72,    72,    35,   143,   152,   160,    70,
-     121,   134,   155,   148,    72,    77,    72,    69,   155,   161,
-     162,   144,   154,    42,    70,    74,   119,   121,    79,    70,
-      11,    78,   145,   149,   150,    70,   121,   149,   144,   142,
-      79
-};
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-
-#define YYFAIL		goto yyerrlab
-
-#define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
-      YYERROR;							\
-    }								\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
-#endif
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (0)
-
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded).                                                   |
-`------------------------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_stack_print (short *bottom, short *top)
-#else
-static void
-yy_stack_print (bottom, top)
-    short *bottom;
-    short *top;
-#endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (0)
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_reduce_print (int yyrule)
-#else
-static void
-yy_reduce_print (yyrule)
-    int yyrule;
-#endif
-{
-  int yyi;
-  unsigned int yylineno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylineno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
-{
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
-    continue;
-
-  return yys - yystr - 1;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
-{
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-#endif /* !YYERROR_VERBOSE */
-
-
-
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-  YYFPRINTF (yyoutput, ")");
-}
-
-#endif /* ! YYDEBUG */
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yytype, yyvaluep)
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
-}
-
-
-/* Prevent warnings from -Wmissing-prototypes.  */
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM);
-# else
-int yyparse ();
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-
-
-
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
-{
-  /* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-  register int yystate;
-  register int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
-
-
-
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack. Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
-
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
-
-      {
-	short *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyoverflowlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
-#  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
-
-      if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 2:
-#line 210 "glslang.y"
-    {
-        // The symbol table search was done in the lexical phase
-        const TSymbol* symbol = yyvsp[0].lex.symbol;
-        const TVariable* variable;
-        if (symbol == 0) {
-            parseContext.error(yyvsp[0].lex.line, "undeclared identifier", yyvsp[0].lex.string->c_str(), "");
-            parseContext.recover();
-            TType type(EbtFloat);
-            TVariable* fakeVariable = new TVariable(yyvsp[0].lex.string, type);
-            parseContext.symbolTable.insert(*fakeVariable);
-            variable = fakeVariable;
-        } else {
-            // This identifier can only be a variable type symbol 
-            if (! symbol->isVariable()) {
-                parseContext.error(yyvsp[0].lex.line, "variable expected", yyvsp[0].lex.string->c_str(), "");
-                parseContext.recover();
-            }
-            variable = static_cast<const TVariable*>(symbol);
-        }
-
-        // don't delete $1.string, it's used by error recovery, and the pool
-        // pop will reclaim the memory
-
-        if (variable->getType().getQualifier() == EvqConst ) {
-            constUnion* constArray = variable->getConstPointer();
-            TType t(variable->getType());
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(constArray, t, yyvsp[0].lex.line);        
-        } else
-            yyval.interm.intermTypedNode = parseContext.intermediate.addSymbol(variable->getUniqueId(), 
-                                                     variable->getName(), 
-                                                     variable->getType(), yyvsp[0].lex.line);
-    ;}
-    break;
-
-  case 3:
-#line 245 "glslang.y"
-    {
-        yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 4:
-#line 248 "glslang.y"
-    {
-        //
-        // INT_TYPE is only 16-bit plus sign bit for vertex/fragment shaders, 
-        // check for overflow for constants
-        //
-        if (abs(yyvsp[0].lex.i) >= (1 << 16)) {
-            parseContext.error(yyvsp[0].lex.line, " integer constant overflow", "", "");
-            parseContext.recover();
-        }
-        constUnion *unionArray = new constUnion[1];
-        unionArray->iConst = yyvsp[0].lex.i;
-        yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), yyvsp[0].lex.line);
-    ;}
-    break;
-
-  case 5:
-#line 261 "glslang.y"
-    {
-        constUnion *unionArray = new constUnion[1];
-        unionArray->fConst = yyvsp[0].lex.f;
-        yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtFloat, EvqConst), yyvsp[0].lex.line);
-    ;}
-    break;
-
-  case 6:
-#line 266 "glslang.y"
-    {
-        constUnion *unionArray = new constUnion[1];
-        unionArray->bConst = yyvsp[0].lex.b;
-        yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[0].lex.line);
-    ;}
-    break;
-
-  case 7:
-#line 271 "glslang.y"
-    {
-        yyval.interm.intermTypedNode = yyvsp[-1].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 8:
-#line 277 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 9:
-#line 280 "glslang.y"
-    {
-        if (!yyvsp[-3].interm.intermTypedNode->isArray() && !yyvsp[-3].interm.intermTypedNode->isMatrix() && !yyvsp[-3].interm.intermTypedNode->isVector()) {
-            if (yyvsp[-3].interm.intermTypedNode->getAsSymbolNode())
-                parseContext.error(yyvsp[-2].lex.line, " left of '[' is not of type array, matrix, or vector ", yyvsp[-3].interm.intermTypedNode->getAsSymbolNode()->getSymbol().c_str(), "");
-            else
-                parseContext.error(yyvsp[-2].lex.line, " left of '[' is not of type array, matrix, or vector ", "expression", "");
-            parseContext.recover();
-        }
-        if (yyvsp[-3].interm.intermTypedNode->getType().getQualifier() == EvqConst && !yyvsp[-3].interm.intermTypedNode->isArray() && yyvsp[-1].interm.intermTypedNode->getQualifier() == EvqConst) {
-             if (yyvsp[-3].interm.intermTypedNode->isVector()) {  // constant folding for vectors
-                TVectorFields fields;
-                fields.num = 1;
-                fields.offsets[0] = yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst; // need to do it this way because v.xy sends fields integer array
-                yyval.interm.intermTypedNode = parseContext.addConstVectorNode(fields, yyvsp[-3].interm.intermTypedNode, yyvsp[-2].lex.line);
-            } else if (yyvsp[-3].interm.intermTypedNode->isMatrix()) { // constant folding for matrices
-                yyval.interm.intermTypedNode = parseContext.addConstMatrixNode(yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst, yyvsp[-3].interm.intermTypedNode, yyvsp[-2].lex.line);
-            }
-        } else {
-            if (yyvsp[-1].interm.intermTypedNode->getQualifier() == EvqConst) {
-                if ((yyvsp[-3].interm.intermTypedNode->isVector() || yyvsp[-3].interm.intermTypedNode->isMatrix()) && yyvsp[-3].interm.intermTypedNode->getType().getNominalSize() <= yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst && !yyvsp[-3].interm.intermTypedNode->isArray() ) {
-                    parseContext.error(yyvsp[-2].lex.line, "", "[", "field selection out of range '%d'", yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-                    parseContext.recover();
-                } else {
-                    if (yyvsp[-3].interm.intermTypedNode->isArray()) {
-                        if (yyvsp[-3].interm.intermTypedNode->getType().getArraySize() == 0) {
-                            if (yyvsp[-3].interm.intermTypedNode->getType().getMaxArraySize() <= yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst) {
-                                if (parseContext.arraySetMaxSize(yyvsp[-3].interm.intermTypedNode->getAsSymbolNode(), yyvsp[-3].interm.intermTypedNode->getTypePointer(), yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst, true, yyvsp[-2].lex.line))
-                                    parseContext.recover(); 
-                            } else {
-                                if (parseContext.arraySetMaxSize(yyvsp[-3].interm.intermTypedNode->getAsSymbolNode(), yyvsp[-3].interm.intermTypedNode->getTypePointer(), 0, false, yyvsp[-2].lex.line))
-                                    parseContext.recover(); 
-                            }
-                        } else if ( yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst >= yyvsp[-3].interm.intermTypedNode->getType().getArraySize()) {
-                            parseContext.error(yyvsp[-2].lex.line, "", "[", "array index out of range '%d'", yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-                            parseContext.recover();
-                        }
-                    }
-                    yyval.interm.intermTypedNode = parseContext.intermediate.addIndex(EOpIndexDirect, yyvsp[-3].interm.intermTypedNode, yyvsp[-1].interm.intermTypedNode, yyvsp[-2].lex.line);
-                }
-            } else {
-                if (yyvsp[-3].interm.intermTypedNode->isArray() && yyvsp[-3].interm.intermTypedNode->getType().getArraySize() == 0) {
-                    parseContext.error(yyvsp[-2].lex.line, "", "[", "array must be redeclared with a size before being indexed with a variable");
-                    parseContext.recover();
-                }
-                
-                yyval.interm.intermTypedNode = parseContext.intermediate.addIndex(EOpIndexIndirect, yyvsp[-3].interm.intermTypedNode, yyvsp[-1].interm.intermTypedNode, yyvsp[-2].lex.line);
-            }
-        } 
-        if (yyval.interm.intermTypedNode == 0) {
-            constUnion *unionArray = new constUnion[1];
-            unionArray->fConst = 0.0;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtFloat, EvqConst), yyvsp[-2].lex.line);
-        } else if (yyvsp[-3].interm.intermTypedNode->isArray()) {
-            if (yyvsp[-3].interm.intermTypedNode->getType().getStruct())
-                yyval.interm.intermTypedNode->setType(TType(yyvsp[-3].interm.intermTypedNode->getType().getStruct(), yyvsp[-3].interm.intermTypedNode->getType().getTypeName()));
-            else
-                yyval.interm.intermTypedNode->setType(TType(yyvsp[-3].interm.intermTypedNode->getBasicType(), EvqTemporary, yyvsp[-3].interm.intermTypedNode->getNominalSize(), yyvsp[-3].interm.intermTypedNode->isMatrix()));
-        } else if (yyvsp[-3].interm.intermTypedNode->isMatrix() && yyvsp[-3].interm.intermTypedNode->getType().getQualifier() == EvqConst)         
-            yyval.interm.intermTypedNode->setType(TType(yyvsp[-3].interm.intermTypedNode->getBasicType(), EvqConst, yyvsp[-3].interm.intermTypedNode->getNominalSize()));     
-        else if (yyvsp[-3].interm.intermTypedNode->isMatrix())            
-            yyval.interm.intermTypedNode->setType(TType(yyvsp[-3].interm.intermTypedNode->getBasicType(), EvqTemporary, yyvsp[-3].interm.intermTypedNode->getNominalSize()));     
-        else if (yyvsp[-3].interm.intermTypedNode->isVector() && yyvsp[-3].interm.intermTypedNode->getType().getQualifier() == EvqConst)          
-            yyval.interm.intermTypedNode->setType(TType(yyvsp[-3].interm.intermTypedNode->getBasicType(), EvqConst));     
-        else if (yyvsp[-3].interm.intermTypedNode->isVector())       
-            yyval.interm.intermTypedNode->setType(TType(yyvsp[-3].interm.intermTypedNode->getBasicType(), EvqTemporary));
-        else
-            yyval.interm.intermTypedNode->setType(yyvsp[-3].interm.intermTypedNode->getType()); 
-    ;}
-    break;
-
-  case 10:
-#line 348 "glslang.y"
-    {
-        yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 11:
-#line 351 "glslang.y"
-    {        
-        if (yyvsp[-2].interm.intermTypedNode->isArray()) {
-            parseContext.error(yyvsp[0].lex.line, "cannot apply dot operator to an array", ".", "");
-            parseContext.recover();
-        }
-
-        if (yyvsp[-2].interm.intermTypedNode->isVector()) {
-            TVectorFields fields;
-            if (! parseContext.parseVectorFields(*yyvsp[0].lex.string, yyvsp[-2].interm.intermTypedNode->getNominalSize(), fields, yyvsp[0].lex.line)) {
-                fields.num = 1;
-                fields.offsets[0] = 0;
-                parseContext.recover();
-            }
-
-            if (yyvsp[-2].interm.intermTypedNode->getType().getQualifier() == EvqConst) { // constant folding for vector fields
-                yyval.interm.intermTypedNode = parseContext.addConstVectorNode(fields, yyvsp[-2].interm.intermTypedNode, yyvsp[0].lex.line);
-                if (yyval.interm.intermTypedNode == 0) {
-                    parseContext.recover();
-                    yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-                }
-                else
-                    yyval.interm.intermTypedNode->setType(TType(yyvsp[-2].interm.intermTypedNode->getBasicType(), EvqConst, (int) (*yyvsp[0].lex.string).size()));
-            } else {
-                if (fields.num == 1) {
-                    constUnion *unionArray = new constUnion[1];
-                    unionArray->iConst = fields.offsets[0];
-                    TIntermTyped* index = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), yyvsp[0].lex.line);
-                    yyval.interm.intermTypedNode = parseContext.intermediate.addIndex(EOpIndexDirect, yyvsp[-2].interm.intermTypedNode, index, yyvsp[-1].lex.line);
-                    yyval.interm.intermTypedNode->setType(TType(yyvsp[-2].interm.intermTypedNode->getBasicType()));
-                } else {
-                    TString vectorString = *yyvsp[0].lex.string;
-                    TIntermTyped* index = parseContext.intermediate.addSwizzle(fields, yyvsp[0].lex.line);                
-                    yyval.interm.intermTypedNode = parseContext.intermediate.addIndex(EOpVectorSwizzle, yyvsp[-2].interm.intermTypedNode, index, yyvsp[-1].lex.line);
-                    yyval.interm.intermTypedNode->setType(TType(yyvsp[-2].interm.intermTypedNode->getBasicType(),EvqTemporary, (int) vectorString.size()));  
-                }
-            }
-        } else if (yyvsp[-2].interm.intermTypedNode->isMatrix()) {
-            TMatrixFields fields;
-            if (! parseContext.parseMatrixFields(*yyvsp[0].lex.string, yyvsp[-2].interm.intermTypedNode->getNominalSize(), fields, yyvsp[0].lex.line)) {
-                fields.wholeRow = false;
-                fields.wholeCol = false;
-                fields.row = 0;
-                fields.col = 0;
-                parseContext.recover();
-            }
-
-            if (fields.wholeRow || fields.wholeCol) {
-                parseContext.error(yyvsp[-1].lex.line, " non-scalar fields not implemented yet", ".", "");
-                parseContext.recover();
-                constUnion *unionArray = new constUnion[1];
-                unionArray->iConst = 0;
-                TIntermTyped* index = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), yyvsp[0].lex.line);
-                yyval.interm.intermTypedNode = parseContext.intermediate.addIndex(EOpIndexDirect, yyvsp[-2].interm.intermTypedNode, index, yyvsp[-1].lex.line);                
-                yyval.interm.intermTypedNode->setType(TType(yyvsp[-2].interm.intermTypedNode->getBasicType(), EvqTemporary, yyvsp[-2].interm.intermTypedNode->getNominalSize()));
-            } else {
-                constUnion *unionArray = new constUnion[1];
-                unionArray->iConst = fields.col * yyvsp[-2].interm.intermTypedNode->getNominalSize() + fields.row;
-                TIntermTyped* index = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), yyvsp[0].lex.line);
-                yyval.interm.intermTypedNode = parseContext.intermediate.addIndex(EOpIndexDirect, yyvsp[-2].interm.intermTypedNode, index, yyvsp[-1].lex.line);                
-                yyval.interm.intermTypedNode->setType(TType(yyvsp[-2].interm.intermTypedNode->getBasicType()));
-            }
-        } else if (yyvsp[-2].interm.intermTypedNode->getBasicType() == EbtStruct) {
-            bool fieldFound = false;
-            TTypeList* fields = yyvsp[-2].interm.intermTypedNode->getType().getStruct();
-            if (fields == 0) {
-                parseContext.error(yyvsp[-1].lex.line, "structure has no fields", "Internal Error", "");
-                parseContext.recover();
-                yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-            } else {
-                unsigned int i;
-                for (i = 0; i < fields->size(); ++i) {
-                    if ((*fields)[i].type->getFieldName() == *yyvsp[0].lex.string) {
-                        fieldFound = true;
-                        break;
-                    }                
-                }
-                if (fieldFound) {
-                    if (yyvsp[-2].interm.intermTypedNode->getType().getQualifier() == EvqConst) {
-                        yyval.interm.intermTypedNode = parseContext.addConstStruct(*yyvsp[0].lex.string, yyvsp[-2].interm.intermTypedNode, yyvsp[-1].lex.line);
-                        if (yyval.interm.intermTypedNode == 0) {
-                            parseContext.recover();
-                            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-                        }
-                        else {
-                            yyval.interm.intermTypedNode->setType(*(*fields)[i].type);
-                            // change the qualifier of the return type, not of the structure field
-                            // as the structure definition is shared between various structures.
-                            yyval.interm.intermTypedNode->getTypePointer()->changeQualifier(EvqConst);
-                        }
-                    } else {
-                        constUnion *unionArray = new constUnion[1];
-                        unionArray->iConst = i;
-                        TIntermTyped* index = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), yyvsp[0].lex.line);
-                        yyval.interm.intermTypedNode = parseContext.intermediate.addIndex(EOpIndexDirectStruct, yyvsp[-2].interm.intermTypedNode, index, yyvsp[-1].lex.line);                
-                        yyval.interm.intermTypedNode->setType(*(*fields)[i].type);
-                    }
-                } else {
-                    parseContext.error(yyvsp[-1].lex.line, " no such field in structure", yyvsp[0].lex.string->c_str(), "");
-                    parseContext.recover();
-                    yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-                }
-            }
-        } else {
-            parseContext.error(yyvsp[-1].lex.line, " field selection requires structure, vector, or matrix on left hand side", yyvsp[0].lex.string->c_str(), "");
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-        // don't delete $3.string, it's from the pool
-    ;}
-    break;
-
-  case 12:
-#line 460 "glslang.y"
-    {
-        if (parseContext.lValueErrorCheck(yyvsp[0].lex.line, "++", yyvsp[-1].interm.intermTypedNode))
-            parseContext.recover();
-        yyval.interm.intermTypedNode = parseContext.intermediate.addUnaryMath(EOpPostIncrement, yyvsp[-1].interm.intermTypedNode, yyvsp[0].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.unaryOpError(yyvsp[0].lex.line, "++", yyvsp[-1].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-1].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 13:
-#line 470 "glslang.y"
-    {
-        if (parseContext.lValueErrorCheck(yyvsp[0].lex.line, "--", yyvsp[-1].interm.intermTypedNode))
-            parseContext.recover();
-        yyval.interm.intermTypedNode = parseContext.intermediate.addUnaryMath(EOpPostDecrement, yyvsp[-1].interm.intermTypedNode, yyvsp[0].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.unaryOpError(yyvsp[0].lex.line, "--", yyvsp[-1].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-1].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 14:
-#line 483 "glslang.y"
-    {
-        if (parseContext.integerErrorCheck(yyvsp[0].interm.intermTypedNode, "[]"))
-            parseContext.recover();
-        yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; 
-    ;}
-    break;
-
-  case 15:
-#line 491 "glslang.y"
-    {
-        TFunction* fnCall = yyvsp[0].interm.function;
-        TOperator op = fnCall->getBuiltInOp();
-        
-        if (op != EOpNull) {
-            //
-            // Then this should be a constructor.
-            //
-            TType type(EbtVoid);  // use this to get the type back
-            if (parseContext.constructorErrorCheck(yyvsp[0].interm.line, yyvsp[0].interm.intermNode, *fnCall, op, &type)) {
-                yyval.interm.intermTypedNode = 0;
-            } else {
-                //
-                // It's a constructor, of type 'type'.
-                //
-                yyval.interm.intermTypedNode = parseContext.addConstructor(yyvsp[0].interm.intermNode, &type, op, fnCall, yyvsp[0].interm.line);
-            }
-            
-            if (yyval.interm.intermTypedNode == 0) {        
-                parseContext.recover();
-                yyval.interm.intermTypedNode = parseContext.intermediate.setAggregateOperator(0, op, yyvsp[0].interm.line);
-            }
-            yyval.interm.intermTypedNode->setType(type);
-        } else {
-            //
-            // Not a constructor.  Find it in the symbol table.
-            //
-            const TFunction* fnCandidate;
-            bool builtIn;
-            fnCandidate = parseContext.findFunction(yyvsp[0].interm.line, fnCall, &builtIn);
-            if (fnCandidate) {
-                //
-                // A declared function.  But, it might still map to a built-in
-                // operation.
-                //
-                op = fnCandidate->getBuiltInOp();
-                if (builtIn && op != EOpNull) {
-                    //
-                    // A function call mapped to a built-in operation.
-                    //
-                    if (fnCandidate->getParamCount() == 1) {
-                        //
-                        // Treat it like a built-in unary operator.
-                        //
-                        yyval.interm.intermTypedNode = parseContext.intermediate.addUnaryMath(op, yyvsp[0].interm.intermNode, 0, parseContext.symbolTable);
-                        if (yyval.interm.intermTypedNode == 0)  {
-                            parseContext.error(yyvsp[0].interm.intermNode->getLine(), " wrong operand type", "Internal Error", 
-                                "built in unary operator function.  Type: %s",
-                                static_cast<TIntermTyped*>(yyvsp[0].interm.intermNode)->getCompleteString().c_str());
-                            YYERROR;
-                        }
-                    } else {
-                        yyval.interm.intermTypedNode = parseContext.intermediate.setAggregateOperator(yyvsp[0].interm.intermAggregate, op, yyvsp[0].interm.line);
-                    }
-                } else {
-                    // This is a real function call
-                    
-                    yyval.interm.intermTypedNode = parseContext.intermediate.setAggregateOperator(yyvsp[0].interm.intermAggregate, EOpFunctionCall, yyvsp[0].interm.line);
-                    yyval.interm.intermTypedNode->setType(fnCandidate->getReturnType());                   
-                    
-                    // this is how we know whether the given function is a builtIn function or a user defined function
-                    // if builtIn == false, it's a userDefined -> could be an overloaded builtIn function also
-                    // if builtIn == true, it's definitely a builtIn function with EOpNull
-                    if (!builtIn) 
-                        yyval.interm.intermTypedNode->getAsAggregate()->setUserDefined(); 
-                    yyval.interm.intermTypedNode->getAsAggregate()->setName(fnCandidate->getMangledName());
-
-                    TQualifier qual;
-                    TQualifierList& qualifierList = yyval.interm.intermTypedNode->getAsAggregate()->getQualifier();
-                    for (int i = 0; i < fnCandidate->getParamCount(); ++i) {
-                        qual = (*fnCandidate)[i].type->getQualifier();
-                        if (qual == EvqOut || qual == EvqInOut) {
-                            if (parseContext.lValueErrorCheck(yyval.interm.intermTypedNode->getLine(), "assign", yyval.interm.intermTypedNode->getAsAggregate()->getSequence()[i]->getAsTyped())) {
-                                parseContext.error(yyvsp[0].interm.intermNode->getLine(), "Constant value cannot be passed for 'out' or 'inout' parameters.", "Error", "");
-                                parseContext.recover();
-                            }
-                        }
-                        qualifierList.push_back(qual);
-                    }
-                }
-                yyval.interm.intermTypedNode->setType(fnCandidate->getReturnType());
-            } else {
-                // error message was put out by PaFindFunction()
-                // Put on a dummy node for error recovery
-                constUnion *unionArray = new constUnion[1];
-                unionArray->fConst = 0.0;
-                yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtFloat, EvqConst), yyvsp[0].interm.line);
-                parseContext.recover();
-            }
-        }
-        delete fnCall;
-    ;}
-    break;
-
-  case 16:
-#line 586 "glslang.y"
-    {
-        yyval.interm = yyvsp[-1].interm;
-        yyval.interm.line = yyvsp[0].lex.line;
-    ;}
-    break;
-
-  case 17:
-#line 590 "glslang.y"
-    {
-        yyval.interm = yyvsp[-1].interm;
-        yyval.interm.line = yyvsp[0].lex.line;
-    ;}
-    break;
-
-  case 18:
-#line 597 "glslang.y"
-    {
-        yyval.interm.function = yyvsp[-1].interm.function;
-        yyval.interm.intermNode = 0;
-    ;}
-    break;
-
-  case 19:
-#line 601 "glslang.y"
-    {
-        yyval.interm.function = yyvsp[0].interm.function;
-        yyval.interm.intermNode = 0;
-    ;}
-    break;
-
-  case 20:
-#line 608 "glslang.y"
-    {
-        TParameter param = { 0, new TType(yyvsp[0].interm.intermTypedNode->getType()) };
-        yyvsp[-1].interm.function->addParameter(param);
-        yyval.interm.function = yyvsp[-1].interm.function;
-        yyval.interm.intermNode = yyvsp[0].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 21:
-#line 614 "glslang.y"
-    {
-        TParameter param = { 0, new TType(yyvsp[0].interm.intermTypedNode->getType()) };
-        yyvsp[-2].interm.function->addParameter(param);
-        yyval.interm.function = yyvsp[-2].interm.function;
-        yyval.interm.intermNode = parseContext.intermediate.growAggregate(yyvsp[-2].interm.intermNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line);
-    ;}
-    break;
-
-  case 22:
-#line 623 "glslang.y"
-    {
-        yyval.interm.function = yyvsp[-1].interm.function;
-    ;}
-    break;
-
-  case 23:
-#line 629 "glslang.y"
-    {
-        if (yyvsp[0].interm.op == EOpConstructStruct) {
-            TString tempString = "";
-            TFunction *function = new TFunction(&tempString, *(yyvsp[0].interm.type.userDef), yyvsp[0].interm.op);
-            yyval.interm.function = function;
-        }
-        else {
-            TFunction *function = new TFunction(yyvsp[0].interm.op);
-            yyval.interm.function = function;
-        }
-    ;}
-    break;
-
-  case 24:
-#line 640 "glslang.y"
-    {
-        if (parseContext.reservedErrorCheck(yyvsp[0].lex.line, *yyvsp[0].lex.string)) 
-            parseContext.recover();
-        TType type(EbtVoid);
-        TFunction *function = new TFunction(yyvsp[0].lex.string, type);
-        yyval.interm.function = function;        
-    ;}
-    break;
-
-  case 25:
-#line 656 "glslang.y"
-    {                                   yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructFloat; ;}
-    break;
-
-  case 26:
-#line 657 "glslang.y"
-    {                                   yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructInt;   ;}
-    break;
-
-  case 27:
-#line 658 "glslang.y"
-    {                                   yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructBool;  ;}
-    break;
-
-  case 28:
-#line 659 "glslang.y"
-    {                                   yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructVec2;  ;}
-    break;
-
-  case 29:
-#line 660 "glslang.y"
-    {                                   yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructVec3;  ;}
-    break;
-
-  case 30:
-#line 661 "glslang.y"
-    {                                   yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructVec4;  ;}
-    break;
-
-  case 31:
-#line 662 "glslang.y"
-    { FRAG_VERT_ONLY("bvec2", yyvsp[0].lex.line); yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructBVec2; ;}
-    break;
-
-  case 32:
-#line 663 "glslang.y"
-    { FRAG_VERT_ONLY("bvec3", yyvsp[0].lex.line); yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructBVec3; ;}
-    break;
-
-  case 33:
-#line 664 "glslang.y"
-    { FRAG_VERT_ONLY("bvec4", yyvsp[0].lex.line); yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructBVec4; ;}
-    break;
-
-  case 34:
-#line 665 "glslang.y"
-    { FRAG_VERT_ONLY("ivec2", yyvsp[0].lex.line); yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructIVec2; ;}
-    break;
-
-  case 35:
-#line 666 "glslang.y"
-    { FRAG_VERT_ONLY("ivec3", yyvsp[0].lex.line); yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructIVec3; ;}
-    break;
-
-  case 36:
-#line 667 "glslang.y"
-    { FRAG_VERT_ONLY("ivec4", yyvsp[0].lex.line); yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructIVec4; ;}
-    break;
-
-  case 37:
-#line 668 "glslang.y"
-    { FRAG_VERT_ONLY("mat2", yyvsp[0].lex.line);  yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructMat2;  ;}
-    break;
-
-  case 38:
-#line 669 "glslang.y"
-    { FRAG_VERT_ONLY("mat3", yyvsp[0].lex.line);  yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructMat3;  ;}
-    break;
-
-  case 39:
-#line 670 "glslang.y"
-    { FRAG_VERT_ONLY("mat4", yyvsp[0].lex.line);  yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpConstructMat4;  ;}
-    break;
-
-  case 40:
-#line 671 "glslang.y"
-    {                                   
-        TType& structure = static_cast<TVariable*>(yyvsp[0].lex.symbol)->getType();
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtStruct, qual, 1, false, false, &structure, yyvsp[0].lex.line }; 
-        yyval.interm.type = t;
-        yyval.interm.line = yyvsp[0].lex.line; 
-        yyval.interm.op = EOpConstructStruct; 
-    ;}
-    break;
-
-  case 41:
-#line 682 "glslang.y"
-    {
-        yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 42:
-#line 685 "glslang.y"
-    {
-        if (parseContext.lValueErrorCheck(yyvsp[-1].lex.line, "++", yyvsp[0].interm.intermTypedNode))
-            parseContext.recover();
-        yyval.interm.intermTypedNode = parseContext.intermediate.addUnaryMath(EOpPreIncrement, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.unaryOpError(yyvsp[-1].lex.line, "++", yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 43:
-#line 695 "glslang.y"
-    {
-        if (parseContext.lValueErrorCheck(yyvsp[-1].lex.line, "--", yyvsp[0].interm.intermTypedNode))
-            parseContext.recover();
-        yyval.interm.intermTypedNode = parseContext.intermediate.addUnaryMath(EOpPreDecrement, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.unaryOpError(yyvsp[-1].lex.line, "--", yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 44:
-#line 705 "glslang.y"
-    {
-        if (yyvsp[-1].interm.op != EOpNull) {
-            yyval.interm.intermTypedNode = parseContext.intermediate.addUnaryMath(yyvsp[-1].interm.op, yyvsp[0].interm.intermTypedNode, yyvsp[-1].interm.line, parseContext.symbolTable);
-            if (yyval.interm.intermTypedNode == 0) {
-                char* errorOp = "";
-                switch(yyvsp[-1].interm.op) {
-                case EOpNegative:   errorOp = "-"; break;
-                case EOpLogicalNot: errorOp = "!"; break;
-                case EOpBitwiseNot: errorOp = "~"; break;
-				default: break;
-                }
-                parseContext.unaryOpError(yyvsp[-1].interm.line, errorOp, yyvsp[0].interm.intermTypedNode->getCompleteString());
-                parseContext.recover();
-                yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-            }
-        } else
-            yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 45:
-#line 727 "glslang.y"
-    { yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpNull; ;}
-    break;
-
-  case 46:
-#line 728 "glslang.y"
-    { yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpNegative; ;}
-    break;
-
-  case 47:
-#line 729 "glslang.y"
-    { yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpLogicalNot; ;}
-    break;
-
-  case 48:
-#line 730 "glslang.y"
-    { PACK_UNPACK_ONLY("~", yyvsp[0].lex.line);  
-              yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpBitwiseNot; ;}
-    break;
-
-  case 49:
-#line 736 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 50:
-#line 737 "glslang.y"
-    {
-        FRAG_VERT_ONLY("*", yyvsp[-1].lex.line);
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpMul, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "*", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 51:
-#line 746 "glslang.y"
-    {
-        FRAG_VERT_ONLY("/", yyvsp[-1].lex.line); 
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpDiv, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "/", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 52:
-#line 755 "glslang.y"
-    {
-        PACK_UNPACK_ONLY("%", yyvsp[-1].lex.line);
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpMod, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "%", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 53:
-#line 767 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 54:
-#line 768 "glslang.y"
-    {  
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpAdd, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "+", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 55:
-#line 776 "glslang.y"
-    {
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpSub, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "-", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        } 
-    ;}
-    break;
-
-  case 56:
-#line 787 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 57:
-#line 788 "glslang.y"
-    {
-        PACK_UNPACK_ONLY("<<", yyvsp[-1].lex.line);
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpLeftShift, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "<<", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 58:
-#line 797 "glslang.y"
-    {
-        PACK_UNPACK_ONLY(">>", yyvsp[-1].lex.line);
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpRightShift, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, ">>", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 59:
-#line 809 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 60:
-#line 810 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpLessThan, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "<", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[-1].lex.line);
-        }
-    ;}
-    break;
-
-  case 61:
-#line 820 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpGreaterThan, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, ">", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[-1].lex.line);
-        }
-    ;}
-    break;
-
-  case 62:
-#line 830 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpLessThanEqual, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "<=", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[-1].lex.line);
-        }
-    ;}
-    break;
-
-  case 63:
-#line 840 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpGreaterThanEqual, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, ">=", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[-1].lex.line);
-        }
-    ;}
-    break;
-
-  case 64:
-#line 853 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 65:
-#line 854 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpEqual, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "==", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[-1].lex.line);
-        }
-    ;}
-    break;
-
-  case 66:
-#line 864 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpNotEqual, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "!=", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[-1].lex.line);
-        }
-    ;}
-    break;
-
-  case 67:
-#line 877 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 68:
-#line 878 "glslang.y"
-    {
-        PACK_UNPACK_ONLY("&", yyvsp[-1].lex.line);
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpAnd, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "&", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 69:
-#line 890 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 70:
-#line 891 "glslang.y"
-    {
-        PACK_UNPACK_ONLY("^", yyvsp[-1].lex.line);
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpExclusiveOr, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "^", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 71:
-#line 903 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 72:
-#line 904 "glslang.y"
-    {
-        PACK_UNPACK_ONLY("|", yyvsp[-1].lex.line);
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpInclusiveOr, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "|", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 73:
-#line 916 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 74:
-#line 917 "glslang.y"
-    {
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpLogicalAnd, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "&&", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[-1].lex.line);
-        }
-    ;}
-    break;
-
-  case 75:
-#line 930 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 76:
-#line 931 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpLogicalXor, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "^^", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[-1].lex.line);
-        }
-    ;}
-    break;
-
-  case 77:
-#line 944 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 78:
-#line 945 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = parseContext.intermediate.addBinaryMath(EOpLogicalOr, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line, parseContext.symbolTable);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, "||", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            yyval.interm.intermTypedNode = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), yyvsp[-1].lex.line);
-        }
-    ;}
-    break;
-
-  case 79:
-#line 958 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 80:
-#line 959 "glslang.y"
-    {
-       if (parseContext.boolErrorCheck(yyvsp[-3].lex.line, yyvsp[-4].interm.intermTypedNode))
-            parseContext.recover();
-       
-        yyval.interm.intermTypedNode = parseContext.intermediate.addSelection(yyvsp[-4].interm.intermTypedNode, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-3].lex.line);
-        if (yyvsp[-2].interm.intermTypedNode->getType() != yyvsp[0].interm.intermTypedNode->getType())
-            yyval.interm.intermTypedNode = 0;
-            
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-3].lex.line, ":", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 81:
-#line 976 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 82:
-#line 977 "glslang.y"
-    {
-        if (parseContext.lValueErrorCheck(yyvsp[-1].interm.line, "assign", yyvsp[-2].interm.intermTypedNode))
-            parseContext.recover();
-        yyval.interm.intermTypedNode = parseContext.intermediate.addAssign(yyvsp[-1].interm.op, yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].interm.line);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.assignError(yyvsp[-1].interm.line, "assign", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[-2].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 83:
-#line 990 "glslang.y"
-    {                                    yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpAssign; ;}
-    break;
-
-  case 84:
-#line 991 "glslang.y"
-    { FRAG_VERT_ONLY("*=", yyvsp[0].lex.line);     yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpMulAssign; ;}
-    break;
-
-  case 85:
-#line 992 "glslang.y"
-    { FRAG_VERT_ONLY("/=", yyvsp[0].lex.line);     yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpDivAssign; ;}
-    break;
-
-  case 86:
-#line 993 "glslang.y"
-    { PACK_UNPACK_ONLY("%=", yyvsp[0].lex.line);   yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpModAssign; ;}
-    break;
-
-  case 87:
-#line 994 "glslang.y"
-    {                                    yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpAddAssign; ;}
-    break;
-
-  case 88:
-#line 995 "glslang.y"
-    {                                    yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpSubAssign; ;}
-    break;
-
-  case 89:
-#line 996 "glslang.y"
-    { PACK_UNPACK_ONLY("<<=", yyvsp[0].lex.line);  yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpLeftShiftAssign; ;}
-    break;
-
-  case 90:
-#line 997 "glslang.y"
-    { PACK_UNPACK_ONLY("<<=", yyvsp[0].lex.line);  yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpRightShiftAssign; ;}
-    break;
-
-  case 91:
-#line 998 "glslang.y"
-    { PACK_UNPACK_ONLY("&=",  yyvsp[0].lex.line);  yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpAndAssign; ;}
-    break;
-
-  case 92:
-#line 999 "glslang.y"
-    { PACK_UNPACK_ONLY("^=",  yyvsp[0].lex.line);  yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpExclusiveOrAssign; ;}
-    break;
-
-  case 93:
-#line 1000 "glslang.y"
-    { PACK_UNPACK_ONLY("|=",  yyvsp[0].lex.line);  yyval.interm.line = yyvsp[0].lex.line; yyval.interm.op = EOpInclusiveOrAssign; ;}
-    break;
-
-  case 94:
-#line 1004 "glslang.y"
-    {
-        yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 95:
-#line 1007 "glslang.y"
-    {
-        yyval.interm.intermTypedNode = parseContext.intermediate.addComma(yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.intermTypedNode, yyvsp[-1].lex.line);
-        if (yyval.interm.intermTypedNode == 0) {
-            parseContext.binaryOpError(yyvsp[-1].lex.line, ",", yyvsp[-2].interm.intermTypedNode->getCompleteString(), yyvsp[0].interm.intermTypedNode->getCompleteString());
-            parseContext.recover();
-            yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-        }
-    ;}
-    break;
-
-  case 96:
-#line 1018 "glslang.y"
-    {
-        if (parseContext.constErrorCheck(yyvsp[0].interm.intermTypedNode))
-            parseContext.recover();
-        yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 97:
-#line 1026 "glslang.y"
-    { yyval.interm.intermNode = 0; ;}
-    break;
-
-  case 98:
-#line 1027 "glslang.y"
-    { 
-        if (yyvsp[-1].interm.intermAggregate)
-            yyvsp[-1].interm.intermAggregate->setOperator(EOpSequence); 
-        yyval.interm.intermNode = yyvsp[-1].interm.intermAggregate; 
-    ;}
-    break;
-
-  case 99:
-#line 1035 "glslang.y"
-    {
-        //
-        // Multiple declarations of the same function are allowed.
-        //
-        // If this is a definition, the definition production code will check for redefinitions 
-        // (we don't know at this point if it's a definition or not).
-        //
-        // Redeclarations are allowed.  But, return types and parameter qualifiers must match.
-        //        
-        TFunction* prevDec = static_cast<TFunction*>(parseContext.symbolTable.find(yyvsp[-1].interm.function->getMangledName()));
-        if (prevDec) {
-            if (prevDec->getReturnType() != yyvsp[-1].interm.function->getReturnType()) {
-                parseContext.error(yyvsp[0].lex.line, "overloaded functions must have the same return type", yyvsp[-1].interm.function->getReturnType().getBasicString(), "");
-                parseContext.recover();
-            }
-            for (int i = 0; i < prevDec->getParamCount(); ++i) {
-                if ((*prevDec)[i].type->getQualifier() != (*yyvsp[-1].interm.function)[i].type->getQualifier()) {
-                    parseContext.error(yyvsp[0].lex.line, "overloaded functions must have the same parameter qualifiers", (*yyvsp[-1].interm.function)[i].type->getQualifierString(), "");
-                    parseContext.recover();
-                }
-            }
-        }
-        
-        //
-        // If this is a redeclaration, it could also be a definition,
-        // in which case, we want to use the variable names from this one, and not the one that's
-        // being redeclared.  So, pass back up this declaration, not the one in the symbol table.
-        //
-        yyval.interm.function = yyvsp[-1].interm.function;
-        yyval.interm.line = yyvsp[0].lex.line;
-
-        parseContext.symbolTable.insert(*yyval.interm.function);
-    ;}
-    break;
-
-  case 100:
-#line 1071 "glslang.y"
-    {
-        yyval.interm.function = yyvsp[0].interm.function;
-    ;}
-    break;
-
-  case 101:
-#line 1074 "glslang.y"
-    { 
-        yyval.interm.function = yyvsp[0].interm.function;  
-    ;}
-    break;
-
-  case 102:
-#line 1081 "glslang.y"
-    {
-        // Add the parameter 
-        yyval.interm.function = yyvsp[-1].interm.function;
-        if (yyvsp[0].interm.param.type->getBasicType() != EbtVoid)
-            yyvsp[-1].interm.function->addParameter(yyvsp[0].interm.param);
-        else
-            delete yyvsp[0].interm.param.type;
-    ;}
-    break;
-
-  case 103:
-#line 1089 "glslang.y"
-    {   
-        //
-        // Only first parameter of one-parameter functions can be void
-        // The check for named parameters not being void is done in parameter_declarator 
-        //
-        if (yyvsp[0].interm.param.type->getBasicType() == EbtVoid) {
-            //
-            // This parameter > first is void
-            //
-            parseContext.error(yyvsp[-1].lex.line, "cannot be an argument type except for '(void)'", "void", "");
-            parseContext.recover();
-            delete yyvsp[0].interm.param.type;
-        } else {
-            // Add the parameter 
-            yyval.interm.function = yyvsp[-2].interm.function; 
-            yyvsp[-2].interm.function->addParameter(yyvsp[0].interm.param);
-        }
-    ;}
-    break;
-
-  case 104:
-#line 1110 "glslang.y"
-    {
-        if (yyvsp[-2].interm.type.qualifier != EvqGlobal && yyvsp[-2].interm.type.qualifier != EvqTemporary) {
-            parseContext.error(yyvsp[-1].lex.line, "no qualifiers allowed for function return", getQualifierString(yyvsp[-2].interm.type.qualifier), "");
-            parseContext.recover();
-        }
-        // make sure a sampler is not involved as well...
-        if (parseContext.structQualifierErrorCheck(yyvsp[-1].lex.line, yyvsp[-2].interm.type))
-            parseContext.recover();
-        
-        // Add the function as a prototype after parsing it (we do not support recursion) 
-        TFunction *function;
-        TType type(yyvsp[-2].interm.type);
-        function = new TFunction(yyvsp[-1].lex.string, type);
-        yyval.interm.function = function;
-    ;}
-    break;
-
-  case 105:
-#line 1129 "glslang.y"
-    {
-        if (yyvsp[-1].interm.type.type == EbtVoid) {
-            parseContext.error(yyvsp[0].lex.line, "illegal use of type 'void'", yyvsp[0].lex.string->c_str(), "");
-            parseContext.recover();
-        }
-        if (parseContext.reservedErrorCheck(yyvsp[0].lex.line, *yyvsp[0].lex.string))
-            parseContext.recover();
-        TParameter param = {yyvsp[0].lex.string, new TType(yyvsp[-1].interm.type)};
-        yyval.interm.line = yyvsp[0].lex.line;
-        yyval.interm.param = param;
-    ;}
-    break;
-
-  case 106:
-#line 1140 "glslang.y"
-    {
-        // Check that we can make an array out of this type
-        if (yyvsp[-4].interm.type.array) {
-            parseContext.error(yyvsp[-2].lex.line, "cannot declare arrays of this type", TType(yyvsp[-4].interm.type).getCompleteString().c_str(), "");
-            parseContext.recover();
-        }
-        if (parseContext.reservedErrorCheck(yyvsp[-3].lex.line, *yyvsp[-3].lex.string))
-            parseContext.recover();
-        yyvsp[-4].interm.type.array = true;
-        TType* type = new TType(yyvsp[-4].interm.type);        
-        if (yyvsp[-1].interm.intermTypedNode->getAsConstantUnion())
-            type->setArraySize(yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-        TParameter param = { yyvsp[-3].lex.string, type };
-        yyval.interm.line = yyvsp[-3].lex.line;
-        yyval.interm.param = param;
-    ;}
-    break;
-
-  case 107:
-#line 1167 "glslang.y"
-    {
-        yyval.interm = yyvsp[0].interm;
-        if (parseContext.paramErrorCheck(yyvsp[0].interm.line, yyvsp[-2].interm.type.qualifier, yyvsp[-1].interm.qualifier, yyval.interm.param.type))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 108:
-#line 1172 "glslang.y"
-    {
-        yyval.interm = yyvsp[0].interm;
-        if (parseContext.parameterSamplerErrorCheck(yyvsp[0].interm.line, yyvsp[-1].interm.qualifier, *yyvsp[0].interm.param.type))
-            parseContext.recover();
-        if (parseContext.paramErrorCheck(yyvsp[0].interm.line, EvqTemporary, yyvsp[-1].interm.qualifier, yyval.interm.param.type))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 109:
-#line 1182 "glslang.y"
-    {
-        yyval.interm = yyvsp[0].interm;
-        if (parseContext.paramErrorCheck(yyvsp[0].interm.line, yyvsp[-2].interm.type.qualifier, yyvsp[-1].interm.qualifier, yyval.interm.param.type))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 110:
-#line 1187 "glslang.y"
-    {
-        yyval.interm = yyvsp[0].interm;
-        if (parseContext.parameterSamplerErrorCheck(yyvsp[0].interm.line, yyvsp[-1].interm.qualifier, *yyvsp[0].interm.param.type))
-            parseContext.recover();
-        if (parseContext.paramErrorCheck(yyvsp[0].interm.line, EvqTemporary, yyvsp[-1].interm.qualifier, yyval.interm.param.type))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 111:
-#line 1197 "glslang.y"
-    {
-        yyval.interm.qualifier = EvqIn;
-    ;}
-    break;
-
-  case 112:
-#line 1200 "glslang.y"
-    {
-        yyval.interm.qualifier = EvqIn;
-    ;}
-    break;
-
-  case 113:
-#line 1203 "glslang.y"
-    {
-        yyval.interm.qualifier = EvqOut;
-    ;}
-    break;
-
-  case 114:
-#line 1206 "glslang.y"
-    {
-        yyval.interm.qualifier = EvqInOut;
-    ;}
-    break;
-
-  case 115:
-#line 1212 "glslang.y"
-    {
-        TParameter param = { 0, new TType(yyvsp[0].interm.type) };
-        yyval.interm.param = param;
-        
-    ;}
-    break;
-
-  case 116:
-#line 1217 "glslang.y"
-    {
-        // Check that we can make an array out of this type 
-        if (yyvsp[-3].interm.type.array) {
-            parseContext.error(yyvsp[-2].lex.line, "cannot declare arrays of this type", TType(yyvsp[-3].interm.type).getCompleteString().c_str(), "");
-            parseContext.recover();
-        }
-        yyvsp[-3].interm.type.array = true;
-        TType* type = new TType(yyvsp[-3].interm.type);       
-        if (yyvsp[-1].interm.intermTypedNode->getAsConstantUnion())
-            type->setArraySize(yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-
-        TParameter param = { 0, type };
-        yyval.interm.line = yyvsp[-2].lex.line;
-        yyval.interm.param = param;
-    ;}
-    break;
-
-  case 117:
-#line 1235 "glslang.y"
-    {
-        yyval.interm = yyvsp[0].interm;
-    ;}
-    break;
-
-  case 118:
-#line 1238 "glslang.y"
-    {
-        yyval.interm = yyvsp[-2].interm;
-        if (parseContext.structQualifierErrorCheck(yyvsp[0].lex.line, yyvsp[-2].interm.type))
-            parseContext.recover();
-        
-        if (parseContext.nonInitErrorCheck(yyvsp[0].lex.line, *yyvsp[0].lex.string, yyval.interm.type))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 119:
-#line 1246 "glslang.y"
-    {
-        yyval.interm = yyvsp[-4].interm;
-        if (parseContext.structQualifierErrorCheck(yyvsp[-2].lex.line, yyvsp[-4].interm.type))
-            parseContext.recover();
-            
-        if (parseContext.arrayErrorCheck(yyvsp[-1].lex.line, *yyvsp[-2].lex.string, yyval.interm.type, 0))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 120:
-#line 1254 "glslang.y"
-    {
-        yyval.interm = yyvsp[-5].interm;
-        if (parseContext.structQualifierErrorCheck(yyvsp[-3].lex.line, yyvsp[-5].interm.type))
-            parseContext.recover();
-            
-        if (parseContext.arrayErrorCheck(yyvsp[-2].lex.line, *yyvsp[-3].lex.string, yyval.interm.type, yyvsp[-1].interm.intermTypedNode))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 121:
-#line 1262 "glslang.y"
-    {
-        yyval.interm = yyvsp[-4].interm;
-        if (parseContext.structQualifierErrorCheck(yyvsp[-2].lex.line, yyvsp[-4].interm.type))
-            parseContext.recover();
-        
-        TIntermNode* intermNode;
-        if (!parseContext.executeInitializer(yyvsp[-2].lex.line, *yyvsp[-2].lex.string, yyvsp[-4].interm.type, yyvsp[0].interm.intermTypedNode, intermNode)) {
-            //
-            // build the intermediate representation
-            //
-            if (intermNode)
-                yyval.interm.intermAggregate = parseContext.intermediate.growAggregate(yyvsp[-4].interm.intermNode, intermNode, yyvsp[-1].lex.line);
-            else
-                yyval.interm.intermAggregate = yyvsp[-4].interm.intermAggregate;
-        } else {
-            parseContext.recover();
-            yyval.interm.intermAggregate = 0;
-        }
-    ;}
-    break;
-
-  case 122:
-#line 1284 "glslang.y"
-    {
-        yyval.interm.type = yyvsp[0].interm.type;
-        yyval.interm.intermAggregate = 0;
-    ;}
-    break;
-
-  case 123:
-#line 1288 "glslang.y"
-    {
-        yyval.interm.intermAggregate = 0;
-        yyval.interm.type = yyvsp[-1].interm.type;
-        if (parseContext.structQualifierErrorCheck(yyvsp[0].lex.line, yyvsp[-1].interm.type))
-            parseContext.recover();
-        
-        if (parseContext.nonInitErrorCheck(yyvsp[0].lex.line, *yyvsp[0].lex.string, yyval.interm.type))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 124:
-#line 1297 "glslang.y"
-    {
-        yyval.interm.intermAggregate = 0;
-        yyval.interm.type = yyvsp[-3].interm.type;
-        if (parseContext.structQualifierErrorCheck(yyvsp[-2].lex.line, yyvsp[-3].interm.type))
-            parseContext.recover();
-        
-        if (parseContext.arrayErrorCheck(yyvsp[-1].lex.line, *yyvsp[-2].lex.string, yyval.interm.type, 0))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 125:
-#line 1306 "glslang.y"
-    {
-        yyval.interm.intermAggregate = 0;
-        yyval.interm.type = yyvsp[-4].interm.type;
-        if (parseContext.structQualifierErrorCheck(yyvsp[-3].lex.line, yyvsp[-4].interm.type))
-            parseContext.recover();
-        
-        if (parseContext.arrayErrorCheck(yyvsp[-2].lex.line, *yyvsp[-3].lex.string, yyval.interm.type, yyvsp[-1].interm.intermTypedNode))
-            parseContext.recover();
-    ;}
-    break;
-
-  case 126:
-#line 1315 "glslang.y"
-    {
-        yyval.interm.type = yyvsp[-3].interm.type;
-        if (parseContext.structQualifierErrorCheck(yyvsp[-2].lex.line, yyvsp[-3].interm.type))
-            parseContext.recover();
-        
-        TIntermNode* intermNode;
-        if (!parseContext.executeInitializer(yyvsp[-2].lex.line, *yyvsp[-2].lex.string, yyvsp[-3].interm.type, yyvsp[0].interm.intermTypedNode, intermNode)) {
-            //
-            // Build intermediate representation
-            //
-            if (intermNode)
-                yyval.interm.intermAggregate = parseContext.intermediate.makeAggregate(intermNode, yyvsp[-1].lex.line);
-            else
-                yyval.interm.intermAggregate = 0;
-        } else {
-            parseContext.recover();
-            yyval.interm.intermAggregate = 0;
-        }
-    ;}
-    break;
-
-  case 127:
-#line 1405 "glslang.y"
-    {
-        yyval.interm.type = yyvsp[0].interm.type;
-    ;}
-    break;
-
-  case 128:
-#line 1408 "glslang.y"
-    { 
-        TPublicType t = { yyvsp[0].interm.type.type, yyvsp[-1].interm.type.qualifier, yyvsp[0].interm.type.size, yyvsp[0].interm.type.matrix, false, yyvsp[0].interm.type.userDef, 0 };
-        if (yyvsp[-1].interm.type.qualifier == EvqAttribute &&
-            (yyvsp[0].interm.type.type == EbtBool || yyvsp[0].interm.type.type == EbtInt)) {
-            parseContext.error(yyvsp[0].interm.type.line, "cannot be bool or int", getQualifierString(yyvsp[-1].interm.type.qualifier), "");
-            parseContext.recover();
-        }
-        if ((yyvsp[-1].interm.type.qualifier == EvqVaryingIn || yyvsp[-1].interm.type.qualifier == EvqVaryingOut) &&
-            (yyvsp[0].interm.type.type == EbtBool || yyvsp[0].interm.type.type == EbtInt)) {
-            parseContext.error(yyvsp[0].interm.type.line, "cannot be bool or int", getQualifierString(yyvsp[-1].interm.type.qualifier), "");
-            parseContext.recover();
-        }
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 129:
-#line 1425 "glslang.y"
-    { 
-        TPublicType t = { EbtVoid,  EvqConst,     1, false, false, 0 }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 130:
-#line 1429 "glslang.y"
-    { 
-        VERTEX_ONLY("attribute", yyvsp[0].lex.line);
-        if (parseContext.globalErrorCheck(yyvsp[0].lex.line, parseContext.symbolTable.atGlobalLevel(), "attribute"))
-            parseContext.recover();
-        TPublicType t = { EbtVoid,  EvqAttribute, 1, false, false, 0 }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 131:
-#line 1436 "glslang.y"
-    {
-        if (parseContext.globalErrorCheck(yyvsp[0].lex.line, parseContext.symbolTable.atGlobalLevel(), "varying"))
-            parseContext.recover();
-        TPublicType t = { EbtVoid,  EvqVaryingIn, 1, false, false, 0 };
-        if (parseContext.language == EShLangVertex)
-            t.qualifier = EvqVaryingOut;
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 132:
-#line 1444 "glslang.y"
-    {
-        if (parseContext.globalErrorCheck(yyvsp[0].lex.line, parseContext.symbolTable.atGlobalLevel(), "uniform"))
-            parseContext.recover();
-        TPublicType t = { EbtVoid,  EvqUniform,   1, false, false, 0 }; 
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 133:
-#line 1453 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtVoid, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 134:
-#line 1458 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 135:
-#line 1463 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtInt, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 136:
-#line 1468 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtBool, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 137:
-#line 1479 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 2, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 138:
-#line 1484 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 3, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 139:
-#line 1489 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 4, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 140:
-#line 1494 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtBool, qual, 2, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 141:
-#line 1499 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtBool, qual, 3, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 142:
-#line 1504 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtBool, qual, 4, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 143:
-#line 1509 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtInt, qual, 2, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 144:
-#line 1514 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtInt, qual, 3, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 145:
-#line 1519 "glslang.y"
-    {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtInt, qual, 4, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 146:
-#line 1524 "glslang.y"
-    {
-        FRAG_VERT_ONLY("mat2", yyvsp[0].lex.line); 
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 2, true, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 147:
-#line 1530 "glslang.y"
-    { 
-        FRAG_VERT_ONLY("mat3", yyvsp[0].lex.line); 
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 3, true, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 148:
-#line 1536 "glslang.y"
-    { 
-        FRAG_VERT_ONLY("mat4", yyvsp[0].lex.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 4, true, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t; 
-    ;}
-    break;
-
-  case 149:
-#line 1542 "glslang.y"
-    {
-        FRAG_VERT_ONLY("sampler1D", yyvsp[0].lex.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler1D, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 150:
-#line 1548 "glslang.y"
-    {
-        FRAG_VERT_ONLY("sampler2D", yyvsp[0].lex.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler2D, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 151:
-#line 1554 "glslang.y"
-    {
-        FRAG_VERT_ONLY("sampler3D", yyvsp[0].lex.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler3D, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 152:
-#line 1560 "glslang.y"
-    {
-        FRAG_VERT_ONLY("samplerCube", yyvsp[0].lex.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSamplerCube, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 153:
-#line 1566 "glslang.y"
-    {
-        FRAG_VERT_ONLY("sampler1DShadow", yyvsp[0].lex.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler1DShadow, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 154:
-#line 1572 "glslang.y"
-    {
-        FRAG_VERT_ONLY("sampler2DShadow", yyvsp[0].lex.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler2DShadow, qual, 1, false, false, 0, yyvsp[0].lex.line }; 
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 155:
-#line 1578 "glslang.y"
-    {
-        FRAG_VERT_ONLY("struct", yyvsp[0].interm.type.line);
-        yyval.interm.type = yyvsp[0].interm.type;
-        yyval.interm.type.qualifier = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-    ;}
-    break;
-
-  case 156:
-#line 1583 "glslang.y"
-    {     
-        //
-        // This is for user defined type names.  The lexical phase looked up the 
-        // type.
-        //
-        TType& structure = static_cast<TVariable*>(yyvsp[0].lex.symbol)->getType();
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtStruct, qual, 1, false, false, &structure, yyvsp[0].lex.line }; 
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 157:
-#line 1596 "glslang.y"
-    {
-        TType* structure = new TType(yyvsp[-1].interm.typeList, *yyvsp[-3].lex.string);
-        TVariable* userTypeDef = new TVariable(yyvsp[-3].lex.string, *structure, true);
-        if (! parseContext.symbolTable.insert(*userTypeDef)) {
-            parseContext.error(yyvsp[-3].lex.line, "redefinition", yyvsp[-3].lex.string->c_str(), "struct");
-            parseContext.recover();
-        }
-        TPublicType t = { EbtStruct, EvqTemporary, 1, false, false, structure, yyvsp[-4].lex.line };
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 158:
-#line 1606 "glslang.y"
-    {
-        TType* structure = new TType(yyvsp[-1].interm.typeList, TString(""));
-        TPublicType t = { EbtStruct, EvqTemporary, 1, false, false, structure, yyvsp[-3].lex.line };
-        yyval.interm.type = t;
-    ;}
-    break;
-
-  case 159:
-#line 1614 "glslang.y"
-    {
-        yyval.interm.typeList = yyvsp[0].interm.typeList;
-    ;}
-    break;
-
-  case 160:
-#line 1617 "glslang.y"
-    {
-        yyval.interm.typeList = yyvsp[-1].interm.typeList;
-        for (unsigned int i = 0; i < yyvsp[0].interm.typeList->size(); ++i) {
-            for (unsigned int j = 0; j < yyval.interm.typeList->size(); ++j) {
-                if ((*yyval.interm.typeList)[j].type->getFieldName() == (*yyvsp[0].interm.typeList)[i].type->getFieldName()) {
-                    parseContext.error((*yyvsp[0].interm.typeList)[i].line, "duplicate field name in structure:", "struct", (*yyvsp[0].interm.typeList)[i].type->getFieldName().c_str());
-                    parseContext.recover();
-                }
-            }
-            yyval.interm.typeList->push_back((*yyvsp[0].interm.typeList)[i]);
-        }
-    ;}
-    break;
-
-  case 161:
-#line 1632 "glslang.y"
-    {
-        yyval.interm.typeList = yyvsp[-1].interm.typeList;
-        
-        if (parseContext.voidErrorCheck(yyvsp[-2].interm.type.line, (*yyvsp[-1].interm.typeList)[0].type->getFieldName(), yyvsp[-2].interm.type)) {
-            parseContext.recover();
-        }
-        for (unsigned int i = 0; i < yyval.interm.typeList->size(); ++i) {
-            //
-            // Careful not to replace already know aspects of type, like array-ness
-            //
-            (*yyval.interm.typeList)[i].type->setType(yyvsp[-2].interm.type.type, yyvsp[-2].interm.type.size, yyvsp[-2].interm.type.matrix, yyvsp[-2].interm.type.userDef);
-            if (yyvsp[-2].interm.type.userDef)
-                (*yyval.interm.typeList)[i].type->setTypeName(yyvsp[-2].interm.type.userDef->getTypeName());
-        }
-    ;}
-    break;
-
-  case 162:
-#line 1650 "glslang.y"
-    {
-        yyval.interm.typeList = NewPoolTTypeList();
-        yyval.interm.typeList->push_back(yyvsp[0].interm.typeLine);
-    ;}
-    break;
-
-  case 163:
-#line 1654 "glslang.y"
-    {
-        yyval.interm.typeList->push_back(yyvsp[0].interm.typeLine);
-    ;}
-    break;
-
-  case 164:
-#line 1660 "glslang.y"
-    {
-        yyval.interm.typeLine.type = new TType(EbtVoid);
-        yyval.interm.typeLine.line = yyvsp[0].lex.line;
-        yyval.interm.typeLine.type->setFieldName(*yyvsp[0].lex.string);
-    ;}
-    break;
-
-  case 165:
-#line 1665 "glslang.y"
-    {
-        yyval.interm.typeLine.type = new TType(EbtVoid);
-        yyval.interm.typeLine.line = yyvsp[-3].lex.line;
-        yyval.interm.typeLine.type->setFieldName(*yyvsp[-3].lex.string);
-        
-        if (yyvsp[-1].interm.intermTypedNode->getAsConstantUnion() == 0 || yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getBasicType() != EbtInt ||
-            yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst <= 0) {
-            parseContext.error(yyvsp[-2].lex.line, "structure field array size must be a positive integer", yyvsp[-3].lex.string->c_str(), "");
-            parseContext.recover();
-        } else {           
-            yyval.interm.typeLine.type->setArraySize(yyvsp[-1].interm.intermTypedNode->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-        }
-    ;}
-    break;
-
-  case 166:
-#line 1681 "glslang.y"
-    { yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; ;}
-    break;
-
-  case 167:
-#line 1685 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermNode; ;}
-    break;
-
-  case 168:
-#line 1689 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermAggregate; ;}
-    break;
-
-  case 169:
-#line 1690 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermNode; ;}
-    break;
-
-  case 170:
-#line 1696 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermNode; ;}
-    break;
-
-  case 171:
-#line 1697 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermNode; ;}
-    break;
-
-  case 172:
-#line 1698 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermNode; ;}
-    break;
-
-  case 173:
-#line 1699 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermNode; ;}
-    break;
-
-  case 174:
-#line 1700 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermNode; ;}
-    break;
-
-  case 175:
-#line 1704 "glslang.y"
-    { yyval.interm.intermAggregate = 0; ;}
-    break;
-
-  case 176:
-#line 1705 "glslang.y"
-    { parseContext.symbolTable.push(); ;}
-    break;
-
-  case 177:
-#line 1705 "glslang.y"
-    { parseContext.symbolTable.pop(); ;}
-    break;
-
-  case 178:
-#line 1705 "glslang.y"
-    {
-        if (yyvsp[-2].interm.intermAggregate != 0)            
-            yyvsp[-2].interm.intermAggregate->setOperator(EOpSequence); 
-        yyval.interm.intermAggregate = yyvsp[-2].interm.intermAggregate;
-    ;}
-    break;
-
-  case 179:
-#line 1713 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermNode; ;}
-    break;
-
-  case 180:
-#line 1714 "glslang.y"
-    { yyval.interm.intermNode = yyvsp[0].interm.intermNode; ;}
-    break;
-
-  case 181:
-#line 1719 "glslang.y"
-    { 
-        yyval.interm.intermNode = 0; 
-    ;}
-    break;
-
-  case 182:
-#line 1722 "glslang.y"
-    { 
-        if (yyvsp[-1].interm.intermAggregate)
-            yyvsp[-1].interm.intermAggregate->setOperator(EOpSequence); 
-        yyval.interm.intermNode = yyvsp[-1].interm.intermAggregate; 
-    ;}
-    break;
-
-  case 183:
-#line 1730 "glslang.y"
-    {
-        yyval.interm.intermAggregate = parseContext.intermediate.makeAggregate(yyvsp[0].interm.intermNode, 0); 
-    ;}
-    break;
-
-  case 184:
-#line 1733 "glslang.y"
-    { 
-        yyval.interm.intermAggregate = parseContext.intermediate.growAggregate(yyvsp[-1].interm.intermAggregate, yyvsp[0].interm.intermNode, 0);
-    ;}
-    break;
-
-  case 185:
-#line 1739 "glslang.y"
-    { yyval.interm.intermNode = 0; ;}
-    break;
-
-  case 186:
-#line 1740 "glslang.y"
-    { yyval.interm.intermNode = static_cast<TIntermNode*>(yyvsp[-1].interm.intermTypedNode); ;}
-    break;
-
-  case 187:
-#line 1744 "glslang.y"
-    { 
-        if (parseContext.boolErrorCheck(yyvsp[-4].lex.line, yyvsp[-2].interm.intermTypedNode))
-            parseContext.recover();
-        yyval.interm.intermNode = parseContext.intermediate.addSelection(yyvsp[-2].interm.intermTypedNode, yyvsp[0].interm.nodePair, yyvsp[-4].lex.line);
-    ;}
-    break;
-
-  case 188:
-#line 1752 "glslang.y"
-    {
-        yyval.interm.nodePair.node1 = yyvsp[-2].interm.intermNode;
-        yyval.interm.nodePair.node2 = yyvsp[0].interm.intermNode;
-    ;}
-    break;
-
-  case 189:
-#line 1756 "glslang.y"
-    { 
-        yyval.interm.nodePair.node1 = yyvsp[0].interm.intermNode;
-        yyval.interm.nodePair.node2 = 0;
-    ;}
-    break;
-
-  case 190:
-#line 1766 "glslang.y"
-    {
-        yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-        if (parseContext.boolErrorCheck(yyvsp[0].interm.intermTypedNode->getLine(), yyvsp[0].interm.intermTypedNode))
-            parseContext.recover();          
-    ;}
-    break;
-
-  case 191:
-#line 1771 "glslang.y"
-    {
-        TIntermNode* intermNode;
-        if (parseContext.structQualifierErrorCheck(yyvsp[-2].lex.line, yyvsp[-3].interm.type))
-            parseContext.recover();
-        if (parseContext.boolErrorCheck(yyvsp[-2].lex.line, yyvsp[-3].interm.type))
-            parseContext.recover();
-        
-        if (!parseContext.executeInitializer(yyvsp[-2].lex.line, *yyvsp[-2].lex.string, yyvsp[-3].interm.type, yyvsp[0].interm.intermTypedNode, intermNode))
-            yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode;
-        else {
-            parseContext.recover();
-            yyval.interm.intermTypedNode = 0;
-        }
-    ;}
-    break;
-
-  case 192:
-#line 1788 "glslang.y"
-    { parseContext.symbolTable.push(); ++parseContext.loopNestingLevel; ;}
-    break;
-
-  case 193:
-#line 1788 "glslang.y"
-    { 
-        parseContext.symbolTable.pop();
-        yyval.interm.intermNode = parseContext.intermediate.addLoop(yyvsp[0].interm.intermNode, yyvsp[-2].interm.intermTypedNode, 0, true, yyvsp[-5].lex.line);
-        --parseContext.loopNestingLevel;
-    ;}
-    break;
-
-  case 194:
-#line 1793 "glslang.y"
-    { ++parseContext.loopNestingLevel; ;}
-    break;
-
-  case 195:
-#line 1793 "glslang.y"
-    {
-        if (parseContext.boolErrorCheck(yyvsp[0].lex.line, yyvsp[-2].interm.intermTypedNode))
-            parseContext.recover();
-                    
-        yyval.interm.intermNode = parseContext.intermediate.addLoop(yyvsp[-5].interm.intermNode, yyvsp[-2].interm.intermTypedNode, 0, false, yyvsp[-4].lex.line);
-        --parseContext.loopNestingLevel;
-    ;}
-    break;
-
-  case 196:
-#line 1800 "glslang.y"
-    { parseContext.symbolTable.push(); ++parseContext.loopNestingLevel; ;}
-    break;
-
-  case 197:
-#line 1800 "glslang.y"
-    {
-        parseContext.symbolTable.pop();
-        yyval.interm.intermNode = parseContext.intermediate.makeAggregate(yyvsp[-3].interm.intermNode, yyvsp[-5].lex.line);
-        yyval.interm.intermNode = parseContext.intermediate.growAggregate(
-                yyval.interm.intermNode,
-                parseContext.intermediate.addLoop(yyvsp[0].interm.intermNode, reinterpret_cast<TIntermTyped*>(yyvsp[-2].interm.nodePair.node1), reinterpret_cast<TIntermTyped*>(yyvsp[-2].interm.nodePair.node2), true, yyvsp[-6].lex.line),
-                yyvsp[-6].lex.line);
-        yyval.interm.intermNode->getAsAggregate()->setOperator(EOpSequence);
-        --parseContext.loopNestingLevel;
-    ;}
-    break;
-
-  case 198:
-#line 1813 "glslang.y"
-    {
-        yyval.interm.intermNode = yyvsp[0].interm.intermNode; 
-    ;}
-    break;
-
-  case 199:
-#line 1816 "glslang.y"
-    {
-        yyval.interm.intermNode = yyvsp[0].interm.intermNode;
-    ;}
-    break;
-
-  case 200:
-#line 1822 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = yyvsp[0].interm.intermTypedNode; 
-    ;}
-    break;
-
-  case 201:
-#line 1825 "glslang.y"
-    { 
-        yyval.interm.intermTypedNode = 0; 
-    ;}
-    break;
-
-  case 202:
-#line 1831 "glslang.y"
-    { 
-        yyval.interm.nodePair.node1 = yyvsp[-1].interm.intermTypedNode;
-        yyval.interm.nodePair.node2 = 0;
-    ;}
-    break;
-
-  case 203:
-#line 1835 "glslang.y"
-    {
-        yyval.interm.nodePair.node1 = yyvsp[-2].interm.intermTypedNode;
-        yyval.interm.nodePair.node2 = yyvsp[0].interm.intermTypedNode;
-    ;}
-    break;
-
-  case 204:
-#line 1842 "glslang.y"
-    {
-        if (parseContext.loopNestingLevel <= 0) {
-            parseContext.error(yyvsp[-1].lex.line, "continue statement only allowed in loops", "", "");
-            parseContext.recover();
-        }        
-        yyval.interm.intermNode = parseContext.intermediate.addBranch(EOpContinue, yyvsp[-1].lex.line);
-    ;}
-    break;
-
-  case 205:
-#line 1849 "glslang.y"
-    {
-        if (parseContext.loopNestingLevel <= 0) {
-            parseContext.error(yyvsp[-1].lex.line, "break statement only allowed in loops", "", "");
-            parseContext.recover();
-        }        
-        yyval.interm.intermNode = parseContext.intermediate.addBranch(EOpBreak, yyvsp[-1].lex.line);
-    ;}
-    break;
-
-  case 206:
-#line 1856 "glslang.y"
-    {
-        yyval.interm.intermNode = parseContext.intermediate.addBranch(EOpReturn, yyvsp[-1].lex.line);
-        if (parseContext.currentFunctionType->getBasicType() != EbtVoid) {
-            parseContext.error(yyvsp[-1].lex.line, "non-void function must return a value", "return", "");
-            parseContext.recover();
-        }
-    ;}
-    break;
-
-  case 207:
-#line 1863 "glslang.y"
-    {        
-        yyval.interm.intermNode = parseContext.intermediate.addBranch(EOpReturn, yyvsp[-1].interm.intermTypedNode, yyvsp[-2].lex.line);
-        parseContext.functionReturnsValue = true;
-        if (parseContext.currentFunctionType->getBasicType() == EbtVoid) {
-            parseContext.error(yyvsp[-2].lex.line, "void function cannot return a value", "return", "");
-            parseContext.recover();
-        } else if (*(parseContext.currentFunctionType) != yyvsp[-1].interm.intermTypedNode->getType()) {
-            parseContext.error(yyvsp[-2].lex.line, "function return is not matching type:", "return", "");
-            parseContext.recover();
-        }
-    ;}
-    break;
-
-  case 208:
-#line 1874 "glslang.y"
-    {
-        FRAG_ONLY("discard", yyvsp[-1].lex.line);
-        yyval.interm.intermNode = parseContext.intermediate.addBranch(EOpKill, yyvsp[-1].lex.line);
-    ;}
-    break;
-
-  case 209:
-#line 1883 "glslang.y"
-    { 
-        yyval.interm.intermNode = yyvsp[0].interm.intermNode; 
-        parseContext.treeRoot = yyval.interm.intermNode; 
-    ;}
-    break;
-
-  case 210:
-#line 1887 "glslang.y"
-    {
-        yyval.interm.intermNode = parseContext.intermediate.growAggregate(yyvsp[-1].interm.intermNode, yyvsp[0].interm.intermNode, 0);
-        parseContext.treeRoot = yyval.interm.intermNode;
-    ;}
-    break;
-
-  case 211:
-#line 1894 "glslang.y"
-    { 
-        yyval.interm.intermNode = yyvsp[0].interm.intermNode; 
-    ;}
-    break;
-
-  case 212:
-#line 1897 "glslang.y"
-    { 
-        yyval.interm.intermNode = yyvsp[0].interm.intermNode; 
-    ;}
-    break;
-
-  case 213:
-#line 1903 "glslang.y"
-    {
-        TFunction& function = *(yyvsp[0].interm.function);
-        TFunction* prevDec = static_cast<TFunction*>(parseContext.symbolTable.find(function.getMangledName()));
-        //
-        // Note:  'prevDec' could be 'function' if this is the first time we've seen function
-        // as it would have just been put in the symbol table.  Otherwise, we're looking up
-        // an earlier occurance.
-        //
-        if (prevDec->isDefined()) {
-            //
-            // Then this function already has a body.
-            //
-            parseContext.error(yyvsp[0].interm.line, "function already has a body", function.getName().c_str(), "");
-            parseContext.recover();
-        }
-        prevDec->setDefined();
-        
-        //
-        // Raise error message if main function takes any parameters or return anything other than void
-        //
-        if (function.getName() == "main") {
-            if (function.getParamCount() > 0) {
-                parseContext.error(yyvsp[0].interm.line, "function cannot take any parameter(s)", function.getName().c_str(), "");
-                parseContext.recover();
-            }
-            if (function.getReturnType().getBasicType() != EbtVoid) {
-                parseContext.error(yyvsp[0].interm.line, "", function.getReturnType().getBasicString(), "main function cannot return a value" );
-                parseContext.recover();
-            }            
-        }
-   
-        //
-        // New symbol table scope for body of function plus its arguments
-        //
-        parseContext.symbolTable.push();
-        
-        //
-        // Remember the return type for later checking for RETURN statements.
-        //
-        parseContext.currentFunctionType = &(prevDec->getReturnType());
-        parseContext.functionReturnsValue = false;
-        
-        // 
-        // Insert parameters into the symbol table.
-        // If the parameter has no name, it's not an error, just don't insert it 
-        // (could be used for unused args).
-        //
-        // Also, accumulate the list of parameters into the HIL, so lower level code
-        // knows where to find parameters.
-        //
-        TIntermAggregate* paramNodes = new TIntermAggregate;
-        for (int i = 0; i < function.getParamCount(); i++) {
-            TParameter& param = function[i];
-            if (param.name != 0) {
-                TVariable *variable = new TVariable(param.name, *param.type);
-                // 
-                // Insert the parameters with name in the symbol table.
-                //
-                if (! parseContext.symbolTable.insert(*variable)) {
-                    parseContext.error(yyvsp[0].interm.line, "redefinition", variable->getName().c_str(), "");
-                    parseContext.recover();
-                    delete variable;
-                }
-                //
-                // Transfer ownership of name pointer to symbol table.
-                //
-                param.name = 0;
-                
-                //
-                // Add the parameter to the HIL
-                //                
-                paramNodes = parseContext.intermediate.growAggregate(
-                                               paramNodes, 
-                                               parseContext.intermediate.addSymbol(variable->getUniqueId(),
-                                                                       variable->getName(),
-                                                                       variable->getType(), yyvsp[0].interm.line), 
-                                               yyvsp[0].interm.line);
-            } else {
-                paramNodes = parseContext.intermediate.growAggregate(paramNodes, parseContext.intermediate.addSymbol(0, "", *param.type, yyvsp[0].interm.line), yyvsp[0].interm.line);
-            }
-        }
-        parseContext.intermediate.setAggregateOperator(paramNodes, EOpParameters, yyvsp[0].interm.line);
-        yyvsp[0].interm.intermAggregate = paramNodes;
-        parseContext.loopNestingLevel = 0;
-    ;}
-    break;
-
-  case 214:
-#line 1988 "glslang.y"
-    {
-        //?? Check that all paths return a value if return type != void ?
-        //   May be best done as post process phase on intermediate code
-        if (parseContext.currentFunctionType->getBasicType() != EbtVoid && ! parseContext.functionReturnsValue) {
-            parseContext.error(yyvsp[-2].interm.line, "function does not return a value:", "", yyvsp[-2].interm.function->getName().c_str());
-            parseContext.recover();
-        }
-        parseContext.symbolTable.pop();
-        yyval.interm.intermNode = parseContext.intermediate.growAggregate(yyvsp[-2].interm.intermAggregate, yyvsp[0].interm.intermNode, 0);
-        parseContext.intermediate.setAggregateOperator(yyval.interm.intermNode, EOpFunction, yyvsp[-2].interm.line);
-        yyval.interm.intermNode->getAsAggregate()->setName(yyvsp[-2].interm.function->getMangledName().c_str());
-        yyval.interm.intermNode->getAsAggregate()->setType(yyvsp[-2].interm.function->getReturnType());
-        
-        // store the pragma information for debug and optimize and other vendor specific 
-        // information. This information can be queried from the parse tree
-        yyval.interm.intermNode->getAsAggregate()->setOptimize(parseContext.contextPragma.optimize);
-        yyval.interm.intermNode->getAsAggregate()->setDebug(parseContext.contextPragma.debug);
-        yyval.interm.intermNode->getAsAggregate()->addToPragmaTable(parseContext.contextPragma.pragmaTable);
-    ;}
-    break;
-
-
-    }
-
-/* Line 999 of yacc.c.  */
-#line 4158 "glslang.tab.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++yyvsp = yyval;
-
-
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-
-  goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("syntax error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
-    }
-
-
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
-
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
-        {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyss < yyssp)
-	    {
-	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-	      yydestruct (yystos[*yyssp], yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
-        }
-
-      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-      yydestruct (yytoken, &yylval);
-      yychar = YYEMPTY;
-
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
-
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
-
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
-
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
-
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
-  *++yyvsp = yylval;
-
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-  return yyresult;
-}
-
-
-#line 209 "glslang.y"
-
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/InfoSink.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/InfoSink.cpp
deleted file mode 100755
index 9a1aaa26f..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/InfoSink.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "Include/InfoSink.h"
-
-#ifdef _WIN32
-    #include <windows.h>
-#endif
-
-void TInfoSinkBase::append(const char *s)           
-{
-    if (outputStream & EString) {
-        checkMem(strlen(s)); 
-        sink.append(s); 
-    }
-
-#ifdef _WIN32
-    if (outputStream & EDebugger)
-        OutputDebugString(s);
-#endif
-
-    if (outputStream & EStdOut)
-        fprintf(stdout, "%s", s);
-}
-
-void TInfoSinkBase::append(int count, char c)       
-{ 
-    if (outputStream & EString) {
-        checkMem(count);         
-        sink.append(count, c); 
-    }
-
-#ifdef _WIN32
-    if (outputStream & EDebugger) {
-        char str[2];
-        str[0] = c;
-        str[1] = '\0';
-        OutputDebugString(str);
-    }
-#endif
-
-    if (outputStream & EStdOut)
-        fprintf(stdout, "%c", c);
-}
-
-void TInfoSinkBase::append(const TPersistString& t) 
-{ 
-    if (outputStream & EString) {
-        checkMem(t.size());  
-        sink.append(t); 
-    }
-
-#ifdef _WIN32
-    if (outputStream & EDebugger)
-        OutputDebugString(t.c_str());
-#endif
-
-    if (outputStream & EStdOut)
-        fprintf(stdout, "%s", t.c_str());
-}
-
-void TInfoSinkBase::append(const TString& t)
-{ 
-    if (outputStream & EString) {
-        checkMem(t.size());  
-        sink.append(t.c_str()); 
-    }
-
-#ifdef _WIN32
-    if (outputStream & EDebugger)
-        OutputDebugString(t.c_str());
-#endif
-
-    if (outputStream & EStdOut)
-        fprintf(stdout, "%s", t.c_str());
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.cpp
deleted file mode 100755
index 0913e531a..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.cpp
+++ /dev/null
@@ -1,948 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-//
-// Create strings that declare built-in definitions, add built-ins that
-// cannot be expressed in the files, and establish mappings between 
-// built-in functions and operators.
-//
-
-#include "../Include/intermediate.h"
-#include "Initialize.h"
-
-void TBuiltIns::initialize()
-{
-    //
-    // Initialize all the built-in strings for parsing.
-    //
-    TString BuiltInFunctions;
-    TString BuiltInFunctionsVertex;
-    TString BuiltInFunctionsFragment;
-    TString StandardVertexVaryings;
-    TString StandardFragmentVaryings;
-    TString StandardVertexAttributes;
-    TString StandardUniforms;
-
-    {
-        //============================================================================
-        //
-        // Prototypes for built-in functions seen by both vertex and fragment shaders.
-        //
-        //============================================================================
-
-        TString& s = BuiltInFunctions;
-
-        //
-        // Angle and Trigonometric Functions.
-        //
-        s.append(TString("float radians(float degrees);"));
-        s.append(TString("vec2  radians(vec2  degrees);"));
-        s.append(TString("vec3  radians(vec3  degrees);"));
-        s.append(TString("vec4  radians(vec4  degrees);"));
-
-        s.append(TString("float degrees(float radians);"));
-        s.append(TString("vec2  degrees(vec2  radians);"));
-        s.append(TString("vec3  degrees(vec3  radians);"));
-        s.append(TString("vec4  degrees(vec4  radians);"));
-
-        s.append(TString("float sin(float angle);"));
-        s.append(TString("vec2  sin(vec2  angle);"));
-        s.append(TString("vec3  sin(vec3  angle);"));
-        s.append(TString("vec4  sin(vec4  angle);"));
-
-        s.append(TString("float cos(float angle);"));
-        s.append(TString("vec2  cos(vec2  angle);"));
-        s.append(TString("vec3  cos(vec3  angle);"));
-        s.append(TString("vec4  cos(vec4  angle);"));
-
-        s.append(TString("float tan(float angle);"));
-        s.append(TString("vec2  tan(vec2  angle);"));
-        s.append(TString("vec3  tan(vec3  angle);"));
-        s.append(TString("vec4  tan(vec4  angle);"));
-
-        s.append(TString("float asin(float x);"));
-        s.append(TString("vec2  asin(vec2  x);"));
-        s.append(TString("vec3  asin(vec3  x);"));
-        s.append(TString("vec4  asin(vec4  x);"));
-
-        s.append(TString("float acos(float x);"));
-        s.append(TString("vec2  acos(vec2  x);"));
-        s.append(TString("vec3  acos(vec3  x);"));
-        s.append(TString("vec4  acos(vec4  x);"));
-
-        s.append(TString("float atan(float y, float x);"));
-        s.append(TString("vec2  atan(vec2  y, vec2  x);"));
-        s.append(TString("vec3  atan(vec3  y, vec3  x);"));
-        s.append(TString("vec4  atan(vec4  y, vec4  x);"));
-
-        s.append(TString("float atan(float y_over_x);"));
-        s.append(TString("vec2  atan(vec2  y_over_x);"));
-        s.append(TString("vec3  atan(vec3  y_over_x);"));
-        s.append(TString("vec4  atan(vec4  y_over_x);"));
-
-        //
-        // Exponential Functions.
-        //
-        s.append(TString("float pow(float x, float y);"));
-        s.append(TString("vec2  pow(vec2  x, vec2  y);"));
-        s.append(TString("vec3  pow(vec3  x, vec3  y);"));
-        s.append(TString("vec4  pow(vec4  x, vec4  y);"));
-
-        s.append(TString("float exp(float x);"));
-        s.append(TString("vec2  exp(vec2  x);"));
-        s.append(TString("vec3  exp(vec3  x);"));
-        s.append(TString("vec4  exp(vec4  x);"));
-
-        s.append(TString("float log(float x);"));
-        s.append(TString("vec2  log(vec2  x);"));
-        s.append(TString("vec3  log(vec3  x);"));
-        s.append(TString("vec4  log(vec4  x);"));
-
-        s.append(TString("float exp2(float x);"));
-        s.append(TString("vec2  exp2(vec2  x);"));
-        s.append(TString("vec3  exp2(vec3  x);"));
-        s.append(TString("vec4  exp2(vec4  x);"));
-
-        s.append(TString("float log2(float x);"));
-        s.append(TString("vec2  log2(vec2  x);"));
-        s.append(TString("vec3  log2(vec3  x);"));
-        s.append(TString("vec4  log2(vec4  x);"));
-
-        s.append(TString("float sqrt(float x);"));
-        s.append(TString("vec2  sqrt(vec2  x);"));
-        s.append(TString("vec3  sqrt(vec3  x);"));
-        s.append(TString("vec4  sqrt(vec4  x);"));
-
-        s.append(TString("float inversesqrt(float x);"));
-        s.append(TString("vec2  inversesqrt(vec2  x);"));
-        s.append(TString("vec3  inversesqrt(vec3  x);"));
-        s.append(TString("vec4  inversesqrt(vec4  x);"));
-
-        //
-        // Common Functions.
-        //
-        s.append(TString("float abs(float x);"));
-        s.append(TString("vec2  abs(vec2  x);"));
-        s.append(TString("vec3  abs(vec3  x);"));
-        s.append(TString("vec4  abs(vec4  x);"));
-
-        s.append(TString("float sign(float x);"));
-        s.append(TString("vec2  sign(vec2  x);"));
-        s.append(TString("vec3  sign(vec3  x);"));
-        s.append(TString("vec4  sign(vec4  x);"));
-
-        s.append(TString("float floor(float x);"));
-        s.append(TString("vec2  floor(vec2  x);"));
-        s.append(TString("vec3  floor(vec3  x);"));
-        s.append(TString("vec4  floor(vec4  x);"));
-
-        s.append(TString("float ceil(float x);"));
-        s.append(TString("vec2  ceil(vec2  x);"));
-        s.append(TString("vec3  ceil(vec3  x);"));
-        s.append(TString("vec4  ceil(vec4  x);"));
-
-        s.append(TString("float fract(float x);"));
-        s.append(TString("vec2  fract(vec2  x);"));
-        s.append(TString("vec3  fract(vec3  x);"));
-        s.append(TString("vec4  fract(vec4  x);"));
-
-        s.append(TString("float mod(float x, float y);"));
-        s.append(TString("vec2  mod(vec2  x, float y);"));
-        s.append(TString("vec3  mod(vec3  x, float y);"));
-        s.append(TString("vec4  mod(vec4  x, float y);"));
-        s.append(TString("vec2  mod(vec2  x, vec2  y);"));
-        s.append(TString("vec3  mod(vec3  x, vec3  y);"));
-        s.append(TString("vec4  mod(vec4  x, vec4  y);"));
-
-        s.append(TString("float min(float x, float y);"));
-        s.append(TString("vec2  min(vec2  x, float y);"));
-        s.append(TString("vec3  min(vec3  x, float y);"));
-        s.append(TString("vec4  min(vec4  x, float y);"));
-        s.append(TString("vec2  min(vec2  x, vec2  y);"));
-        s.append(TString("vec3  min(vec3  x, vec3  y);"));
-        s.append(TString("vec4  min(vec4  x, vec4  y);"));
-
-        s.append(TString("float max(float x, float y);"));
-        s.append(TString("vec2  max(vec2  x, float y);"));
-        s.append(TString("vec3  max(vec3  x, float y);"));
-        s.append(TString("vec4  max(vec4  x, float y);"));
-        s.append(TString("vec2  max(vec2  x, vec2  y);"));
-        s.append(TString("vec3  max(vec3  x, vec3  y);"));
-        s.append(TString("vec4  max(vec4  x, vec4  y);"));
-
-        s.append(TString("float clamp(float x, float minVal, float maxVal);"));
-        s.append(TString("vec2  clamp(vec2  x, float minVal, float maxVal);"));
-        s.append(TString("vec3  clamp(vec3  x, float minVal, float maxVal);"));
-        s.append(TString("vec4  clamp(vec4  x, float minVal, float maxVal);"));
-        s.append(TString("vec2  clamp(vec2  x, vec2  minVal, vec2  maxVal);"));
-        s.append(TString("vec3  clamp(vec3  x, vec3  minVal, vec3  maxVal);"));
-        s.append(TString("vec4  clamp(vec4  x, vec4  minVal, vec4  maxVal);"));
-
-        s.append(TString("float mix(float x, float y, float a);"));
-        s.append(TString("vec2  mix(vec2  x, vec2  y, float a);"));
-        s.append(TString("vec3  mix(vec3  x, vec3  y, float a);"));
-        s.append(TString("vec4  mix(vec4  x, vec4  y, float a);"));
-        s.append(TString("vec2  mix(vec2  x, vec2  y, vec2  a);"));
-        s.append(TString("vec3  mix(vec3  x, vec3  y, vec3  a);"));
-        s.append(TString("vec4  mix(vec4  x, vec4  y, vec4  a);"));
-
-        s.append(TString("float step(float edge, float x);"));
-        s.append(TString("vec2  step(vec2  edge, vec2  x);"));
-        s.append(TString("vec3  step(vec3  edge, vec3  x);"));
-        s.append(TString("vec4  step(vec4  edge, vec4  x);"));
-        s.append(TString("vec2  step(float edge, vec2  x);"));
-        s.append(TString("vec3  step(float edge, vec3  x);"));
-        s.append(TString("vec4  step(float edge, vec4  x);"));
-
-        s.append(TString("float smoothstep(float edge0, float edge1, float x);"));
-        s.append(TString("vec2  smoothstep(vec2  edge0, vec2  edge1, vec2  x);"));
-        s.append(TString("vec3  smoothstep(vec3  edge0, vec3  edge1, vec3  x);"));
-        s.append(TString("vec4  smoothstep(vec4  edge0, vec4  edge1, vec4  x);"));
-        s.append(TString("vec2  smoothstep(float edge0, float edge1, vec2  x);"));
-        s.append(TString("vec3  smoothstep(float edge0, float edge1, vec3  x);"));
-        s.append(TString("vec4  smoothstep(float edge0, float edge1, vec4  x);"));
-
-        //
-        // Geometric Functions.
-        //
-        s.append(TString("float length(float x);"));
-        s.append(TString("float length(vec2  x);"));
-        s.append(TString("float length(vec3  x);"));
-        s.append(TString("float length(vec4  x);"));
-
-        s.append(TString("float distance(float p0, float p1);"));
-        s.append(TString("float distance(vec2  p0, vec2  p1);"));
-        s.append(TString("float distance(vec3  p0, vec3  p1);"));
-        s.append(TString("float distance(vec4  p0, vec4  p1);"));
-
-        s.append(TString("float dot(float x, float y);"));
-        s.append(TString("float dot(vec2  x, vec2  y);"));
-        s.append(TString("float dot(vec3  x, vec3  y);"));
-        s.append(TString("float dot(vec4  x, vec4  y);"));
-
-        s.append(TString("vec3 cross(vec3 x, vec3 y);"));
-        s.append(TString("float normalize(float x);"));
-        s.append(TString("vec2  normalize(vec2  x);"));
-        s.append(TString("vec3  normalize(vec3  x);"));
-        s.append(TString("vec4  normalize(vec4  x);"));
-
-        s.append(TString("float faceforward(float N, float I, float Nref);"));
-        s.append(TString("vec2  faceforward(vec2  N, vec2  I, vec2  Nref);"));
-        s.append(TString("vec3  faceforward(vec3  N, vec3  I, vec3  Nref);"));
-        s.append(TString("vec4  faceforward(vec4  N, vec4  I, vec4  Nref);"));
-
-        s.append(TString("float reflect(float I, float N);"));
-        s.append(TString("vec2  reflect(vec2  I, vec2  N);"));
-        s.append(TString("vec3  reflect(vec3  I, vec3  N);"));
-        s.append(TString("vec4  reflect(vec4  I, vec4  N);"));
-
-        s.append(TString("float refract(float I, float N, float eta);"));
-        s.append(TString("vec2  refract(vec2  I, vec2  N, float eta);"));
-        s.append(TString("vec3  refract(vec3  I, vec3  N, float eta);"));
-        s.append(TString("vec4  refract(vec4  I, vec4  N, float eta);"));
-
-        //
-        // Matrix Functions.
-        //
-        s.append(TString("mat2 matrixCompMult(mat2 x, mat2 y);"));
-        s.append(TString("mat3 matrixCompMult(mat3 x, mat3 y);"));
-        s.append(TString("mat4 matrixCompMult(mat4 x, mat4 y);"));
-
-        //
-        // Vector relational functions.
-        //
-        s.append(TString("bvec2 lessThan(vec2 x, vec2 y);"));
-        s.append(TString("bvec3 lessThan(vec3 x, vec3 y);"));
-        s.append(TString("bvec4 lessThan(vec4 x, vec4 y);"));
-
-        s.append(TString("bvec2 lessThan(ivec2 x, ivec2 y);"));
-        s.append(TString("bvec3 lessThan(ivec3 x, ivec3 y);"));
-        s.append(TString("bvec4 lessThan(ivec4 x, ivec4 y);"));
-
-        s.append(TString("bvec2 lessThanEqual(vec2 x, vec2 y);"));
-        s.append(TString("bvec3 lessThanEqual(vec3 x, vec3 y);"));
-        s.append(TString("bvec4 lessThanEqual(vec4 x, vec4 y);"));
-
-        s.append(TString("bvec2 lessThanEqual(ivec2 x, ivec2 y);"));
-        s.append(TString("bvec3 lessThanEqual(ivec3 x, ivec3 y);"));
-        s.append(TString("bvec4 lessThanEqual(ivec4 x, ivec4 y);"));
-
-        s.append(TString("bvec2 greaterThan(vec2 x, vec2 y);"));
-        s.append(TString("bvec3 greaterThan(vec3 x, vec3 y);"));
-        s.append(TString("bvec4 greaterThan(vec4 x, vec4 y);"));
-
-        s.append(TString("bvec2 greaterThan(ivec2 x, ivec2 y);"));
-        s.append(TString("bvec3 greaterThan(ivec3 x, ivec3 y);"));
-        s.append(TString("bvec4 greaterThan(ivec4 x, ivec4 y);"));
-
-        s.append(TString("bvec2 greaterThanEqual(vec2 x, vec2 y);"));
-        s.append(TString("bvec3 greaterThanEqual(vec3 x, vec3 y);"));
-        s.append(TString("bvec4 greaterThanEqual(vec4 x, vec4 y);"));
-
-        s.append(TString("bvec2 greaterThanEqual(ivec2 x, ivec2 y);"));
-        s.append(TString("bvec3 greaterThanEqual(ivec3 x, ivec3 y);"));
-        s.append(TString("bvec4 greaterThanEqual(ivec4 x, ivec4 y);"));
-
-        s.append(TString("bvec2 equal(vec2 x, vec2 y);"));
-        s.append(TString("bvec3 equal(vec3 x, vec3 y);"));
-        s.append(TString("bvec4 equal(vec4 x, vec4 y);"));
-
-        s.append(TString("bvec2 equal(ivec2 x, ivec2 y);"));
-        s.append(TString("bvec3 equal(ivec3 x, ivec3 y);"));
-        s.append(TString("bvec4 equal(ivec4 x, ivec4 y);"));
-
-        s.append(TString("bvec2 equal(bvec2 x, bvec2 y);"));
-        s.append(TString("bvec3 equal(bvec3 x, bvec3 y);"));
-        s.append(TString("bvec4 equal(bvec4 x, bvec4 y);"));
-
-        s.append(TString("bvec2 notEqual(vec2 x, vec2 y);"));
-        s.append(TString("bvec3 notEqual(vec3 x, vec3 y);"));
-        s.append(TString("bvec4 notEqual(vec4 x, vec4 y);"));
-
-        s.append(TString("bvec2 notEqual(ivec2 x, ivec2 y);"));
-        s.append(TString("bvec3 notEqual(ivec3 x, ivec3 y);"));
-        s.append(TString("bvec4 notEqual(ivec4 x, ivec4 y);"));
-
-        s.append(TString("bvec2 notEqual(bvec2 x, bvec2 y);"));
-        s.append(TString("bvec3 notEqual(bvec3 x, bvec3 y);"));
-        s.append(TString("bvec4 notEqual(bvec4 x, bvec4 y);"));
-
-        s.append(TString("bool any(bvec2 x);"));
-        s.append(TString("bool any(bvec3 x);"));
-        s.append(TString("bool any(bvec4 x);"));
-
-        s.append(TString("bool all(bvec2 x);"));
-        s.append(TString("bool all(bvec3 x);"));
-        s.append(TString("bool all(bvec4 x);"));
-
-        s.append(TString("bvec2 not(bvec2 x);"));
-        s.append(TString("bvec3 not(bvec3 x);"));
-        s.append(TString("bvec4 not(bvec4 x);"));
-
-        //
-        // Texture Functions.
-        //
-        s.append(TString("vec4 texture1D(sampler1D sampler, float coord);"));
-        s.append(TString("vec4 texture1DProj(sampler1D sampler, vec2 coord);"));
-        s.append(TString("vec4 texture1DProj(sampler1D sampler, vec4 coord);"));
-
-        s.append(TString("vec4 texture2D(sampler2D sampler, vec2 coord);"));
-        s.append(TString("vec4 texture2DProj(sampler2D sampler, vec3 coord);"));
-        s.append(TString("vec4 texture2DProj(sampler2D sampler, vec4 coord);"));
-
-        s.append(TString("vec4 texture3D(sampler3D sampler, vec3 coord);"));
-        s.append(TString("vec4 texture3DProj(sampler3D sampler, vec4 coord);"));
-
-        s.append(TString("vec4 textureCube(samplerCube sampler, vec3 coord);"));
-
-        s.append(TString("vec4 shadow1D(sampler1DShadow sampler, vec3 coord);"));
-
-        s.append(TString("vec4 shadow2D(sampler2DShadow sampler, vec3 coord);"));
-
-        s.append(TString("vec4 shadow1DProj(sampler1DShadow sampler, vec4 coord);"));
-
-        s.append(TString("vec4 shadow2DProj(sampler2DShadow sampler, vec4 coord);"));
-
-
-        //
-        // Noise functions.
-        //
-        s.append(TString("float noise1(float x);"));
-        s.append(TString("float noise1(vec2  x);"));
-        s.append(TString("float noise1(vec3  x);"));
-        s.append(TString("float noise1(vec4  x);"));
-
-        s.append(TString("vec2 noise2(float x);"));
-        s.append(TString("vec2 noise2(vec2  x);"));
-        s.append(TString("vec2 noise2(vec3  x);"));
-        s.append(TString("vec2 noise2(vec4  x);"));
-
-        s.append(TString("vec3 noise3(float x);"));
-        s.append(TString("vec3 noise3(vec2  x);"));
-        s.append(TString("vec3 noise3(vec3  x);"));
-        s.append(TString("vec3 noise3(vec4  x);"));
-
-        s.append(TString("vec4 noise4(float x);"));
-        s.append(TString("vec4 noise4(vec2  x);"));
-        s.append(TString("vec4 noise4(vec3  x);"));
-        s.append(TString("vec4 noise4(vec4  x);"));
-
-        s.append(TString("\n"));
-    }
-    {
-        //============================================================================
-        //
-        // Prototypes for built-in functions seen by vertex shaders only.
-        //
-        //============================================================================
-
-        TString& s = BuiltInFunctionsVertex;
-
-        //
-        // Geometric Functions.
-        //
-        s.append(TString("vec4 ftransform();"));
-
-        //
-        // Texture Functions.
-        //
-        s.append(TString("vec4 texture1DLod(sampler1D sampler, float coord, float lod);"));
-        s.append(TString("vec4 texture1DProjLod(sampler1D sampler, vec2 coord, float lod);"));
-        s.append(TString("vec4 texture1DProjLod(sampler1D sampler, vec4 coord, float lod);"));
-
-        s.append(TString("vec4 texture2DLod(sampler2D sampler, vec2 coord, float lod);"));
-        s.append(TString("vec4 texture2DProjLod(sampler2D sampler, vec3 coord, float lod);"));
-        s.append(TString("vec4 texture2DProjLod(sampler2D sampler, vec4 coord, float lod);"));
-
-        s.append(TString("vec4 texture3DLod(sampler3D sampler, vec3 coord, float lod);"));
-        s.append(TString("vec4 texture3DProjLod(sampler3D sampler, vec4 coord, float lod);"));
-        s.append(TString("vec4 textureCubeLod(samplerCube sampler, vec3 coord, float lod);"));
-
-        s.append(TString("vec4 shadow1DLod(sampler1DShadow sampler, vec3 coord, float lod);"));
-        s.append(TString("vec4 shadow2DLod(sampler2DShadow sampler, vec3 coord, float lod);"));
-        s.append(TString("vec4 shadow1DProjLod(sampler1DShadow sampler, vec4 coord, float lod);"));
-        s.append(TString("vec4 shadow2DProjLod(sampler2DShadow sampler, vec4 coord, float lod);"));
-
-        s.append(TString("\n"));
-    }
-    {
-        //============================================================================
-        //
-        // Prototypes for built-in functions seen by fragment shaders only.
-        //
-        //============================================================================
-
-        TString& s = BuiltInFunctionsFragment;
-
-        //
-        // Texture Functions.
-        //
-		s.append(TString("vec4 texture1D(sampler1D sampler, float coord, float bias);"));
-        s.append(TString("vec4 texture1DProj(sampler1D sampler, vec2 coord, float bias);"));
-        s.append(TString("vec4 texture1DProj(sampler1D sampler, vec4 coord, float bias);"));
-
-        s.append(TString("vec4 texture2D(sampler2D sampler, vec2 coord, float bias);"));
-        s.append(TString("vec4 texture2DProj(sampler2D sampler, vec3 coord, float bias);"));
-        s.append(TString("vec4 texture2DProj(sampler2D sampler, vec4 coord, float bias);"));
-
-		s.append(TString("vec4 texture3D(sampler3D sampler, vec3 coord, float bias);"));
-        s.append(TString("vec4 texture3DProj(sampler3D sampler, vec4 coord, float bias);"));
-        s.append(TString("vec4 textureCube(samplerCube sampler, vec3 coord, float bias);"));
-        
-		s.append(TString("vec4 shadow1D(sampler1DShadow sampler, vec3 coord, float bias);"));
-        s.append(TString("vec4 shadow2D(sampler2DShadow sampler, vec3 coord, float bias);"));
-        s.append(TString("vec4 shadow1DProj(sampler1DShadow sampler, vec4 coord, float bias);"));
-        s.append(TString("vec4 shadow2DProj(sampler2DShadow sampler, vec4 coord, float bias);"));
-
-        s.append(TString("float dFdx(float p);"));
-        s.append(TString("vec2  dFdx(vec2  p);"));
-        s.append(TString("vec3  dFdx(vec3  p);"));
-        s.append(TString("vec4  dFdx(vec4  p);"));
-
-        s.append(TString("float dFdy(float p);"));
-        s.append(TString("vec2  dFdy(vec2  p);"));
-        s.append(TString("vec3  dFdy(vec3  p);"));
-        s.append(TString("vec4  dFdy(vec4  p);"));
-
-        s.append(TString("float fwidth(float p);"));
-        s.append(TString("vec2  fwidth(vec2  p);"));
-        s.append(TString("vec3  fwidth(vec3  p);"));
-        s.append(TString("vec4  fwidth(vec4  p);"));
-
-        s.append(TString("\n"));
-    }
-    {
-        //============================================================================
-        //
-        // Standard Uniforms
-        //
-        //============================================================================
-
-        TString& s = StandardUniforms;
-       
-
-        //
-        // OpenGL'uniform' state.  Page numbers are in reference to version
-        // 1.4 of the OpenGL specification.
-        //
-
-        //
-        // Matrix state. p. 31, 32, 37, 39, 40.
-        //
-        s.append(TString("uniform mat4  gl_ModelViewMatrix;"));
-        s.append(TString("uniform mat4  gl_ProjectionMatrix;"));
-        s.append(TString("uniform mat4  gl_ModelViewProjectionMatrix;"));
-
-        //
-        // Derived matrix state that provides inverse and transposed versions
-        // of the matrices above.
-        //
-        s.append(TString("uniform mat3  gl_NormalMatrix;"));
-
-        s.append(TString("uniform mat4  gl_ModelViewMatrixInverse;"));
-        s.append(TString("uniform mat4  gl_ProjectionMatrixInverse;"));
-        s.append(TString("uniform mat4  gl_ModelViewProjectionMatrixInverse;"));
-
-        s.append(TString("uniform mat4  gl_ModelViewMatrixTranspose;"));
-        s.append(TString("uniform mat4  gl_ProjectionMatrixTranspose;"));
-        s.append(TString("uniform mat4  gl_ModelViewProjectionMatrixTranspose;"));
-
-        s.append(TString("uniform mat4  gl_ModelViewMatrixInverseTranspose;"));
-        s.append(TString("uniform mat4  gl_ProjectionMatrixInverseTranspose;"));
-        s.append(TString("uniform mat4  gl_ModelViewProjectionMatrixInverseTranspose;"));
-
-        //
-        // Normal scaling p. 39.
-        //
-        s.append(TString("uniform float gl_NormalScale;"));
-
-        //
-        // Depth range in window coordinates, p. 33
-        //
-        s.append(TString("struct gl_DepthRangeParameters {"));
-        s.append(TString("    float near;"));        // n
-        s.append(TString("    float far;"));         // f
-        s.append(TString("    float diff;"));        // f - n
-        s.append(TString("};"));
-        s.append(TString("uniform gl_DepthRangeParameters gl_DepthRange;"));
-
-
-        //
-        // Point Size, p. 66, 67.
-        //
-        s.append(TString("struct gl_PointParameters {"));
-        s.append(TString("    float size;"));
-        s.append(TString("    float sizeMin;"));
-        s.append(TString("    float sizeMax;"));
-        s.append(TString("    float fadeThresholdSize;"));
-        s.append(TString("    float distanceConstantAttenuation;"));
-        s.append(TString("    float distanceLinearAttenuation;"));
-        s.append(TString("    float distanceQuadraticAttenuation;"));
-        s.append(TString("};"));
-         
-        s.append(TString("uniform gl_PointParameters gl_Point;"));
-
-        //
-        // Material State p. 50, 55.
-        //
-        s.append(TString("struct gl_MaterialParameters {"));
-        s.append(TString("    vec4  emission;"));    // Ecm
-        s.append(TString("    vec4  ambient;"));     // Acm
-        s.append(TString("    vec4  diffuse;"));     // Dcm
-        s.append(TString("    vec4  specular;"));    // Scm
-        s.append(TString("    float shininess;"));   // Srm
-        s.append(TString("};"));
-        s.append(TString("uniform gl_MaterialParameters  gl_FrontMaterial;"));
-        s.append(TString("uniform gl_MaterialParameters  gl_BackMaterial;"));
-
-        //
-        // Light State p 50, 53, 55.
-        //
-
-        s.append(TString("struct gl_LightSourceParameters {"));
-        s.append(TString("    vec4  ambient;"));             // Acli
-        s.append(TString("    vec4  diffuse;"));             // Dcli
-        s.append(TString("    vec4  specular;"));            // Scli
-        s.append(TString("    vec4  position;"));            // Ppli
-        s.append(TString("    vec4  halfVector;"));          // Derived: Hi
-        s.append(TString("    vec3  spotDirection;"));       // Sdli
-        s.append(TString("    float spotExponent;"));        // Srli
-        s.append(TString("    float spotCutoff;"));          // Crli
-                                                             // (range: [0.0,90.0], 180.0)
-        s.append(TString("    float spotCosCutoff;"));       // Derived: cos(Crli)
-                                                             // (range: [1.0,0.0],-1.0)
-        s.append(TString("    float constantAttenuation;")); // K0
-        s.append(TString("    float linearAttenuation;"));   // K1
-        s.append(TString("    float quadraticAttenuation;"));// K2
-        s.append(TString("};"));
-
-
-        s.append(TString("struct gl_LightModelParameters {"));
-        s.append(TString("    vec4  ambient;"));       // Acs
-        s.append(TString("};"));
-
-        s.append(TString("uniform gl_LightModelParameters  gl_LightModel;"));
-
-        //
-        // Derived state from products of light and material.
-        //
-
-        s.append(TString("struct gl_LightModelProducts {"));
-        s.append(TString("    vec4  sceneColor;"));     // Derived. Ecm + Acm * Acs
-        s.append(TString("};"));
-
-        s.append(TString("uniform gl_LightModelProducts gl_FrontLightModelProduct;"));
-        s.append(TString("uniform gl_LightModelProducts gl_BackLightModelProduct;"));
-
-        s.append(TString("struct gl_LightProducts {"));
-        s.append(TString("    vec4  ambient;"));        // Acm * Acli
-        s.append(TString("    vec4  diffuse;"));        // Dcm * Dcli
-        s.append(TString("    vec4  specular;"));       // Scm * Scli
-        s.append(TString("};"));
-
-
-
-
-        //
-        // Fog p. 161
-        //
-        s.append(TString("struct gl_FogParameters {"));
-        s.append(TString("    vec4  color;"));
-        s.append(TString("    float density;"));
-        s.append(TString("    float start;"));
-        s.append(TString("    float end;"));
-        s.append(TString("    float scale;"));   //  1 / (gl_FogEnd - gl_FogStart)
-        s.append(TString("};"));
-         
-        s.append(TString("uniform gl_FogParameters gl_Fog;"));
-
-        s.append(TString("\n"));
-    }
-    {
-        //============================================================================
-        //
-        // Vertex attributes, p. 19.
-        //
-        //============================================================================
-
-        TString& s = StandardVertexAttributes;
-
-        s.append(TString("attribute vec4  gl_Color;"));
-        s.append(TString("attribute vec4  gl_SecondaryColor;"));
-        s.append(TString("attribute vec3  gl_Normal;"));
-        s.append(TString("attribute vec4  gl_Vertex;"));
-        s.append(TString("attribute vec4  gl_MultiTexCoord0;"));
-        s.append(TString("attribute vec4  gl_MultiTexCoord1;"));
-        s.append(TString("attribute vec4  gl_MultiTexCoord2;"));
-        s.append(TString("attribute vec4  gl_MultiTexCoord3;"));
-        s.append(TString("attribute vec4  gl_MultiTexCoord4;"));
-        s.append(TString("attribute vec4  gl_MultiTexCoord5;"));
-        s.append(TString("attribute vec4  gl_MultiTexCoord6;"));
-        s.append(TString("attribute vec4  gl_MultiTexCoord7;"));
-        s.append(TString("attribute float gl_FogCoord;"));
-
-        s.append(TString("\n"));
-    }
-    {
-        //============================================================================
-        //
-        // Define the output varying interface from the vertex shader.
-        //
-        //============================================================================
-
-        TString& s = StandardVertexVaryings;
-
-        s.append(TString("varying vec4  gl_FrontColor;"));
-        s.append(TString("varying vec4  gl_BackColor;"));
-        s.append(TString("varying vec4  gl_FrontSecondaryColor;"));
-        s.append(TString("varying vec4  gl_BackSecondaryColor;"));
-        s.append(TString("varying vec4  gl_TexCoord[];"));
-        s.append(TString("varying float gl_FogFragCoord;"));
-
-        s.append(TString("\n"));
-    }
-    {
-        //============================================================================
-        //
-        // Define the input varying interface to the fragment shader.
-        //
-        //============================================================================
-
-        TString& s = StandardFragmentVaryings;
-
-        s.append(TString("varying vec4  gl_Color;"));
-        s.append(TString("varying vec4  gl_SecondaryColor;"));
-        s.append(TString("varying vec4  gl_TexCoord[];"));
-        s.append(TString("varying float gl_FogFragCoord;"));
-
-        s.append(TString("\n"));
-    }
-
-    builtInStrings[EShLangFragment].push_back(BuiltInFunctions.c_str());
-    builtInStrings[EShLangFragment].push_back(BuiltInFunctionsFragment);
-    builtInStrings[EShLangFragment].push_back(StandardUniforms);
-    builtInStrings[EShLangFragment].push_back(StandardFragmentVaryings);
-
-    builtInStrings[EShLangVertex].push_back(BuiltInFunctions);
-    builtInStrings[EShLangVertex].push_back(BuiltInFunctionsVertex);
-    builtInStrings[EShLangVertex].push_back(StandardVertexVaryings);
-    builtInStrings[EShLangVertex].push_back(StandardVertexAttributes);
-    builtInStrings[EShLangVertex].push_back(StandardUniforms);
-}
-
-
-void TBuiltIns::initialize(const TBuiltInResource &resources)
-{
-    //
-    // Initialize all the built-in strings for parsing.
-    //
-    TString StandardUniforms;    
-
-    {
-        //============================================================================
-        //
-        // Standard Uniforms
-        //
-        //============================================================================
-
-        TString& s = StandardUniforms;
-       
-        //
-        // Implementation dependent constants.  The example values below
-        // are the minimum values allowed for these maximums.
-        //
-        char builtInConstant[80];
-        sprintf(builtInConstant, "const int  gl_MaxLights = %d;", resources.maxLights); // GL 1.0
-        s.append(TString(builtInConstant));                            
-        
-        sprintf(builtInConstant, "const int  gl_MaxClipPlanes = %d;", resources.maxClipPlanes);  // GL 1.0
-        s.append(TString(builtInConstant));
-        
-        sprintf(builtInConstant, "const int  gl_MaxTextureUnits = %d;", resources.maxTextureUnits); // GL 1.2
-        s.append(TString(builtInConstant));
-        
-        sprintf(builtInConstant, "const int  gl_MaxTextureCoords = %d;", resources.maxTextureCoords); // ARB_fragment_program
-        s.append(TString(builtInConstant));
-        
-        sprintf(builtInConstant, "const int  gl_MaxVertexAttribs = %d;", resources.maxVertexAttribs); // ARB_vertex_shader
-        s.append(TString(builtInConstant));
-        
-        sprintf(builtInConstant, "const int  gl_MaxVertexUniformComponents = %d;", resources.maxVertexUniformComponents); // ARB_vertex_shader
-        s.append(TString(builtInConstant));       
-        
-        sprintf(builtInConstant, "const int  gl_MaxVaryingFloats = %d;", resources.maxVaryingFloats); // ARB_vertex_shader
-        s.append(TString(builtInConstant));        
-        
-        sprintf(builtInConstant, "const int  gl_MaxVertexTextureImageUnits = %d;", resources.maxVertexTextureImageUnits); // ARB_vertex_shader
-        s.append(TString(builtInConstant));        
-        
-        sprintf(builtInConstant, "const int  gl_MaxCombinedTextureImageUnits = %d;", resources.maxCombinedTextureImageUnits); // ARB_vertex_shader
-        s.append(TString(builtInConstant));        
-        
-        sprintf(builtInConstant, "const int  gl_MaxTextureImageUnits = %d;", resources.maxTextureImageUnits); // ARB_fragment_shader
-        s.append(TString(builtInConstant));
-        
-        sprintf(builtInConstant, "const int  gl_MaxFragmentUniformComponents = %d;", resources.maxFragmentUniformComponents); // ARB_fragment_shader
-        s.append(TString(builtInConstant));
-        
-        sprintf(builtInConstant, "const int  gl_MaxDrawBuffers = %d;", resources.maxDrawBuffers); // proposed ARB_draw_buffers
-        s.append(TString(builtInConstant));
-
-        //
-        // OpenGL'uniform' state.  Page numbers are in reference to version
-        // 1.4 of the OpenGL specification.
-        //
-
-        //
-        // Matrix state. p. 31, 32, 37, 39, 40.
-        //
-        s.append(TString("uniform mat4  gl_TextureMatrix[gl_MaxTextureCoords];"));
-
-        //
-        // Derived matrix state that provides inverse and transposed versions
-        // of the matrices above.
-        //
-        s.append(TString("uniform mat4  gl_TextureMatrixInverse[gl_MaxTextureCoords];"));
-
-        s.append(TString("uniform mat4  gl_TextureMatrixTranspose[gl_MaxTextureCoords];"));
-
-        s.append(TString("uniform mat4  gl_TextureMatrixInverseTranspose[gl_MaxTextureCoords];"));
-
-        //
-        // Clip planes p. 42.
-        //
-        s.append(TString("uniform vec4  gl_ClipPlane[gl_MaxClipPlanes];"));
-
-        //
-        // Light State p 50, 53, 55.
-        //
-        s.append(TString("uniform gl_LightSourceParameters  gl_LightSource[gl_MaxLights];"));
-
-        //
-        // Derived state from products of light.
-        //
-        s.append(TString("uniform gl_LightProducts gl_FrontLightProduct[gl_MaxLights];"));
-        s.append(TString("uniform gl_LightProducts gl_BackLightProduct[gl_MaxLights];"));
-
-        //
-        // Textureg Environment and Generation, p. 152, p. 40-42.
-        //
-        s.append(TString("uniform vec4  gl_TextureEnvColor[gl_MaxTextureImageUnits];"));
-        s.append(TString("uniform vec4  gl_EyePlaneS[gl_MaxTextureCoords];"));
-        s.append(TString("uniform vec4  gl_EyePlaneT[gl_MaxTextureCoords];"));
-        s.append(TString("uniform vec4  gl_EyePlaneR[gl_MaxTextureCoords];"));
-        s.append(TString("uniform vec4  gl_EyePlaneQ[gl_MaxTextureCoords];"));
-        s.append(TString("uniform vec4  gl_ObjectPlaneS[gl_MaxTextureCoords];"));
-        s.append(TString("uniform vec4  gl_ObjectPlaneT[gl_MaxTextureCoords];"));
-        s.append(TString("uniform vec4  gl_ObjectPlaneR[gl_MaxTextureCoords];"));
-        s.append(TString("uniform vec4  gl_ObjectPlaneQ[gl_MaxTextureCoords];"));
-
-        s.append(TString("\n"));
-    }
-
-    builtInStrings[EShLangFragment].push_back(StandardUniforms);
-    builtInStrings[EShLangVertex].push_back(StandardUniforms);
-}
-
-void IdentifyBuiltIns(EShLanguage language, TSymbolTable& symbolTable)
-{
-    //
-    // First, insert some special built-in variables that are not in 
-    // the built-in header files.
-    //
-    switch(language) {
-
-    case EShLangFragment: {
-        symbolTable.insert(*new TVariable(NewPoolTString("gl_FrontFacing"), TType(EbtBool,  EvqFace, 1)));
-        symbolTable.insert(*new TVariable(NewPoolTString("gl_FragCoord"),   TType(EbtFloat, EvqFragCoord,   4)));
-        symbolTable.insert(*new TVariable(NewPoolTString("gl_FragColor"),   TType(EbtFloat, EvqFragColor,   4)));
-        symbolTable.insert(*new TVariable(NewPoolTString("gl_FragDepth"),   TType(EbtFloat, EvqFragDepth,   1)));
-
-        }
-        break;
-
-    case EShLangVertex:
-        symbolTable.insert(*new TVariable(NewPoolTString("gl_Position"),    TType(EbtFloat, EvqPosition,    4)));
-        symbolTable.insert(*new TVariable(NewPoolTString("gl_PointSize"),   TType(EbtFloat, EvqPointSize,   1)));
-        symbolTable.insert(*new TVariable(NewPoolTString("gl_ClipVertex"),  TType(EbtFloat, EvqClipVertex,  4)));
-        break;
-	default: break;
-    }
-
-    //
-    // Next, identify which built-ins from the already loaded headers have
-    // a mapping to an operator.  Those that are not identified as such are
-    // expected to be resolved through a library of functions, versus as
-    // operations.
-    //
-    symbolTable.relateToOperator("not",              EOpVectorLogicalNot);
-
-    symbolTable.relateToOperator("matrixCompMult",   EOpMul);
-    symbolTable.relateToOperator("mod",              EOpMod);
-
-    symbolTable.relateToOperator("equal",            EOpVectorEqual);
-    symbolTable.relateToOperator("notEqual",         EOpVectorNotEqual);
-    symbolTable.relateToOperator("lessThan",         EOpLessThan);
-    symbolTable.relateToOperator("greaterThan",      EOpGreaterThan);
-    symbolTable.relateToOperator("lessThanEqual",    EOpLessThanEqual);
-    symbolTable.relateToOperator("greaterThanEqual", EOpGreaterThanEqual);
-    
-    symbolTable.relateToOperator("radians",      EOpRadians);
-    symbolTable.relateToOperator("degrees",      EOpDegrees);
-    symbolTable.relateToOperator("sin",          EOpSin);
-    symbolTable.relateToOperator("cos",          EOpCos);
-    symbolTable.relateToOperator("tan",          EOpTan);
-    symbolTable.relateToOperator("asin",         EOpAsin);
-    symbolTable.relateToOperator("acos",         EOpAcos);
-    symbolTable.relateToOperator("atan",         EOpAtan);
-
-    symbolTable.relateToOperator("pow",          EOpPow);
-    symbolTable.relateToOperator("exp2",         EOpExp2);
-    symbolTable.relateToOperator("log",          EOpLog);
-    symbolTable.relateToOperator("exp",          EOpExp);
-    symbolTable.relateToOperator("log2",         EOpLog2);
-    symbolTable.relateToOperator("sqrt",         EOpSqrt);
-    symbolTable.relateToOperator("inversesqrt",  EOpInverseSqrt);
-
-    symbolTable.relateToOperator("abs",          EOpAbs);
-    symbolTable.relateToOperator("sign",         EOpSign);
-    symbolTable.relateToOperator("floor",        EOpFloor);
-    symbolTable.relateToOperator("ceil",         EOpCeil);
-    symbolTable.relateToOperator("fract",        EOpFract);
-    symbolTable.relateToOperator("min",          EOpMin);
-    symbolTable.relateToOperator("max",          EOpMax);
-    symbolTable.relateToOperator("clamp",        EOpClamp);
-    symbolTable.relateToOperator("mix",          EOpMix);
-    symbolTable.relateToOperator("step",         EOpStep);
-    symbolTable.relateToOperator("smoothstep",   EOpSmoothStep);
-
-    symbolTable.relateToOperator("length",       EOpLength);
-    symbolTable.relateToOperator("distance",     EOpDistance);
-    symbolTable.relateToOperator("dot",          EOpDot);
-    symbolTable.relateToOperator("cross",        EOpCross);
-    symbolTable.relateToOperator("normalize",    EOpNormalize);
-    symbolTable.relateToOperator("forward",      EOpFaceForward);
-    symbolTable.relateToOperator("reflect",      EOpReflect);
-    symbolTable.relateToOperator("refract",      EOpRefract);
-    
-    symbolTable.relateToOperator("any",          EOpAny);
-    symbolTable.relateToOperator("all",          EOpAll);
-
-    switch(language) {
-
-    case EShLangVertex:
-        break;
-    
-    case EShLangFragment:
-        symbolTable.relateToOperator("dFdx",         EOpDPdx);             
-        symbolTable.relateToOperator("dFdy",         EOpDPdy);             
-        symbolTable.relateToOperator("fwidth",       EOpFwidth);
-
-        break;
-
-    case EShLangPack:
-    case EShLangUnpack:
-        symbolTable.relateToOperator("itof",         EOpItof);
-        symbolTable.relateToOperator("ftoi",         EOpFtoi);
-        symbolTable.relateToOperator("skipPixels",   EOpSkipPixels);
-        symbolTable.relateToOperator("readInput",    EOpReadInput);
-        symbolTable.relateToOperator("writePixel",   EOpWritePixel);
-        symbolTable.relateToOperator("bitmapLSB",    EOpBitmapLsb);
-        symbolTable.relateToOperator("bitmapMSB",    EOpBitmapMsb);
-        symbolTable.relateToOperator("writeOutput",  EOpWriteOutput);
-        symbolTable.relateToOperator("readPixel",    EOpReadPixel);
-        break;
-	default: assert (false && "Language not supported");
-    }
-}
-
-void IdentifyBuiltIns(EShLanguage language, TSymbolTable& symbolTable, const TBuiltInResource &resources)
-{
-    //
-    // First, insert some special built-in variables that are not in 
-    // the built-in header files.
-    //
-    switch(language) {
-
-    case EShLangFragment: {
-            // Set up gl_FragData.  The array size.
-            TType fragData(EbtFloat, EvqFragColor,   4, false, true);
-            fragData.setArraySize(resources.maxDrawBuffers);
-            symbolTable.insert(*new TVariable(NewPoolTString("gl_FragData"),    fragData));
-        }
-        break;
-
-	default: break;
-    }
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.h
deleted file mode 100755
index b273f06ca..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _INITIALIZE_INCLUDED_
-#define _INITIALIZE_INCLUDED_
-
-#include "Include/ResourceLimits.h"
-#include "../Include/Common.h"
-#include "../Include/ShHandle.h"
-#include "SymbolTable.h"
-
-typedef TVector<TString> TBuiltInStrings;
-
-class TBuiltIns {
-public:
-    POOL_ALLOCATOR_NEW_DELETE(GlobalPoolAllocator)
-    void initialize();
-	void initialize(const TBuiltInResource& resources);
-    TBuiltInStrings* getBuiltInStrings() { return builtInStrings; }
-protected:
-    TBuiltInStrings builtInStrings[EShLangCount];
-};
-
-void IdentifyBuiltIns(EShLanguage, TSymbolTable&);
-void IdentifyBuiltIns(EShLanguage, TSymbolTable&, const TBuiltInResource &resources);
-
-#endif // _INITIALIZE_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/IntermTraverse.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/IntermTraverse.cpp
deleted file mode 100755
index da77806dd..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/IntermTraverse.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../Include/intermediate.h"
-
-//
-// Traverse the intermediate representation tree, and
-// call a node type specific function for each node.
-// Done recursively through the member function Traverse().
-// Node types can be skipped if their function to call is 0,
-// but their subtree will still be traversed.
-// Nodes with children can have their whole subtree skipped
-// if preVisit is turned on and the type specific function
-// returns false.
-//
-// preVisit, postVisit, and rightToLeft control what order
-// nodes are visited in.
-//
-
-//
-// Traversal functions for terminals are straighforward....
-//
-void TIntermSymbol::traverse(TIntermTraverser* it)
-{
-    if (it->visitSymbol)
-        it->visitSymbol(this, it);
-}
-
-void TIntermConstantUnion::traverse(TIntermTraverser* it)
-{
-    if (it->visitConstantUnion)
-        it->visitConstantUnion(this, it);
-}
-
-//
-// Traverse a binary node.
-//
-void TIntermBinary::traverse(TIntermTraverser* it)
-{
-    bool visit = true;
-
-    //
-    // visit the node before children if pre-visiting.
-    //
-    if (it->preVisit && it->visitBinary)
-        visit = it->visitBinary(true, this, it);
-    
-    //
-    // Visit the children, in the right order.
-    //
-    if (visit) {
-        ++it->depth;
-        if (it->rightToLeft) {
-            if (right)
-                right->traverse(it);
-            if (left)
-                left->traverse(it);
-        } else {
-            if (left)
-                left->traverse(it);
-            if (right)
-                right->traverse(it);
-        }
-        --it->depth;
-    }
-
-    //
-    // Visit the node after the children, if requested and the traversal
-    // hasn't been cancelled yet.
-    //
-    if (visit && it->postVisit && it->visitBinary)
-        it->visitBinary(false, this, it);
-}
-
-//
-// Traverse a unary node.  Same comments in binary node apply here.
-//
-void TIntermUnary::traverse(TIntermTraverser* it)
-{
-    bool visit = true;
-
-    if (it->preVisit && it->visitUnary)
-        visit = it->visitUnary(true, this, it);
-
-    if (visit) {
-        ++it->depth;
-        operand->traverse(it);
-        --it->depth;
-    }
-    
-    if (visit && it->postVisit && it->visitUnary)
-        it->visitUnary(false, this, it);
-}
-
-//
-// Traverse an aggregate node.  Same comments in binary node apply here.
-//
-void TIntermAggregate::traverse(TIntermTraverser* it)
-{
-    bool visit = true;
-    
-    if (it->preVisit && it->visitAggregate)
-        visit = it->visitAggregate(true, this, it);
-    
-    if (visit) {
-        ++it->depth;
-
-        TIntermSequence::iterator sit;
-        if (it->rightToLeft) {
-            sit = sequence.end();
-            while (sit != sequence.begin()) {
-                --sit;
-                (*sit)->traverse(it);
-            }
-        } else {
-            for (sit = sequence.begin(); sit != sequence.end(); ++sit)
-                (*sit)->traverse(it);
-        }
-        
-        --it->depth;
-    }
-
-    if (visit && it->postVisit && it->visitAggregate)
-        it->visitAggregate(false, this, it);
-}
-
-//
-// Traverse a selection node.  Same comments in binary node apply here.
-//
-void TIntermSelection::traverse(TIntermTraverser* it)
-{
-    bool visit = true;
-
-    if (it->preVisit && it->visitSelection)
-        visit = it->visitSelection(true, this, it);
-    
-    if (visit) {
-        ++it->depth;
-        if (it->rightToLeft) {
-            if (falseBlock)
-                falseBlock->traverse(it);
-			if (trueBlock)
-				trueBlock->traverse(it);
-            condition->traverse(it);
-        } else {
-            condition->traverse(it);
-			if (trueBlock)
-				trueBlock->traverse(it);
-            if (falseBlock)
-                falseBlock->traverse(it);
-        }
-        --it->depth;
-    }
-
-    if (visit && it->postVisit && it->visitSelection)
-        it->visitSelection(false, this, it);
-}
-
-//
-// Traverse a loop node.  Same comments in binary node apply here.
-//
-void TIntermLoop::traverse(TIntermTraverser* it)
-{
-    bool visit = true;
-
-    if (it->preVisit && it->visitLoop)
-        visit = it->visitLoop(true, this, it);
-    
-    if (visit) {
-        ++it->depth;
-        if (it->rightToLeft) {
-            if (terminal)
-                terminal->traverse(it);
-            if (body)
-                body->traverse(it);
-			if (test)
-				test->traverse(it);
-        } else {
-			if (test)
-				test->traverse(it);
-            if (body)
-                body->traverse(it);
-            if (terminal)
-                terminal->traverse(it);
-        }
-        --it->depth;
-    }
-
-    if (visit && it->postVisit && it->visitLoop)
-        it->visitLoop(false, this, it);
-}
-
-//
-// Traverse a branch node.  Same comments in binary node apply here.
-//
-void TIntermBranch::traverse(TIntermTraverser* it)
-{
-    bool visit = true;
-
-    if (it->preVisit && it->visitBranch)
-        visit = it->visitBranch(true, this, it);
-    
-    if (visit && expression) {
-        ++it->depth;
-        expression->traverse(it);
-        --it->depth;
-    }
-
-    if (visit && it->postVisit && it->visitBranch)
-        it->visitBranch(false, this, it);
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Intermediate.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Intermediate.cpp
deleted file mode 100755
index 056fe17de..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Intermediate.cpp
+++ /dev/null
@@ -1,2110 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-//
-// Build the intermediate representation.
-//
-
-#include "../Include/ShHandle.h"
-#include "localintermediate.h"
-#include "QualifierAlive.h"
-#include "RemoveTree.h"
-#include <float.h>
-
-////////////////////////////////////////////////////////////////////////////
-//
-// First set of functions are to help build the intermediate representation.
-// These functions are not member functions of the nodes.
-// They are called from parser productions.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-//
-// Add a terminal node for an identifier in an expression.
-//
-// Returns the added node.
-//
-TIntermSymbol* TIntermediate::addSymbol(int id, const TString& name, const TType& type, TSourceLoc line)
-{
-    TIntermSymbol* node = new TIntermSymbol(id, name, type);
-    node->setLine(line);
-
-    return node;
-}
-
-//
-// Connect two nodes with a new parent that does a binary operation on the nodes.
-//
-// Returns the added node.
-//
-TIntermTyped* TIntermediate::addBinaryMath(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc line, TSymbolTable& symbolTable)
-{
-    switch (op) {
-    case EOpLessThan:
-    case EOpGreaterThan:
-    case EOpLessThanEqual:
-    case EOpGreaterThanEqual:
-        if (left->getType().isMatrix() || left->getType().isArray() || left->getType().isVector() || left->getType().getBasicType() == EbtStruct) {
-            return 0;
-        }
-        break;
-    case EOpLogicalOr:
-    case EOpLogicalXor:
-    case EOpLogicalAnd:
-        if (left->getType().getBasicType() != EbtBool || left->getType().isMatrix() || left->getType().isArray() || left->getType().isVector()) {
-            return 0;
-        }
-        break;
-    case EOpAdd:
-    case EOpSub:
-    case EOpDiv:
-    case EOpMul:
-        if (left->getType().getBasicType() == EbtStruct || left->getType().getBasicType() == EbtBool)
-            return 0;
-    default: break; 
-    }
-
-    // 
-    // First try converting the children to compatible types.
-    //
-
-    if (!(left->getType().getStruct() && right->getType().getStruct())) {
-        TIntermTyped* child = addConversion(op, left->getType(), right);
-        if (child)
-            right = child;
-        else {
-            child = addConversion(op, right->getType(), left);
-            if (child)
-                left = child;
-            else
-                return 0;
-        }
-    } else {
-        if (left->getType() != right->getType())
-            return 0;
-    }
-
-
-    //
-    // Need a new node holding things together then.  Make
-    // one and promote it to the right type.
-    //
-    TIntermBinary* node = new TIntermBinary(op);
-    if (line == 0)
-        line = right->getLine();
-    node->setLine(line);
-
-    node->setLeft(left);
-    node->setRight(right);
-    if (! node->promote(infoSink))
-        return 0;
-
-    TIntermConstantUnion *leftTempConstant = left->getAsConstantUnion();
-    TIntermConstantUnion *rightTempConstant = right->getAsConstantUnion();
-        
-    if (leftTempConstant)
-        leftTempConstant = copyConstUnion(left->getAsConstantUnion())->getAsConstantUnion();
-    
-    if (rightTempConstant)
-        rightTempConstant = copyConstUnion(right->getAsConstantUnion())->getAsConstantUnion();
-    
-    if (right->getType().getQualifier() == EvqConst && left->getType().getQualifier() == EvqConst) {
-        if (right->getAsAggregate()) {
-            rightTempConstant = changeAggrToTempConst(right->getAsAggregate(), symbolTable, line);    
-            if (rightTempConstant->getUnionArrayPointer() == 0)
-                return 0;    
-        }
-
-        if (left->getAsAggregate()) {
-            leftTempConstant = changeAggrToTempConst(left->getAsAggregate(), symbolTable, line);  
-            if (leftTempConstant->getUnionArrayPointer() == 0)
-                return 0;
-        }
-    }
-
-    //
-    // See if we can fold constants.
-    //
-
-    TIntermTyped* typedReturnNode = 0;
-    if ( leftTempConstant && rightTempConstant) {
-        if (leftTempConstant->getSize() == 1 && rightTempConstant->getSize() > 1)
-            typedReturnNode = rightTempConstant->fold(node->getOp(), leftTempConstant, infoSink, false);
-        else
-            typedReturnNode = leftTempConstant->fold(node->getOp(), rightTempConstant, infoSink, true);
-
-        if (typedReturnNode)
-            return typedReturnNode;
-        else {
-            node->setLeft(leftTempConstant);
-            node->setRight(rightTempConstant);
-        }
-    } else if (leftTempConstant) {
-            node->setLeft(copyConstUnion(leftTempConstant));
-    } else if (rightTempConstant) {
-            node->setRight(rightTempConstant);
-    }
-
-    return node;
-}
-
-//
-// Connect two nodes through an assignment.
-//
-// Returns the added node.
-//
-TIntermTyped* TIntermediate::addAssign(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc line)
-{
-    //
-    // Like adding binary math, except the conversion can only go
-    // from right to left.
-    //
-    TIntermBinary* node = new TIntermBinary(op);
-    if (line == 0)
-        line = left->getLine();
-    node->setLine(line);
-
-    if (right->getAsConstantUnion()) { // if the right node of assignment is a TempConstant node, allocate its own new space and remove the pointer to the symbol table value
-        right = copyConstUnion(right->getAsConstantUnion()) ;
-        if (right == 0)
-            return 0;
-    }
-
-    TIntermTyped* child = addConversion(op, left->getType(), right);
-    if (child == 0)
-        return 0;
-
-    node->setLeft(left);
-    node->setRight(child);
-    if (! node->promote(infoSink))
-        return 0;
-
-    return node;
-}
-
-//
-// Connect two nodes through an index operator, where the left node is the base
-// of an array or struct, and the right node is a direct or indirect offset.
-//
-// Returns the added node.
-// The caller should set the type of the returned node.
-//
-TIntermTyped* TIntermediate::addIndex(TOperator op, TIntermTyped* base, TIntermTyped* index, TSourceLoc line)
-{
-    TIntermBinary* node = new TIntermBinary(op);
-    if (line == 0)
-        line = index->getLine();
-    node->setLine(line);
-    node->setLeft(base);
-    node->setRight(index);
-
-    // caller should set the type
-
-    return node;
-}
-
-//
-// Add one node as the parent of another that it operates on.
-//
-// Returns the added node.
-//
-TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermNode* childNode, TSourceLoc line, TSymbolTable& symbolTable)
-{
-    TIntermUnary* node;
-    TIntermTyped* child = childNode->getAsTyped();
-
-    if (child == 0) {
-        infoSink.info.message(EPrefixInternalError, "Bad type in AddUnaryMath", line);
-        return 0;
-    }
-
-    switch (op) {
-    case EOpLogicalNot:
-        if (child->getType().getBasicType() != EbtBool || child->getType().isMatrix() || child->getType().isArray() || child->getType().isVector()) {
-            return 0;
-        }
-        break;
-
-    case EOpPostIncrement:
-    case EOpPreIncrement:
-    case EOpPostDecrement:
-    case EOpPreDecrement:
-    case EOpNegative:
-        if (child->getType().getBasicType() == EbtStruct)
-            return 0;
-    default: break;
-    }
-    
-    //
-    // Do we need to promote the operand?
-    //
-    // Note: Implicit promotions were removed from the language.
-    //
-    TBasicType newType = EbtVoid;
-    switch (op) {
-    case EOpConstructInt:   newType = EbtInt;   break;
-    case EOpConstructBool:  newType = EbtBool;  break;
-    case EOpConstructFloat: newType = EbtFloat; break;
-    default: break;
-    }
-
-    if (newType != EbtVoid) {
-        child = addConversion(op, TType(newType, EvqTemporary, child->getNominalSize(), 
-                                                               child->isMatrix(), 
-                                                               child->isArray()),
-                              child);
-        if (child == 0)
-            return 0;
-    }
-
-    //
-    // For constructors, we are now done, it's all in the conversion.
-    //
-    switch (op) {
-    case EOpConstructInt:
-    case EOpConstructBool:
-    case EOpConstructFloat:
-        return child;
-    default: break;
-    }
-    
-    if (child->getAsConstantUnion())
-        child = copyConstUnion(child->getAsConstantUnion());
-
-    if (child->getAsAggregate() && child->getType().getQualifier() == EvqConst) {
-        child = changeAggrToTempConst(child->getAsAggregate(), symbolTable, line);    
-        if (child->getAsConstantUnion()->getUnionArrayPointer() == 0)
-            return 0;    
-    }
-    
-    TIntermConstantUnion *childTempConstant = child->getAsConstantUnion();
-    
-    //
-    // Make a new node for the operator.
-    //
-    node = new TIntermUnary(op);
-    if (line == 0)
-        line = child->getLine();
-    node->setLine(line);
-    node->setOperand(child);
-    
-    if (! node->promote(infoSink))
-        return 0;
-
-    if (childTempConstant)  {
-        TIntermTyped* newChild = childTempConstant->fold(op, 0, infoSink, true);
-        
-        if (newChild) {
-            return newChild;
-        } 
-    } 
-
-    return node;
-}
-
-//
-// This is the safe way to change the operator on an aggregate, as it
-// does lots of error checking and fixing.  Especially for establishing
-// a function call's operation on it's set of parameters.  Sequences
-// of instructions are also aggregates, but they just direnctly set
-// their operator to EOpSequence.
-//
-// Returns an aggregate node, which could be the one passed in if
-// it was already an aggregate.
-//
-TIntermAggregate* TIntermediate::setAggregateOperator(TIntermNode* node, TOperator op, TSourceLoc line)
-{
-    TIntermAggregate* aggNode;
-
-    //
-    // Make sure we have an aggregate.  If not turn it into one.
-    //
-    if (node) {
-        aggNode = node->getAsAggregate();
-        if (aggNode == 0 || aggNode->getOp() != EOpNull) {
-            //
-            // Make an aggregate containing this node.
-            //
-            aggNode = new TIntermAggregate();
-            aggNode->getSequence().push_back(node);
-            if (line == 0)
-                line = node->getLine();
-        }
-    } else
-        aggNode = new TIntermAggregate();
-
-    //
-    // Set the operator.
-    //
-    aggNode->setOperator(op);
-    if (line != 0)
-        aggNode->setLine(line);
-
-    return aggNode;
-}
-
-//
-// Convert one type to another.
-//
-// Returns the node representing the conversion, which could be the same
-// node passed in if no conversion was needed.
-//
-// Return 0 if a conversion can't be done.
-//
-TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TIntermTyped* node)
-{
-    //
-    // Does the base type allow operation?
-    //
-    switch (node->getBasicType()) {
-    case EbtVoid:
-    case EbtSampler1D:
-    case EbtSampler2D:
-    case EbtSampler3D:
-    case EbtSamplerCube:
-    case EbtSampler1DShadow:
-    case EbtSampler2DShadow:
-        return 0;
-    default: break;
-    }
-
-    //
-    // Otherwise, if types are identical, no problem
-    //
-    if (type == node->getType())
-        return node;
-
-    //
-    // If one's a structure, then no conversions.
-    //
-    if (type.getStruct() || node->getType().getStruct())
-        return 0;
-
-    TBasicType promoteTo;
-    
-    switch (op) {
-    //
-    // Explicit conversions
-    //
-    case EOpConstructBool:
-        promoteTo = EbtBool;
-        break;
-    case EOpConstructFloat:
-        promoteTo = EbtFloat;
-        break;
-    case EOpConstructInt:
-        promoteTo = EbtInt;
-        break;
-    default:
-        //
-        // implicit conversions were removed from the language.
-        //
-        if (type.getBasicType() != node->getType().getBasicType())
-            return 0;
-        //
-        // Size and structure could still differ, but that's
-        // handled by operator promotion.
-        //
-        return node;
-    }
-    
-    //
-    // Do conversion.
-    //
-    bool allConstant = true;
-    // check to see if there is an aggregate node
-    if (node->getAsAggregate()) {
-        if (node->getAsAggregate()->getOp() != EOpFunctionCall) {
-            // if the aggregate node is a constructor or a comma operator, look at its children, if they are constant
-            // convert them into the right type
-        TIntermSequence &sequenceVector = node->getAsAggregate()->getSequence() ;
-        for (TIntermSequence::iterator p = sequenceVector.begin(); 
-                                    p != sequenceVector.end(); p++) {
-            if (!(*p)->getAsTyped()->getAsConstantUnion())
-                allConstant = false;
-        }
-        } else
-            allConstant = false;
-    }
-    if (allConstant && node->getAsAggregate()) {  // we can do the constant folding here as all the nodes of the aggregate are const
-        TIntermSequence &sequenceVector = node->getAsAggregate()->getSequence() ;
-        for (TIntermSequence::iterator p = sequenceVector.begin(); 
-                                    p != sequenceVector.end(); p++) {
-            TIntermTyped* newNode = 0;
-            constUnion *unionArray = new constUnion[1];
-
-            switch (promoteTo) {
-            case EbtFloat:
-                switch ((*p)->getAsTyped()->getType().getBasicType()) {
-                
-                case EbtInt:  
-                    unionArray->fConst = static_cast<float>((*p)->getAsTyped()->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-                    newNode = addConstantUnion(unionArray, TType(EbtFloat, EvqConst), node->getLine());  break;
-                case EbtBool: 
-                    unionArray->fConst = static_cast<float>((*p)->getAsTyped()->getAsConstantUnion()->getUnionArrayPointer()->bConst);
-                    newNode = newNode = addConstantUnion(unionArray, TType(EbtFloat, EvqConst), node->getLine());  break;
-                default:
-                    infoSink.info.message(EPrefixInternalError, "Bad promotion node", node->getLine());
-                    return 0;
-                }
-                break;
-            case EbtInt:
-                switch ((*p)->getAsTyped()->getType().getBasicType()) {
-                case EbtFloat:
-                    unionArray->iConst = static_cast<int>((*p)->getAsTyped()->getAsConstantUnion()->getUnionArrayPointer()->fConst);
-                    newNode = addConstantUnion(unionArray, TType(EbtInt, EvqConst), node->getLine());  
-                    break;
-                case EbtBool:
-                    unionArray->iConst = static_cast<int>((*p)->getAsTyped()->getAsConstantUnion()->getUnionArrayPointer()->bConst);
-                    newNode = addConstantUnion(unionArray, TType(EbtInt, EvqConst), node->getLine());  
-                    break;
-                default:
-                    infoSink.info.message(EPrefixInternalError, "Bad promotion node", node->getLine());
-                    return 0;
-                }
-                break;
-            case EbtBool:
-                switch ((*p)->getAsTyped()->getType().getBasicType()) {
-                case EbtFloat:
-                    unionArray->bConst = (*p)->getAsTyped()->getAsConstantUnion()->getUnionArrayPointer()->fConst != 0.0 ;
-                    newNode = addConstantUnion(unionArray, TType(EbtBool, EvqConst), node->getLine());  
-                    break;
-                case EbtInt:
-                    unionArray->bConst = (*p)->getAsTyped()->getAsConstantUnion()->getUnionArrayPointer()->iConst != 0 ;
-                    newNode = addConstantUnion(unionArray, TType(EbtBool, EvqConst), node->getLine());  
-                    break;
-                default: 
-                    infoSink.info.message(EPrefixInternalError, "Bad promotion node", node->getLine());
-                    return 0;
-                } 
-                break;
-            default: 
-                infoSink.info.message(EPrefixInternalError, "Bad promotion node", node->getLine());
-                return 0;
-            }
-            if (newNode) {
-                sequenceVector.erase(p); 
-                sequenceVector.insert(p, newNode);
-            }
-        }
-        return node->getAsAggregate();
-    } else if (node->getAsConstantUnion()) {
-
-        return (promoteConstantUnion(promoteTo, node->getAsConstantUnion()));
-    } else {
-    
-        //
-        // Add a new newNode for the conversion.
-        //
-        TIntermUnary* newNode = 0;
-
-        TOperator newOp = EOpNull;
-        switch (promoteTo) {
-        case EbtFloat:
-            switch (node->getBasicType()) {
-            case EbtInt:   newOp = EOpConvIntToFloat;  break;
-            case EbtBool:  newOp = EOpConvBoolToFloat; break;
-            default: 
-                infoSink.info.message(EPrefixInternalError, "Bad promotion node", node->getLine());
-                return 0;
-            }
-            break;
-        case EbtBool:
-            switch (node->getBasicType()) {
-            case EbtInt:   newOp = EOpConvIntToBool;   break;
-            case EbtFloat: newOp = EOpConvFloatToBool; break;
-            default: 
-                infoSink.info.message(EPrefixInternalError, "Bad promotion node", node->getLine());
-                return 0;
-            }
-            break;
-        case EbtInt:
-            switch (node->getBasicType()) {
-            case EbtBool:   newOp = EOpConvBoolToInt;  break;
-            case EbtFloat:  newOp = EOpConvFloatToInt; break;
-            default: 
-                infoSink.info.message(EPrefixInternalError, "Bad promotion node", node->getLine());
-                return 0;
-            }
-            break;
-        default: 
-            infoSink.info.message(EPrefixInternalError, "Bad promotion type", node->getLine());
-            return 0;
-        }
-
-        TType type(promoteTo, EvqTemporary, node->getNominalSize(), node->isMatrix(), node->isArray());
-        newNode = new TIntermUnary(newOp, type);
-        newNode->setLine(node->getLine());
-        newNode->setOperand(node);
-
-        return newNode;
-    }
-}
-
-//
-// Safe way to combine two nodes into an aggregate.  Works with null pointers, 
-// a node that's not a aggregate yet, etc.
-//
-// Returns the resulting aggregate, unless 0 was passed in for 
-// both existing nodes.
-//
-TIntermAggregate* TIntermediate::growAggregate(TIntermNode* left, TIntermNode* right, TSourceLoc line)
-{
-    if (left == 0 && right == 0)
-        return 0;
-
-    TIntermAggregate* aggNode = 0;
-    if (left)
-        aggNode = left->getAsAggregate();
-    if (!aggNode || aggNode->getOp() != EOpNull) {
-        aggNode = new TIntermAggregate;
-        if (left)
-            aggNode->getSequence().push_back(left);
-    }
-
-    if (right)
-        aggNode->getSequence().push_back(right);
-
-    if (line != 0)
-        aggNode->setLine(line);
-
-    return aggNode;
-}
-
-//
-// Turn an existing node into an aggregate.
-//
-// Returns an aggregate, unless 0 was passed in for the existing node.
-//
-TIntermAggregate* TIntermediate::makeAggregate(TIntermNode* node, TSourceLoc line)
-{
-    if (node == 0)
-        return 0;
-
-    TIntermAggregate* aggNode = new TIntermAggregate;
-    aggNode->getSequence().push_back(node);
-
-    if (line != 0)
-        aggNode->setLine(line);
-    else
-        aggNode->setLine(node->getLine());
-
-    return aggNode;
-}
-
-//
-// For "if" test nodes.  There are three children; a condition,
-// a true path, and a false path.  The two paths are in the
-// nodePair.
-//
-// Returns the selection node created.
-//
-TIntermNode* TIntermediate::addSelection(TIntermTyped* cond, TIntermNodePair nodePair, TSourceLoc line)
-{
-    //
-    // For compile time constant selections, prune the code and 
-    // test now.
-    //
-    
-    if (cond->getAsTyped() && cond->getAsTyped()->getAsConstantUnion()) {
-        if (cond->getAsTyped()->getAsConstantUnion()->getUnionArrayPointer()->bConst)
-            return nodePair.node1;
-        else
-            return nodePair.node2;
-    }
-
-    TIntermSelection* node = new TIntermSelection(cond, nodePair.node1, nodePair.node2);
-    node->setLine(line);
-
-    return node;
-}
-
-
-TIntermTyped* TIntermediate::addComma(TIntermTyped* left, TIntermTyped* right, TSourceLoc line)
-{
-    if (left->getType().getQualifier() == EvqConst && right->getType().getQualifier() == EvqConst) {
-        return right;
-    } else {
-        TIntermTyped *commaAggregate = growAggregate(left, right, line);
-        commaAggregate->getAsAggregate()->setOperator(EOpComma);    
-        commaAggregate->setType(right->getType());
-        commaAggregate->getTypePointer()->changeQualifier(EvqTemporary);
-        return commaAggregate;
-    }
-}
-
-//
-// For "?:" test nodes.  There are three children; a condition,
-// a true path, and a false path.  The two paths are specified
-// as separate parameters.
-//
-// Returns the selection node created, or 0 if one could not be.
-//
-TIntermTyped* TIntermediate::addSelection(TIntermTyped* cond, TIntermTyped* trueBlock, TIntermTyped* falseBlock, TSourceLoc line)
-{
-    //
-    // Get compatible types.
-    //
-    TIntermTyped* child = addConversion(EOpSequence, trueBlock->getType(), falseBlock);
-    if (child)
-        falseBlock = child;
-    else {
-        child = addConversion(EOpSequence, falseBlock->getType(), trueBlock);
-        if (child)
-            trueBlock = child;
-        else
-            return 0;
-    }
-
-    //
-    // See if condition is constant, and select now.
-    //
-
-    if (cond->getAsConstantUnion()) {
-        if (cond->getAsConstantUnion()->getUnionArrayPointer()->bConst)
-            return trueBlock;
-        else
-            return falseBlock;
-    }
-
-    //
-    // Make a selection node.
-    //
-    TIntermSelection* node = new TIntermSelection(cond, trueBlock, falseBlock, trueBlock->getType());
-    node->setLine(line);
-
-    return node;
-}
-
-//
-// Constant terminal nodes.  Has a union that contains bool, float or int constants
-//
-// Returns the constant union node created.
-//
-
-TIntermConstantUnion* TIntermediate::addConstantUnion(constUnion* unionArrayPointer, const TType& t, TSourceLoc line)
-{
-    TIntermConstantUnion* node = new TIntermConstantUnion(unionArrayPointer, t);
-    node->setLine(line);
-
-    return node;
-}
-
-TIntermTyped* TIntermediate::addSwizzle(TVectorFields& fields, TSourceLoc line)
-{
-    
-    TIntermAggregate* node = new TIntermAggregate(EOpSequence);
-
-    node->setLine(line);
-    TIntermConstantUnion* constIntNode;
-    TIntermSequence &sequenceVector = node->getSequence();
-    constUnion* unionArray;
-
-    for (int i = 0; i < fields.num; i++) {
-        unionArray = new constUnion[1];
-        unionArray->iConst = fields.offsets[i];
-        constIntNode = addConstantUnion(unionArray, TType(EbtInt, EvqConst), line);
-        sequenceVector.push_back(constIntNode);
-    }
-
-    return node;
-}
-
-//
-// Create loop nodes.
-//
-TIntermNode* TIntermediate::addLoop(TIntermNode* body, TIntermTyped* test, TIntermTyped* terminal, bool testFirst, TSourceLoc line)
-{
-    TIntermNode* node = new TIntermLoop(body, test, terminal, testFirst);
-    node->setLine(line);
-    
-    return node;
-}
-
-//
-// Add branches.
-//
-TIntermBranch* TIntermediate::addBranch(TOperator branchOp, TSourceLoc line)
-{
-    return addBranch(branchOp, 0, line);
-}
-
-TIntermBranch* TIntermediate::addBranch(TOperator branchOp, TIntermTyped* expression, TSourceLoc line)
-{
-    TIntermBranch* node = new TIntermBranch(branchOp, expression);
-    node->setLine(line);
-
-    return node;
-}
-
-//
-// This is to be executed once the final root is put on top by the parsing
-// process.
-//
-bool TIntermediate::postProcess(TIntermNode* root, EShLanguage language)
-{
-    if (root == 0)
-        return true;
-
-    //
-    // First, finish off the top level sequence, if any
-    //
-    TIntermAggregate* aggRoot = root->getAsAggregate();
-    if (aggRoot && aggRoot->getOp() == EOpNull)
-        aggRoot->setOperator(EOpSequence);
-
-    return true;
-}
-
-//
-// This deletes the tree.
-//
-void TIntermediate::remove(TIntermNode* root)
-{
-    if (root)
-        RemoveAllTreeNodes(root);
-}
-
-////////////////////////////////////////////////////////////////
-//
-// Member functions of the nodes used for building the tree.
-//
-////////////////////////////////////////////////////////////////
-
-//
-// Say whether or not an operation node changes the value of a variable.
-//
-// Returns true if state is modified.
-//
-bool TIntermOperator::modifiesState() const
-{
-    switch (op) {    
-    case EOpPostIncrement: 
-    case EOpPostDecrement: 
-    case EOpPreIncrement:  
-    case EOpPreDecrement:  
-    case EOpAssign:    
-    case EOpAddAssign: 
-    case EOpSubAssign: 
-    case EOpMulAssign: 
-    case EOpVectorTimesMatrixAssign:
-    case EOpVectorTimesScalarAssign:
-    case EOpMatrixTimesScalarAssign:
-    case EOpMatrixTimesMatrixAssign:
-    case EOpDivAssign: 
-    case EOpModAssign: 
-    case EOpAndAssign: 
-    case EOpInclusiveOrAssign: 
-    case EOpExclusiveOrAssign: 
-    case EOpLeftShiftAssign:   
-    case EOpRightShiftAssign:  
-        return true;
-    default:
-        return false;
-    }
-}
-
-//
-// returns true if the operator is for one of the constructors
-//
-bool TIntermOperator::isConstructor() const
-{
-    switch (op) {
-    case EOpConstructVec2:
-    case EOpConstructVec3:
-    case EOpConstructVec4:
-    case EOpConstructMat2:
-    case EOpConstructMat3:
-    case EOpConstructMat4:
-    case EOpConstructFloat:
-    case EOpConstructIVec2:
-    case EOpConstructIVec3:
-    case EOpConstructIVec4:
-    case EOpConstructInt:
-    case EOpConstructBVec2:
-    case EOpConstructBVec3:
-    case EOpConstructBVec4:
-    case EOpConstructBool:
-    case EOpConstructStruct:
-        return true;
-    default:
-        return false;
-    }
-}
-//
-// Make sure the type of a unary operator is appropriate for its 
-// combination of operation and operand type.
-//
-// Returns false in nothing makes sense.
-//
-bool TIntermUnary::promote(TInfoSink&)
-{
-    switch (op) {
-    case EOpLogicalNot:
-        if (operand->getBasicType() != EbtBool)
-            return false;
-        break;
-    case EOpBitwiseNot:
-        if (operand->getBasicType() != EbtInt)
-            return false;
-        break;
-    case EOpNegative:
-    case EOpPostIncrement:
-    case EOpPostDecrement:
-    case EOpPreIncrement:
-    case EOpPreDecrement:
-        if (operand->getBasicType() == EbtBool)
-            return false;
-        break;
-
-    // operators for built-ins are already type checked against their prototype
-    case EOpAny:
-    case EOpAll:
-    case EOpVectorLogicalNot:
-        return true;
-
-    default:
-        if (operand->getBasicType() != EbtFloat)
-            return false;
-    }
-    
-    setType(operand->getType());
-
-    return true;
-}
-
-//
-// Establishes the type of the resultant operation, as well as
-// makes the operator the correct one for the operands.
-//
-// Returns false if operator can't work on operands.
-//
-bool TIntermBinary::promote(TInfoSink& infoSink)
-{
-    int size = left->getNominalSize();
-    if (right->getNominalSize() > size)
-        size = right->getNominalSize();
-
-    TBasicType type = left->getBasicType();
-
-    //
-    // Don't operate on arrays.
-    //
-    if (left->isArray() || right->isArray())
-        return false;
-
-    //
-    // Base assumption:  just make the type the same as the left
-    // operand.  Then only deviations from this need be coded.
-    //
-    setType(TType(type, EvqTemporary, left->getNominalSize(), left->isMatrix()));
-    
-    //
-    // All scalars.  Code after this test assumes this case is removed!
-    //
-    if (size == 1) {
-
-        switch (op) {
-
-        //
-        // Promote to conditional
-        //
-        case EOpEqual:
-        case EOpNotEqual:
-        case EOpLessThan:
-        case EOpGreaterThan:
-        case EOpLessThanEqual:
-        case EOpGreaterThanEqual:
-            setType(TType(EbtBool));
-            break;
-
-        //
-        // And and Or operate on conditionals
-        //
-        case EOpLogicalAnd:
-        case EOpLogicalOr:
-            if (left->getBasicType() != EbtBool || right->getBasicType() != EbtBool)
-                return false;           
-            setType(TType(EbtBool));
-            break;
-
-        //
-        // Check for integer only operands.
-        //
-        case EOpMod:
-        case EOpRightShift:
-        case EOpLeftShift:
-        case EOpAnd:
-        case EOpInclusiveOr:
-        case EOpExclusiveOr:
-            if (left->getBasicType() != EbtInt || right->getBasicType() != EbtInt)
-                return false;
-            break;
-        case EOpModAssign:
-        case EOpAndAssign:
-        case EOpInclusiveOrAssign:
-        case EOpExclusiveOrAssign:
-        case EOpLeftShiftAssign:
-        case EOpRightShiftAssign:
-            if (left->getBasicType() != EbtInt || right->getBasicType() != EbtInt)
-                return false;
-            // fall through
-
-        //
-        // Everything else should have matching types
-        //
-        default:
-            if (left->getBasicType() != right->getBasicType() ||
-                left->isMatrix()     != right->isMatrix())
-                return false;
-        }
-
-        return true;
-    }
-
-    //
-    // Are the sizes compatible?
-    //
-    if ( left->getNominalSize() != size &&  left->getNominalSize() != 1 ||
-        right->getNominalSize() != size && right->getNominalSize() != 1)
-        return false;
-
-    //
-    // Can these two operands be combined?
-    //
-    switch (op) {
-    case EOpMul:
-        if (!left->isMatrix() && right->isMatrix()) {
-            if (left->isVector())
-                op = EOpVectorTimesMatrix;
-            else {
-                op = EOpMatrixTimesScalar;
-                setType(TType(type, EvqTemporary, size, true));
-            }
-        } else if (left->isMatrix() && !right->isMatrix()) {
-            if (right->isVector()) {
-                op = EOpMatrixTimesVector;
-                setType(TType(type, EvqTemporary, size, false));
-            } else {
-                op = EOpMatrixTimesScalar;
-            }
-        } else if (left->isMatrix() && right->isMatrix()) {
-            op = EOpMatrixTimesMatrix;
-        } else if (!left->isMatrix() && !right->isMatrix()) {
-            if (left->isVector() && right->isVector()) {
-                // leave as component product
-            } else if (left->isVector() || right->isVector()) {
-                op = EOpVectorTimesScalar;
-                setType(TType(type, EvqTemporary, size, false));
-            }
-        } else {
-            infoSink.info.message(EPrefixInternalError, "Missing elses", getLine());
-            return false;
-        }
-        break;
-    case EOpMulAssign:
-        if (!left->isMatrix() && right->isMatrix()) {
-            if (left->isVector())
-                op = EOpVectorTimesMatrixAssign;
-            else {
-                return false;
-            }
-        } else if (left->isMatrix() && !right->isMatrix()) {
-            if (right->isVector()) {
-                return false;
-            } else {
-                op = EOpMatrixTimesScalarAssign;
-            }
-        } else if (left->isMatrix() && right->isMatrix()) {
-            op = EOpMatrixTimesMatrixAssign;
-        } else if (!left->isMatrix() && !right->isMatrix()) {
-            if (left->isVector() && right->isVector()) {
-                // leave as component product
-            } else if (left->isVector() || right->isVector()) {
-                if (! left->isVector())
-                    return false;
-                op = EOpVectorTimesScalarAssign;
-                setType(TType(type, EvqTemporary, size, false));
-            }
-        } else {
-            infoSink.info.message(EPrefixInternalError, "Missing elses", getLine());
-            return false;
-        }
-        break;      
-    case EOpAssign:
-        if (left->getNominalSize() != right->getNominalSize())
-            return false;
-        // fall through
-    case EOpAdd:
-    case EOpSub:
-    case EOpDiv:
-    case EOpMod:
-    case EOpAddAssign:
-    case EOpSubAssign:
-    case EOpDivAssign:
-    case EOpModAssign:
-        if (left->isMatrix() && right->isVector() ||
-            left->isVector() && right->isMatrix() ||
-            left->getBasicType() != right->getBasicType())
-            return false;
-        setType(TType(type, EvqTemporary, size, left->isMatrix() || right->isMatrix()));
-        break;
-        
-    case EOpEqual:
-    case EOpNotEqual:
-    case EOpLessThan:
-    case EOpGreaterThan:
-    case EOpLessThanEqual:
-    case EOpGreaterThanEqual:
-        if (left->isMatrix() && right->isVector() ||
-            left->isVector() && right->isMatrix() ||
-            left->getBasicType() != right->getBasicType())
-            return false;
-        setType(TType(EbtBool));
-        break;
-
-default:
-        return false;
-    }
-
-    //
-    // One more check for assignment.  The Resulting type has to match the left operand.
-    //
-    switch (op) {
-    case EOpAssign:
-    case EOpAddAssign:
-    case EOpSubAssign:
-    case EOpMulAssign:
-    case EOpDivAssign:
-    case EOpModAssign:
-    case EOpAndAssign:
-    case EOpInclusiveOrAssign:
-    case EOpExclusiveOrAssign:
-    case EOpLeftShiftAssign:
-    case EOpRightShiftAssign:
-        if (getType() != left->getType())
-            return false;
-        break;
-    default: 
-        break;
-    }
-    
-    return true;
-}
-
-bool compareStructure(const TType& leftNodeType, constUnion* rightUnionArray, constUnion* leftUnionArray, int& index)
-{
-    TTypeList* fields = leftNodeType.getStruct();
-
-    size_t structSize = fields->size();
-
-    for (size_t j = 0; j < structSize; j++) {
-        int size = (*fields)[j].type->getInstanceSize();
-        for (int i = 0; i < size; i++) {
-            switch ((*fields)[j].type->getBasicType()) {
-            case EbtFloat:
-                if (leftUnionArray[index].fConst != rightUnionArray[index].fConst)
-                    return false;
-                index++;
-                break;
-            case EbtInt:
-                if (leftUnionArray[index].iConst != rightUnionArray[index].iConst)
-                    return false;
-                index++;
-                break;
-            case EbtBool:
-                if (leftUnionArray[index].bConst != rightUnionArray[index].bConst)
-                    return false;
-                index++;
-                break;
-            case EbtStruct:
-                if (!compareStructure(*(*fields)[j].type, rightUnionArray, leftUnionArray, index))
-                    return false;
-                break;
-            default: 
-                assert(true && "Cannot compare");
-                break;
-            }    
-            
-        }
-    }
-    return true;
-} 
-
-//
-// The fold functions see if an operation on a constant can be done in place,
-// without generating run-time code.
-//
-// Returns the node to keep using, which may or may not be the node passed in.
-//
-
-TIntermTyped* TIntermConstantUnion::fold(TOperator op, TIntermTyped* constantNode, TInfoSink& infoSink, bool leftOperand)
-{   
-    constUnion *unionArray = this->getUnionArrayPointer(); 
-
-    if (constantNode) {
-        if (constantNode->getAsConstantUnion() && constantNode->getSize() == 1 && constantNode->getType().getBasicType() != EbtStruct
-            && this->getSize() > 1) {
-            TIntermConstantUnion *node = constantNode->getAsConstantUnion();
-            TIntermConstantUnion *newNode;
-            constUnion* tempConstArray;
-            switch(op) {
-            case EOpAdd: 
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {
-                        switch (this->getType().getBasicType()) {
-                        case EbtFloat: tempConstArray[i].fConst = unionArray[i].fConst + node->getUnionArrayPointer()->fConst; break;
-                        case EbtInt:   tempConstArray[i].iConst = unionArray[i].iConst + node->getUnionArrayPointer()->iConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"+\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-            case EOpMatrixTimesScalar: 
-            case EOpVectorTimesScalar:
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {
-                        switch (this->getType().getBasicType()) {
-                        case EbtFloat: tempConstArray[i].fConst = unionArray[i].fConst * node->getUnionArrayPointer()->fConst; break;
-                        case EbtInt:   tempConstArray[i].iConst = unionArray[i].iConst * node->getUnionArrayPointer()->iConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"*\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-            case EOpSub:
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {
-                        switch (this->getType().getBasicType()) {
-                        case EbtFloat: 
-                            if (leftOperand)
-                                tempConstArray[i].fConst = unionArray[i].fConst - node->getUnionArrayPointer()->fConst; 
-                            else
-                                tempConstArray[i].fConst = node->getUnionArrayPointer()->fConst - unionArray[i].fConst; 
-                        break;
-
-                        case EbtInt:   
-                            if (leftOperand) 
-                                tempConstArray[i].iConst = unionArray[i].iConst - node->getUnionArrayPointer()->iConst; 
-                            else
-                                tempConstArray[i].iConst = node->getUnionArrayPointer()->iConst - unionArray[i].iConst; 
-                            break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"-\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-
-            case EOpDiv:
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {
-                        switch (this->getType().getBasicType()) {
-                        case EbtFloat: 
-                            if (leftOperand) {
-                                if (node->getUnionArrayPointer()->fConst == 0.0) {
-                                    infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                                    tempConstArray[i].fConst = FLT_MAX;
-                                } else
-                                    tempConstArray[i].fConst = unionArray[i].fConst / node->getUnionArrayPointer()->fConst; 
-                            } else {
-                                if (unionArray[i].fConst == 0.0) {
-                                    infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                                    tempConstArray[i].fConst = FLT_MAX;
-                                } else
-                                    tempConstArray[i].fConst = node->getUnionArrayPointer()->fConst / unionArray[i].fConst; 
-                            }
-                            break;
-
-                        case EbtInt:   
-                            if (leftOperand) {
-                                if (node->getUnionArrayPointer()->iConst == 0) {
-                                    infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                                    tempConstArray[i].iConst = INT_MAX;
-                                } else
-                                    tempConstArray[i].iConst = unionArray[i].iConst / node->getUnionArrayPointer()->iConst; 
-                            } else {
-                                if (unionArray[i].iConst == 0) {
-                                    infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                                    tempConstArray[i].iConst = INT_MAX;
-                                } else
-                                    tempConstArray[i].iConst = node->getUnionArrayPointer()->iConst / unionArray[i].iConst; 
-                            }
-                            break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"/\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-
-            case EOpLogicalAnd: // this code is written for possible future use, will not get executed currently
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {
-                        switch (this->getType().getBasicType()) {
-                        case EbtBool:   tempConstArray[i].bConst = unionArray[i].bConst && node->getUnionArrayPointer()->bConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"&&\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-            
-            case EOpLogicalXor: // this code is written for possible future use, will not get executed currently
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {
-                        switch (this->getType().getBasicType()) {
-                        case EbtBool:   tempConstArray[i].bConst = unionArray[i].bConst ^ node->getUnionArrayPointer()->bConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"^^\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-
-            case EOpLogicalOr: // this code is written for possible future use, will not get executed currently                
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {
-                        switch (this->getType().getBasicType()) {
-                        case EbtBool:   tempConstArray[i].bConst = unionArray[i].bConst || node->getUnionArrayPointer()->bConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"||\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-
-            default:
-                infoSink.info.message(EPrefixInternalError, "Invalid operator for constant folding", this->getLine());
-                return 0;
-            }
-            newNode = new TIntermConstantUnion(tempConstArray, this->getType());
-            newNode->setLine(this->getLine());
-                
-            return newNode;
-        } else if (constantNode->getAsConstantUnion() && (this->getSize() > 1 || this->getType().getBasicType() == EbtStruct)) {
-            TIntermConstantUnion *node = constantNode->getAsConstantUnion();
-            constUnion *rightUnionArray = node->getUnionArrayPointer(); 
-            constUnion* tempConstArray = 0;
-            TIntermConstantUnion *tempNode;
-            int index = 0;
-            bool boolNodeFlag = false;
-            switch(op) {
-            case EOpAdd: 
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {            
-                        switch (this->getType().getBasicType()) {
-                        case EbtFloat: tempConstArray[i].fConst = unionArray[i].fConst + rightUnionArray[i].fConst; break;
-                        case EbtInt:   tempConstArray[i].iConst = unionArray[i].iConst + rightUnionArray[i].iConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"+\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-            case EOpSub: 
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {            
-                        switch (this->getType().getBasicType()) {                                
-                        case EbtFloat: 
-                            if (leftOperand)
-                                tempConstArray[i].fConst = unionArray[i].fConst - rightUnionArray[i].fConst; 
-                            else
-                                tempConstArray[i].fConst = rightUnionArray[i].fConst - unionArray[i].fConst; 
-                        break;
-
-                        case EbtInt:   
-                            if (leftOperand) 
-                                tempConstArray[i].iConst = unionArray[i].iConst - rightUnionArray[i].iConst;
-                            else
-                                tempConstArray[i].iConst = rightUnionArray[i].iConst - unionArray[i].iConst; 
-                            break;
-            
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"-\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-            case EOpMul: 
-                if (this->isVector()) { // two vectors multiplied together
-                    int size = this->getSize();
-                    tempConstArray = new constUnion[size];
-                    
-                    for (int i = 0; i < size; i++) {            
-                        switch (this->getType().getBasicType()) {
-                        case EbtFloat: tempConstArray[i].fConst = unionArray[i].fConst * rightUnionArray[i].fConst;     break;
-                        case EbtInt:   tempConstArray[i].iConst = unionArray[i].iConst * rightUnionArray[i].iConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for vector multiply", this->getLine());
-                            return 0;
-                        }
-                    }
-                } 
-                break;
-            case EOpMatrixTimesMatrix:                
-                if (this->getType().getBasicType() != EbtFloat || node->getBasicType() != EbtFloat) {
-                        infoSink.info.message(EPrefixInternalError, "Constant Folding cannot be done for matrix multiply", this->getLine());
-                        return 0;
-                }
-                {// support MSVC++6.0
-                    int size = this->getNominalSize();
-                    tempConstArray = new constUnion[size*size];
-                    for (int row = 0; row < size; row++) {
-                        for (int column = 0; column < size; column++) {
-                            tempConstArray[size * column + row].fConst = 0.0;
-                            for (int i = 0; i < size; i++) {
-                                tempConstArray[size * column + row].fConst += unionArray[i * size + row].fConst * (rightUnionArray[column * size + i].fConst); 
-                            }
-                        }
-                    }
-                }
-                break;
-            case EOpDiv: 
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {            
-                        switch (this->getType().getBasicType()) {
-                        case EbtFloat: 
-                            if (leftOperand) {
-                                if (rightUnionArray[i].fConst == 0.0) {
-                                    infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                                    tempConstArray[i].fConst = FLT_MAX;
-                                } else
-                                    tempConstArray[i].fConst = unionArray[i].fConst / rightUnionArray[i].fConst; 
-                            } else {
-                                if (unionArray[i].fConst == 0.0) {
-                                    infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                                    tempConstArray[i].fConst = FLT_MAX;
-                                } else
-                                    tempConstArray[i].fConst = rightUnionArray[i].fConst / unionArray[i].fConst; 
-                            }
-                            break;
-
-                        case EbtInt:   
-                            if (leftOperand) {
-                                if (rightUnionArray[i].iConst == 0) {
-                                    infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                                    tempConstArray[i].iConst = INT_MAX;
-                                } else
-                                    tempConstArray[i].iConst = unionArray[i].iConst / rightUnionArray[i].iConst; 
-                            } else {
-                                if (unionArray[i].iConst == 0) {
-                                    infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                                    tempConstArray[i].iConst = INT_MAX;
-                                } else
-                                    tempConstArray[i].iConst = rightUnionArray[i].iConst / unionArray[i].iConst; 
-                            }
-                            break;            
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"/\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-
-            case EOpMatrixTimesVector: 
-                if (node->getBasicType() != EbtFloat) {
-                        infoSink.info.message(EPrefixInternalError, "Constant Folding cannot be done for matrix times vector", this->getLine());
-                        return 0;
-                }
-                tempConstArray = new constUnion[this->getNominalSize()];
-                
-                {// support MSVC++6.0                    
-                    for (int size = this->getNominalSize(), i = 0; i < size; i++) {
-                        tempConstArray[i].fConst = 0.0;
-                        for (int j = 0; j < size; j++) {
-                            tempConstArray[i].fConst += ((unionArray[j*size + i].fConst) * rightUnionArray[j].fConst); 
-                        }
-                    }
-                }
-                
-                tempNode = new TIntermConstantUnion(tempConstArray, node->getType());
-                tempNode->setLine(this->getLine());
-
-                return tempNode;                
-
-            case EOpVectorTimesMatrix:
-                if (this->getType().getBasicType() != EbtFloat) {
-                    infoSink.info.message(EPrefixInternalError, "Constant Folding cannot be done for vector times matrix", this->getLine());
-                    return 0;
-                }  
-
-                tempConstArray = new constUnion[this->getNominalSize()];
-                {// support MSVC++6.0
-                    for (int size = this->getNominalSize(), i = 0; i < size; i++) {
-                        tempConstArray[i].fConst = 0.0;
-                        for (int j = 0; j < size; j++) {
-                            tempConstArray[i].fConst += ((unionArray[j].fConst) * rightUnionArray[i*size + j].fConst); 
-                        }
-                    }
-                }
-                break;
-
-            case EOpLogicalAnd: // this code is written for possible future use, will not get executed currently
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {            
-                        switch (this->getType().getBasicType()) {
-                        case EbtBool:   tempConstArray[i].bConst = unionArray[i].bConst && rightUnionArray[i].bConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"&&\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-
-            case EOpLogicalXor: // this code is written for possible future use, will not get executed currently
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {            
-                        switch (this->getType().getBasicType()) {
-                        case EbtBool:   tempConstArray[i].bConst = unionArray[i].bConst ^ rightUnionArray[i].bConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"^^\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-
-            case EOpLogicalOr: // this code is written for possible future use, will not get executed currently
-                tempConstArray = new constUnion[this->getSize()];
-                {// support MSVC++6.0
-                    for (int i = 0; i < this->getSize(); i++) {            
-                        switch (this->getType().getBasicType()) {
-                        case EbtBool:   tempConstArray[i].bConst = unionArray[i].bConst || rightUnionArray[i].bConst; break;
-                        default: 
-                            infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"||\"", this->getLine());
-                            return 0;
-                        }
-                    }
-                }
-                break;
-
-            case EOpEqual: 
-                   
-                switch (this->getType().getBasicType()) {
-                case EbtFloat: 
-                    {// support MSVC++6.0
-                        for (int i = 0; i < this->getSize(); i++) {    
-                            if (unionArray[i].fConst != rightUnionArray[i].fConst) {
-                                boolNodeFlag = true;
-                                break;  // break out of for loop
-                            }
-                        }
-                    }
-                    break;
-
-                case EbtInt:   
-                    {// support MSVC++6.0
-                        for (int i = 0; i < this->getSize(); i++) {    
-                            if (unionArray[i].iConst != rightUnionArray[i].iConst) {
-                                boolNodeFlag = true;
-                                break;  // break out of for loop
-                            }
-                        }
-                    }
-                    break;
-                case EbtBool:   
-                    {// support MSVC++6.0
-                        for (int i = 0; i < this->getSize(); i++) {    
-                            if (unionArray[i].bConst != rightUnionArray[i].bConst) {
-                                boolNodeFlag = true;
-                                break;  // break out of for loop
-                            }
-                        }
-                    }
-                    break;
-                case EbtStruct:
-                    if (!compareStructure(node->getType(), node->getUnionArrayPointer(), unionArray, index))
-                        boolNodeFlag = true;
-                    break;
-                
-                default: 
-                        infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"==\"", this->getLine());
-                        return 0;
-                }
-
-                tempConstArray = new constUnion[1];
-                if (!boolNodeFlag) {
-                    tempConstArray->bConst = true;
-                }
-                else {
-                    tempConstArray->bConst = false;
-                }
-                
-                tempNode = new TIntermConstantUnion(tempConstArray, TType(EbtBool, EvqConst));
-                tempNode->setLine(this->getLine());
-    
-                return tempNode;         
-
-            case EOpNotEqual: 
-                switch (this->getType().getBasicType()) {
-                case EbtFloat: 
-                    {// support MSVC++6.0
-                        for (int i = 0; i < this->getSize(); i++) {    
-                            if (unionArray[i].fConst == rightUnionArray[i].fConst) {
-                                boolNodeFlag = true;
-                                break;  // break out of for loop
-                            }
-                        }
-                    }
-                    break;
-
-                case EbtInt:   
-                    {// support MSVC++6.0
-                        for (int i = 0; i < this->getSize(); i++) {    
-                            if (unionArray[i].iConst == rightUnionArray[i].iConst) {
-                                boolNodeFlag = true;
-                                break;  // break out of for loop
-                            }
-                        }
-                    }
-                    break;
-                case EbtBool:   
-                    {// support MSVC++6.0
-                        for (int i = 0; i < this->getSize(); i++) {    
-                            if (unionArray[i].bConst == rightUnionArray[i].bConst) {
-                                boolNodeFlag = true;
-                                break;  // break out of for loop
-                            }
-                        }
-                    }
-                    break;
-                case EbtStruct:
-                    if (compareStructure(node->getType(), node->getUnionArrayPointer(), unionArray, index))
-                        boolNodeFlag = true;
-                    break;
-                default: 
-                        infoSink.info.message(EPrefixInternalError, "Constant folding cannot be done for \"!=\"", this->getLine());
-                        return 0;
-                }
-
-                tempConstArray = new constUnion[1];
-                if (!boolNodeFlag) {
-                    tempConstArray->bConst = true;
-                }
-                else {
-                    tempConstArray->bConst = false;
-                }
-                
-                tempNode = new TIntermConstantUnion(tempConstArray, TType(EbtBool, EvqConst));
-                tempNode->setLine(this->getLine());
-    
-                return tempNode;         
-          
-            default: 
-                infoSink.info.message(EPrefixInternalError, "Invalid operator for constant folding", this->getLine());
-                return 0;
-            }
-            tempNode = new TIntermConstantUnion(tempConstArray, this->getType());
-            tempNode->setLine(this->getLine());
-
-            return tempNode;                
-        } else if (this->getSize() == 1 && this->getType().getBasicType() != EbtStruct 
-                    && constantNode->getSize() == 1 && constantNode->getType().getBasicType() != EbtStruct ) {  // scalar constant folding
-            constUnion *unionArray = new constUnion[1];
-            TIntermConstantUnion* newNode = 0;
-
-            switch (this->getType().getBasicType()) {
-            case EbtInt:
-                {
-                    //
-                    // Dealing with two operands, us and constant.
-                    //
-                    // Do Binary operations.
-                    //
-                    int rightValue = constantNode->getAsConstantUnion()->getUnionArrayPointer()->iConst;
-                    int leftValue = this->getUnionArrayPointer()->iConst;
-                    //int line = this->getLine();
-
-                    switch(op) {
-                    //?? add constant intrinsics
-                    case EOpAdd: unionArray->iConst = leftValue + rightValue; break;
-                    case EOpSub: unionArray->iConst = leftValue - rightValue; break;
-                    case EOpMul: unionArray->iConst = leftValue * rightValue; break;
-                    case EOpDiv: 
-                        if (rightValue == 0) {
-                            infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                            unionArray->iConst = INT_MAX;
-                        } else
-                            unionArray->iConst = leftValue / rightValue; break;
-                            
-                    case EOpMod: unionArray->iConst = leftValue % rightValue; break;
-                    
-                    case EOpRightShift: unionArray->iConst = leftValue >> rightValue; break;
-                    case EOpLeftShift:  unionArray->iConst = leftValue << rightValue; break;
-                    
-                    case EOpAnd:         unionArray->iConst = leftValue & rightValue; break;
-                    case EOpInclusiveOr: unionArray->iConst = leftValue | rightValue; break;
-                    case EOpExclusiveOr: unionArray->iConst = leftValue ^ rightValue; break;
-
-                    // the following assume it's okay to have memory leaks
-                    case EOpEqual:            
-                        unionArray->bConst = leftValue == rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpNotEqual:         
-                        unionArray->bConst = leftValue != rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpLessThan:         
-                        unionArray->bConst = leftValue < rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpGreaterThan:      
-                        unionArray->bConst = leftValue > rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpLessThanEqual:    
-                        unionArray->bConst = leftValue <= rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpGreaterThanEqual: 
-                        unionArray->bConst = leftValue >= rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-
-                    default:
-                        //infoSink.info.message(EPrefixInternalError, "Binary operation not folded into constant int", line);
-                        return 0;
-                    }
-                    if (!newNode) {
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtInt, EvqConst)); 
-                    }
-                    newNode->setLine(constantNode->getLine());
-                    return newNode;
-                }
-            case EbtFloat:
-                {
-                    float rightValue = constantNode->getAsConstantUnion()->getUnionArrayPointer()->fConst;
-                    float leftValue = this->getUnionArrayPointer()->fConst;
-
-                    switch(op) {
-                    //?? add constant intrinsics
-                    case EOpAdd: unionArray->fConst = leftValue + rightValue; break;
-                    case EOpSub: unionArray->fConst = leftValue - rightValue; break;
-                    case EOpMul: unionArray->fConst = leftValue * rightValue; break;
-                    case EOpDiv: 
-                        if (rightValue == 0.0) {
-                            infoSink.info.message(EPrefixWarning, "Divide by zero error during constant folding", this->getLine());
-                            unionArray->fConst = FLT_MAX;
-                        } else
-                            unionArray->fConst = leftValue / rightValue; break;
-
-                    // the following assume it's okay to have memory leaks (cleaned up by pool allocator)
-                    case EOpEqual:            
-                        unionArray->bConst = leftValue == rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpNotEqual:         
-                        unionArray->bConst = leftValue != rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpLessThan:         
-                        unionArray->bConst = leftValue < rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpGreaterThan:      
-                        unionArray->bConst = leftValue > rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpLessThanEqual:    
-                        unionArray->bConst = leftValue <= rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-                    case EOpGreaterThanEqual: 
-                        unionArray->bConst = leftValue >= rightValue;
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                        break;
-
-                    default: 
-                        //infoSink.info.message(EPrefixInternalError, "Binary operation not folded into constant float", line);
-                        return 0;
-                    }
-                    if (!newNode) {
-                        newNode = new TIntermConstantUnion(unionArray, TType(EbtFloat, EvqConst)); 
-                    }
-                    newNode->setLine(constantNode->getLine());
-                    return newNode;
-                }
-            case EbtBool:
-                {
-                    bool rightValue = constantNode->getAsConstantUnion()->getUnionArrayPointer()->bConst;
-                    bool leftValue = this->getUnionArrayPointer()->bConst;
-
-                    switch(op) {
-                    //?? add constant intrinsics
-                    case EOpLogicalAnd: unionArray->bConst = leftValue & rightValue; break;
-                    case EOpLogicalXor: unionArray->bConst = leftValue ^ rightValue; break;
-                    case EOpLogicalOr:  unionArray->bConst = leftValue | rightValue; break;
-                    default: 
-                        infoSink.info.message(EPrefixInternalError, "Binary operator cannot be folded into constant bool", line);
-                        return 0;
-                    }
-                    newNode = new TIntermConstantUnion(unionArray, TType(EbtBool, EvqConst)); 
-                    newNode->setLine(constantNode->getLine());
-                    return newNode;
-                }
-            default:
-                infoSink.info.message(EPrefixInternalError, "Cannot fold constant", this->getLine());
-                return 0;
-            }
-        }
-    } else { 
-        //
-        // Do unary operations
-        //
-        TIntermConstantUnion *newNode = 0;
-        constUnion* tempConstArray = new constUnion[this->getSize()];
-        if (this->getSize() > 1) {
-            for (int i = 0; i < this->getSize(); i++) {
-                switch(op) {
-                case EOpNegative:                                       
-                    switch (this->getType().getBasicType()) {
-                    case EbtFloat: tempConstArray[i].fConst = -(unionArray[i].fConst);      break;
-                    case EbtInt:   tempConstArray[i].iConst = -(unionArray[i].iConst); break;
-                    default: 
-                        infoSink.info.message(EPrefixInternalError, "Unary operation not folded into constant", this->getLine());
-                        return 0;
-                    }
-                    break;
-                case EOpLogicalNot: // this code is written for possible future use, will not get executed currently                                      
-                    switch (this->getType().getBasicType()) {
-                    case EbtBool:  tempConstArray[i].bConst = !(unionArray[i].bConst); break;
-                    default: 
-                        infoSink.info.message(EPrefixInternalError, "Unary operation not folded into constant", this->getLine());
-                        return 0;
-                    }
-                    break;
-                default: 
-                    return 0;
-                }
-            }
-            newNode = new TIntermConstantUnion(tempConstArray, this->getType());
-            newNode->setLine(this->getLine());
-            return newNode;     
-        } else {
-            switch(op) {
-            //?? add constant intrinsics
-            case EOpNegative:   
-                switch (this->getType().getBasicType()) {
-                case EbtInt:
-                    tempConstArray->iConst = -(this->getUnionArrayPointer()->iConst);
-                    newNode = new TIntermConstantUnion(tempConstArray, TType(EbtInt, EvqConst));
-                    break;
-                case EbtFloat:
-                    tempConstArray->fConst = -(this->getUnionArrayPointer()->fConst);
-                    newNode = new TIntermConstantUnion(tempConstArray, TType(EbtFloat, EvqConst));
-                    break;
-                default: 
-                    infoSink.info.message(EPrefixInternalError, "Unary operation not folded into constant", line);
-                    return 0;
-                }
-                break;
-            case EOpLogicalNot:   
-                switch (this->getType().getBasicType()) {
-                case EbtBool:
-                    tempConstArray->bConst = !this->getUnionArrayPointer()->bConst;
-                    newNode = new TIntermConstantUnion(tempConstArray, TType(EbtBool, EvqConst));
-                    break;
-                default: 
-                    infoSink.info.message(EPrefixInternalError, "Unary operation not folded into constant", line);
-                    return 0;
-                }
-                break;
-            default: 
-                return 0;
-            }
-            newNode->setLine(this->getLine());
-            return newNode;
-        
-        }
-    }
-
-    return this;
-}
-
-TIntermConstantUnion* TIntermediate::changeAggrToTempConst(TIntermAggregate* node, TSymbolTable& symbolTable, TSourceLoc line) 
-{
-    constUnion* unionArray = new constUnion[node->getType().getInstanceSize()];    
-    bool returnVal;
-
-    if (node->getSequence().size() == 1 && node->getSequence()[0]->getAsTyped()->getAsConstantUnion())  {
-        returnVal = parseConstTree(line, node, unionArray, node->getOp(), symbolTable,  node->getType(), true);
-    }
-    else {
-        returnVal = parseConstTree(line, node, unionArray, node->getOp(), symbolTable, node->getType());
-    }
-
-    if (returnVal)
-        unionArray = 0;
-
-    return (addConstantUnion(unionArray, node->getType(), node->getLine()));    
-}
-
-TIntermTyped* TIntermediate::copyConstUnion(TIntermConstantUnion* node) 
-{
-    constUnion *unionArray = node->getUnionArrayPointer();
-
-    if (!unionArray)
-        return 0;
- 
-    int size;
-    if (node->getType().getBasicType() == EbtStruct)
-        //?? We should actually be calling getStructSize() function and not setStructSize. This problem occurs in case
-        // of nested/embedded structs.
-        size = node->getType().setStructSize(node->getType().getStruct());
-        //size = node->getType().getStructSize();
-    else
-        size = node->getType().getInstanceSize();
-    
-    constUnion *newSpace = new constUnion[size];
-
-    for (int i = 0; i < size; i++)
-        newSpace[i] = unionArray[i];
-
-    node->setUnionArrayPointer(newSpace);
-    return node;
-}
-
-TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermConstantUnion* node) 
-{
-    constUnion *rightUnionArray = node->getUnionArrayPointer();
-    int size = node->getType().getInstanceSize();
-
-    constUnion *leftUnionArray = new constUnion[size];
-
-    for (int i=0; i < size; i++) {
-        
-        switch (promoteTo) {
-        case EbtFloat:
-            switch (node->getType().getBasicType()) {
-            case EbtInt:
-                (leftUnionArray[i]).fConst = static_cast<float>(rightUnionArray[i].iConst);
-                break;
-            case EbtBool:
-                (leftUnionArray[i]).fConst = static_cast<float>(rightUnionArray[i].bConst);
-                break;
-            case EbtFloat:
-                (leftUnionArray[i]).fConst = rightUnionArray[i].fConst;
-                break;
-            default: 
-                infoSink.info.message(EPrefixInternalError, "Cannot promote", node->getLine());
-                return 0;
-            }                
-            break;
-        case EbtInt:
-            switch (node->getType().getBasicType()) {
-            case EbtInt:
-                (leftUnionArray[i]).iConst = rightUnionArray[i].iConst;
-                break;
-            case EbtBool:
-                (leftUnionArray[i]).iConst = static_cast<int>(rightUnionArray[i].bConst);
-                break;
-            case EbtFloat:
-                (leftUnionArray[i]).iConst = static_cast<int>(rightUnionArray[i].fConst);
-                break;
-            default: 
-                infoSink.info.message(EPrefixInternalError, "Cannot promote", node->getLine());
-                return 0;
-            }                
-            break;
-        case EbtBool:
-            switch (node->getType().getBasicType()) {
-            case EbtInt:
-                (leftUnionArray[i]).bConst = rightUnionArray[i].iConst != 0;
-                break;
-            case EbtBool:
-                (leftUnionArray[i]).bConst = rightUnionArray[i].bConst;
-                break;
-            case EbtFloat:
-                (leftUnionArray[i]).bConst = rightUnionArray[i].fConst != 0.0;
-                break;
-            default: 
-                infoSink.info.message(EPrefixInternalError, "Cannot promote", node->getLine());
-                return 0;
-            }                
-            
-            break;
-        default:
-            infoSink.info.message(EPrefixInternalError, "Incorrect data type found", node->getLine());
-            return 0;
-        }
-    
-    }
-    
-    const TType& t = node->getType();
-    
-    return addConstantUnion(leftUnionArray, TType(promoteTo, t.getQualifier(), t.getNominalSize(), t.isMatrix(), t.isArray()), node->getLine());
-}
-
-//
-// This method inserts the child nodes into the parent node at the given location specified
-// by parentNodeIter. offset tells the integer offset into the parent vector that points to 
-// the child node. sequenceVector is the parent vector.
-// Returns reference to the last inserted child node
-// increments the offset based on the number of child nodes added
-//
-void TIntermediate::removeChildNode(TIntermSequence &parentSequence, TType& parentType, int& offset, TIntermSequence::iterator& parentNodeIter, TIntermAggregate* child)
-{
-    if (!child)
-        return;
-
-    parentNodeIter = parentSequence.begin() + offset;
-
-    TIntermSequence& childSequence = child->getSequence();
-    int oldSize = static_cast<int>(parentSequence.size());
-    if (childSequence.size() == 1) {
-        if (!removeMatrixConstNode(parentSequence, parentType, child, offset)) {
-            for (int i = 0; i < child->getType().getInstanceSize(); i++) {
-                constUnion* constantUnion = new constUnion[1];
-                *constantUnion = *(childSequence[0]->getAsConstantUnion()->getUnionArrayPointer());
-                TIntermConstantUnion *constant = new TIntermConstantUnion(constantUnion,
-                    childSequence[0]->getAsConstantUnion()->getType());
-                constant->setLine(child->getLine());
-                parentNodeIter = parentSequence.begin() + offset;
-                parentSequence.insert(parentNodeIter, constant);
-            }
-        }
-    } else    
-        parentSequence.insert(parentNodeIter, childSequence.begin(), childSequence.end());
-
-    int newSize = static_cast<int>(parentSequence.size());
-    offset = offset + newSize - oldSize;
-    parentNodeIter = parentSequence.begin() + offset;
-    parentNodeIter = parentSequence.erase(parentNodeIter);
-    offset--;
-    parentNodeIter--;
-}
-
-//
-// The parent has only one child node. This method is not implemented
-// for parent that is a structure
-//
-TIntermTyped* TIntermediate::removeChildNode(TIntermTyped* parent, TType* parentType, TIntermAggregate* child)
-{
-    TIntermTyped* resultNode = 0;
-
-    if (parentType->getInstanceSize() == 1) {
-        resultNode = child->getSequence()[0]->getAsTyped(); 
-    } else {
-        int size = parentType->getInstanceSize();
-        TIntermSequence& parentSequence = parent->getAsAggregate()->getSequence();
-        TIntermSequence& childSequence = child->getSequence();
-
-        if (childSequence.size() == 1) {
-            if (!removeMatrixConstNode(parentSequence, *parentType, child, 1))
-                parentSequence.push_back(child->getSequence()[0]);
-        } else {
-            for (int i = 0; i < size; i++) {
-                parentSequence.push_back(child->getSequence()[i]);
-            }
-        }
-        parentSequence.erase(parentSequence.begin());
-
-        return parent;
-    }
-
-    return resultNode;
-}
-
-bool TIntermediate::removeMatrixConstNode(TIntermSequence &parentSequence, TType& parentType, TIntermAggregate* child, int offset)
-{
-    if (!child)
-        return false;
-
-    TIntermSequence::iterator parentNodeIter;
-    TIntermSequence &childSequence = child->getSequence();
-
-    switch (child->getOp()) {
-    case EOpConstructMat2:
-    case EOpConstructMat3:
-    case EOpConstructMat4:
-        {// support MSVC++6.0
-            for (int i = 0; i < child->getType().getInstanceSize(); i++) {
-                constUnion* constantUnion = new constUnion[1];
-                if (i % (child->getType().getNominalSize() + 1) == 0) {
-                    *constantUnion = *(childSequence[0]->getAsConstantUnion()->getUnionArrayPointer());
-                } else {
-                    switch (parentType.getBasicType()) {
-                    case EbtInt:   constantUnion->iConst = 0;     break;
-                    case EbtFloat: constantUnion->fConst = 0.0;   break;
-                    case EbtBool:  constantUnion->bConst = false; break;
-                    default: ; /* default added by BrianP */
-                    }
-                }
-                TIntermConstantUnion *constant = new TIntermConstantUnion(constantUnion,
-                    childSequence[0]->getAsConstantUnion()->getType());
-                constant->setLine(child->getLine());
-                parentNodeIter = parentSequence.begin() + offset + i;
-                parentSequence.insert(parentNodeIter, constant);
-            }
-        }
-        return true;
-    default:
-        return false;
-    }
-}
-
-void TIntermAggregate::addToPragmaTable(const TPragmaTable& pTable)
-{
-    assert (!pragmaTable);
-    pragmaTable = new TPragmaTable();
-    *pragmaTable = pTable;
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/MMap.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/MMap.h
deleted file mode 100755
index 66703cdd9..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/MMap.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _MMAP_INCLUDED_
-#define _MMAP_INCLUDED_
-
-//
-// Encapsulate memory mapped files
-//
-
-class TMMap {
-public:
-    TMMap(const char* fileName) : 
-        fSize(-1), // -1 is the error value returned by GetFileSize()
-        fp(NULL),
-        fBuff(0)   // 0 is the error value returned by MapViewOfFile()
-    {
-        if ((fp = fopen(fileName, "r")) == NULL)
-            return;
-        char c = getc(fp);
-        fSize = 0;
-        while (c != EOF) {
-            fSize++;
-            c = getc(fp);
-        }
-        if (c == EOF)
-            fSize++;
-        rewind(fp);
-        fBuff = (char*)malloc(sizeof(char) * fSize);
-        int count = 0;
-        c = getc(fp);
-        while (c != EOF) {
-            fBuff[count++] = c;
-            c = getc(fp);
-        }
-        fBuff[count++] = c;
-    }
-
-    char* getData() { return fBuff; }
-    int   getSize() { return fSize; }
-
-    ~TMMap() {
-        if (fp != NULL)
-            fclose(fp);
-    }
-    
-private:
-    int             fSize;      // size of file to map in
-    FILE *fp;
-    char*           fBuff;      // the actual data;
-};
-
-#endif // _MMAP_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.cpp
deleted file mode 100755
index cfc42746a..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.cpp
+++ /dev/null
@@ -1,1452 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "ParseHelper.h"
-#include "Include/InitializeParseContext.h"
-#include "osinclude.h"
-#include <stdarg.h>
-///////////////////////////////////////////////////////////////////////
-//
-// Sub- vector and matrix fields
-//
-////////////////////////////////////////////////////////////////////////
-
-//
-// Look at a '.' field selector string and change it into offsets
-// for a vector.
-//
-bool TParseContext::parseVectorFields(const TString& compString, int vecSize, TVectorFields& fields, int line)
-{
-    fields.num = (int) compString.size();
-    if (fields.num > 4) {
-        error(line, "illegal vector field selection", compString.c_str(), "");
-        return false;
-    }
-
-    enum {
-        exyzw,
-        ergba,
-        estpq
-    } fieldSet[4];
-
-    for (int i = 0; i < fields.num; ++i) {
-        switch (compString[i])  {
-        case 'x': 
-            fields.offsets[i] = 0;
-            fieldSet[i] = exyzw;
-            break;
-        case 'r': 
-            fields.offsets[i] = 0;
-            fieldSet[i] = ergba;
-            break;
-        case 's':
-            fields.offsets[i] = 0;
-            fieldSet[i] = estpq;
-            break;
-        case 'y': 
-            fields.offsets[i] = 1;
-            fieldSet[i] = exyzw;
-            break;
-        case 'g': 
-            fields.offsets[i] = 1;
-            fieldSet[i] = ergba;
-            break;
-        case 't':
-            fields.offsets[i] = 1;
-            fieldSet[i] = estpq;
-            break;
-        case 'z': 
-            fields.offsets[i] = 2;
-            fieldSet[i] = exyzw;
-            break;
-        case 'b': 
-            fields.offsets[i] = 2;
-            fieldSet[i] = ergba;
-            break;
-        case 'p':
-            fields.offsets[i] = 2;
-            fieldSet[i] = estpq;
-            break;
-        
-        case 'w': 
-            fields.offsets[i] = 3;
-            fieldSet[i] = exyzw;
-            break;
-        case 'a': 
-            fields.offsets[i] = 3;
-            fieldSet[i] = ergba;
-            break;
-        case 'q':
-            fields.offsets[i] = 3;
-            fieldSet[i] = estpq;
-            break;
-        default:
-            error(line, "illegal vector field selection", compString.c_str(), "");
-            return false;
-        }
-    }
-
-    for (int i = 0; i < fields.num; ++i) {
-        if (fields.offsets[i] >= vecSize) {
-        error(line, "vector field selection out of range",  compString.c_str(), "");
-        return false;
-    }
-
-        if (i > 0) {
-            if (fieldSet[i] != fieldSet[i-1]) {
-                error(line, "illegal - vector component fields not from the same set", compString.c_str(), "");
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-
-//
-// Look at a '.' field selector string and change it into offsets
-// for a matrix.
-//
-bool TParseContext::parseMatrixFields(const TString& compString, int matSize, TMatrixFields& fields, int line)
-{
-    fields.wholeRow = false;
-    fields.wholeCol = false;
-    fields.row = -1;
-    fields.col = -1;
-
-    if (compString.size() != 2) {
-        error(line, "illegal length of matrix field selection", compString.c_str(), "");
-        return false;
-    }
-
-    if (compString[0] == '_') {
-        if (compString[1] < '0' || compString[1] > '3') {
-            error(line, "illegal matrix field selection", compString.c_str(), "");
-            return false;
-        }
-        fields.wholeCol = true;
-        fields.col = compString[1] - '0';
-    } else if (compString[1] == '_') {
-        if (compString[0] < '0' || compString[0] > '3') {
-            error(line, "illegal matrix field selection", compString.c_str(), "");
-            return false;
-        }
-        fields.wholeRow = true;
-        fields.row = compString[0] - '0';
-    } else {
-        if (compString[0] < '0' || compString[0] > '3' ||
-            compString[1] < '0' || compString[1] > '3') {
-            error(line, "illegal matrix field selection", compString.c_str(), "");
-            return false;
-        }
-        fields.row = compString[0] - '0';
-        fields.col = compString[1] - '0';
-    }
-
-    if (fields.row >= matSize || fields.col >= matSize) {
-        error(line, "matrix field selection out of range", compString.c_str(), "");
-        return false;
-    }
-
-    return true;
-}
-
-///////////////////////////////////////////////////////////////////////
-//
-// Errors
-//
-////////////////////////////////////////////////////////////////////////
-
-//
-// Track whether errors have occurred.
-//
-void TParseContext::recover()
-{
-    recoveredFromError = true;
-}
-
-//
-// Used by flex/bison to output all syntax and parsing errors.
-//
-void C_DECL TParseContext::error(TSourceLoc nLine, const char *szReason, const char *szToken, 
-                                 const char *szExtraInfoFormat, ...)
-{
-    char szExtraInfo[400];
-    va_list marker;
-    
-    va_start(marker, szExtraInfoFormat);
-    
-    _vsnprintf(szExtraInfo, sizeof(szExtraInfo), szExtraInfoFormat, marker);
-    
-    /* VC++ format: file(linenum) : error #: 'token' : extrainfo */
-    infoSink.info.prefix(EPrefixError);
-    infoSink.info.location(nLine);
-    infoSink.info << "'" << szToken <<  "' : " << szReason << " " << szExtraInfo << "\n";
-    
-    va_end(marker);
-
-    ++numErrors;
-}
-
-//
-// Same error message for all places assignments don't work.
-//
-void TParseContext::assignError(int line, const char* op, TString left, TString right)
-{
-    error(line, "", op, "cannot convert from '%s' to '%s'",
-          right.c_str(), left.c_str());
-}
-
-//
-// Same error message for all places unary operations don't work.
-//
-void TParseContext::unaryOpError(int line, char* op, TString operand)
-{
-   error(line, " wrong operand type", op, 
-          "no operation '%s' exists that takes an operand of type %s (or there is no acceptable conversion)",
-          op, operand.c_str());
-}
-
-//
-// Same error message for all binary operations don't work.
-//
-void TParseContext::binaryOpError(int line, char* op, TString left, TString right)
-{
-    error(line, " wrong operand types ", op, 
-            "no operation '%s' exists that takes a left-hand operand of type '%s' and "
-            "a right operand of type '%s' (or there is no acceptable conversion)", 
-            op, left.c_str(), right.c_str());
-}
-
-//
-// Both test and if necessary, spit out an error, to see if the node is really
-// an l-value that can be operated on this way.
-//
-// Returns true if the was an error.
-//
-bool TParseContext::lValueErrorCheck(int line, char* op, TIntermTyped* node)
-{
-    TIntermSymbol* symNode = node->getAsSymbolNode();
-    TIntermBinary* binaryNode = node->getAsBinaryNode();
-
-    if (binaryNode) {
-        bool errorReturn;
-
-        switch(binaryNode->getOp()) {
-        case EOpIndexDirect:
-        case EOpIndexIndirect:
-        case EOpIndexDirectStruct:
-            return lValueErrorCheck(line, op, binaryNode->getLeft());
-        case EOpVectorSwizzle:
-            errorReturn = lValueErrorCheck(line, op, binaryNode->getLeft());
-            if (!errorReturn) {
-                int offset[4] = {0,0,0,0};
-
-                TIntermTyped* rightNode = binaryNode->getRight();
-                TIntermAggregate *aggrNode = rightNode->getAsAggregate();
-                
-                for (TIntermSequence::iterator p = aggrNode->getSequence().begin(); 
-                                               p != aggrNode->getSequence().end(); p++) {
-                    int value = (*p)->getAsTyped()->getAsConstantUnion()->getUnionArrayPointer()->iConst;
-                    offset[value]++;     
-                    if (offset[value] > 1) {
-                        error(line, " l-value of swizzle cannot have duplicate components", op, "", "");
-
-                        return true;
-                    }
-                }
-            } 
-
-            return errorReturn;
-        default: 
-            break;
-        }
-        error(line, " l-value required", op, "", "");
-
-        return true;
-    }
-
-
-    const char* symbol = 0;
-    if (symNode != 0)
-        symbol = symNode->getSymbol().c_str();
-
-    char* message = 0;
-    switch (node->getQualifier()) {
-    case EvqConst:          message = "can't modify a const";        break;
-    case EvqConstReadOnly:  message = "can't modify a const";        break;
-    case EvqAttribute:      message = "can't modify an attribute";   break;
-    case EvqUniform:        message = "can't modify a uniform";      break;
-    case EvqVaryingIn:      message = "can't modify a varying";      break;
-    case EvqInput:          message = "can't modify an input";       break;
-    case EvqFace:           message = "can't modify gl_FrontFace";   break;
-    case EvqFragCoord:      message = "can't modify gl_FragCoord";   break;
-    default:
-
-        //
-        // Type that can't be written to?
-        //
-        switch (node->getBasicType()) {
-        case EbtSampler1D:
-        case EbtSampler2D:
-        case EbtSampler3D:
-        case EbtSamplerCube:
-        case EbtSampler1DShadow:
-        case EbtSampler2DShadow:
-            message = "can't modify a sampler";
-            break;
-        case EbtVoid:
-            message = "can't modify void";
-            break;
-        default: 
-            break;
-        }
-    }
-
-    if (message == 0 && binaryNode == 0 && symNode == 0) {
-        error(line, " l-value required", op, "", "");
-
-        return true;
-    }
-
-
-    //
-    // Everything else is okay, no error.
-    //
-    if (message == 0)
-        return false;
-
-    //
-    // If we get here, we have an error and a message.
-    //
-    if (symNode)
-        error(line, " l-value required", op, "\"%s\" (%s)", symbol, message);
-    else
-        error(line, " l-value required", op, "(%s)", message);
-
-    return true;
-}
-
-//
-// Both test, and if necessary spit out an error, to see if the node is really
-// a constant.
-//
-// Returns true if the was an error.
-//
-bool TParseContext::constErrorCheck(TIntermTyped* node)
-{
-    if (node->getQualifier() == EvqConst)
-        return false;
-
-    error(node->getLine(), "constant expression required", "", "");
-
-    return true;
-}
-
-//
-// Both test, and if necessary spit out an error, to see if the node is really
-// an integer.
-//
-// Returns true if the was an error.
-//
-bool TParseContext::integerErrorCheck(TIntermTyped* node, char* token)
-{
-    if (node->getBasicType() == EbtInt && node->getNominalSize() == 1)
-        return false;
-
-    error(node->getLine(), "integer expression required", token, "");
-
-    return true;
-}
-
-//
-// Both test, and if necessary spit out an error, to see if we are currently
-// globally scoped.
-//
-// Returns true if the was an error.
-//
-bool TParseContext::globalErrorCheck(int line, bool global, char* token)
-{
-    if (global)
-        return false;
-
-    error(line, "only allowed at global scope", token, "");
-
-    return true;
-}
-
-//
-// For now, keep it simple:  if it starts "gl_", it's reserved, independent
-// of scope.  Except, if the symbol table is at the built-in push-level,
-// which is when we are parsing built-ins.
-//
-// Returns true if there was an error.
-//
-bool TParseContext::reservedErrorCheck(int line, const TString& identifier)
-{
-    if (symbolTable.atBuiltInLevel() ||
-        identifier.substr(0, 3) != TString("gl_"))
-        return false;
-
-    error(line, "reserved built-in name", "gl_", "");
-
-    return true;        
-}
-
-//
-// Make sure there is enough data provided to the constructor to build
-// something of the type of the constructor.  Also returns the type of
-// the constructor.
-//
-// Returns true if there was an error in construction.
-//
-bool TParseContext::constructorErrorCheck(int line, TIntermNode* node, TFunction& function, TOperator op, TType* type)
-{
-    switch(op) {
-    case EOpConstructInt:     *type = TType(EbtInt);                               break;
-    case EOpConstructBool:    *type = TType(EbtBool);                              break;
-    case EOpConstructFloat:   *type = TType(EbtFloat);                             break;
-    case EOpConstructVec2:    *type = TType(EbtFloat, EvqTemporary, 2);            break;
-    case EOpConstructVec3:    *type = TType(EbtFloat, EvqTemporary, 3);            break;
-    case EOpConstructVec4:    *type = TType(EbtFloat, EvqTemporary, 4);            break;
-    case EOpConstructBVec2:   *type = TType(EbtBool,  EvqTemporary, 2);            break;
-    case EOpConstructBVec3:   *type = TType(EbtBool,  EvqTemporary, 3);            break;
-    case EOpConstructBVec4:   *type = TType(EbtBool,  EvqTemporary, 4);            break;
-    case EOpConstructIVec2:   *type = TType(EbtInt,   EvqTemporary, 2);            break;
-    case EOpConstructIVec3:   *type = TType(EbtInt,   EvqTemporary, 3);            break;
-    case EOpConstructIVec4:   *type = TType(EbtInt,   EvqTemporary, 4);            break;
-    case EOpConstructMat2:    *type = TType(EbtFloat, EvqTemporary, 2, true);      break;
-    case EOpConstructMat3:    *type = TType(EbtFloat, EvqTemporary, 3, true);      break;
-    case EOpConstructMat4:    *type = TType(EbtFloat, EvqTemporary, 4, true);      break;
-    case EOpConstructStruct:  *type = TType(function.getReturnType().getStruct(), function.getReturnType().getTypeName()); break;
-    default:
-        error(line, "expected constructor", "Internal Error", "");
-        return true;
-    }
-
-    bool constructingMatrix = false;
-    switch(op) {
-    case EOpConstructMat2:
-    case EOpConstructMat3:
-    case EOpConstructMat4:
-        constructingMatrix = true;
-        break;
-    default: 
-        break;
-    }
-
-    //
-    // Note: It's okay to have too many components available, but not okay to have unused
-    // arguments.  'full' will go to true when enough args have been seen.  If we loop
-    // again, there is an extra argument, so 'overfull' will become true.
-    //
-
-    int size = 0;
-    bool constType = true;
-    bool full = false;
-    bool overFull = false;
-    bool matrixInMatrix = false;
-    for (int i = 0; i < function.getParamCount(); ++i) {
-        size += function[i].type->getInstanceSize();
-        if (constructingMatrix && function[i].type->isMatrix())
-            matrixInMatrix = true;
-        if (full)
-            overFull = true;
-        if (op != EOpConstructStruct && size >= type->getInstanceSize())
-            full = true;
-        if (function[i].type->getQualifier() != EvqConst)
-            constType = false;
-    }
-    
-    if (constType)
-        type->changeQualifier(EvqConst);
-
-    if (matrixInMatrix) {
-        error(line, "constructing matrix from matrix", "constructor", "(reserved)");
-        return true;
-    }
-
-    if (overFull) {
-        error(line, "too many arguments", "constructor", "");
-        return true;
-    }
-
-    if (size != 1 && size < type->getInstanceSize() || (size < 1) && op == EOpConstructStruct) {
-        error(line, "not enough data provided for construction", "constructor", "");
-        return true;
-    }
-
-    TIntermTyped* typed = node->getAsTyped();
-    if (typed == 0) {
-        error(line, "constructor argument does not have a type", "constructor", "");
-        return true;
-    }
-    if (op != EOpConstructStruct && IsSampler(typed->getBasicType())) {
-        error(line, "cannot convert a sampler", "constructor", "");
-        return true;
-    }
-    if (typed->getBasicType() == EbtVoid) {
-        error(line, "cannot convert a void", "constructor", "");
-        return true;
-    }
-
-    return false;
-}
-
-// This function checks to see if a void variable has been declared and raise an error message for such a case
-//
-// returns true in case of an error
-//
-bool TParseContext::voidErrorCheck(int line, const TString& identifier, const TPublicType& pubType)
-{
-    if (pubType.type == EbtVoid) {
-        error(line, "illegal use of type 'void'", identifier.c_str(), "");
-        return true;
-    } 
-
-    return false;
-}
-
-// This function checks to see if the node (for the expression) contains a scalar boolean expression or not
-//
-// returns true in case of an error
-//
-bool TParseContext::boolErrorCheck(int line, const TIntermTyped* type)
-{
-    if (type->getBasicType() != EbtBool || type->isArray() || type->isMatrix() || type->isVector()) {
-        error(line, "boolean expression expected", "", "");
-        return true;
-    } 
-
-    return false;
-}
-
-// This function checks to see if the node (for the expression) contains a scalar boolean expression or not
-//
-// returns true in case of an error
-//
-bool TParseContext::boolErrorCheck(int line, const TPublicType& pType)
-{
-    if (pType.type != EbtBool || pType.array || pType.matrix || (pType.size > 1)) {
-        error(line, "boolean expression expected", "", "");
-        return true;
-    } 
-
-    return false;
-}
-
-bool TParseContext::samplerErrorCheck(int line, const TPublicType& pType, const char* reason)
-{
-    if (pType.type == EbtStruct) {
-        if (containsSampler(*pType.userDef)) {
-            error(line, reason, TType::getBasicString(pType.type), "(structure contains a sampler)");
-        
-            return true;
-        }
-        
-        return false;
-    } else if (IsSampler(pType.type)) {
-        error(line, reason, TType::getBasicString(pType.type), "");
-
-        return true;
-    }
-
-    return false;
-}
-
-bool TParseContext::structQualifierErrorCheck(int line, const TPublicType& pType)
-{
-    if ((pType.qualifier == EvqVaryingIn || pType.qualifier == EvqVaryingOut || pType.qualifier == EvqAttribute) &&
-        pType.type == EbtStruct) {
-        error(line, "cannot be used with a structure", getQualifierString(pType.qualifier), "");
-        
-        return true;
-    }
-
-    if (pType.qualifier != EvqUniform && samplerErrorCheck(line, pType, "samplers must be uniform"))
-        return true;
-
-    return false;
-}
-
-bool TParseContext::parameterSamplerErrorCheck(int line, TQualifier qualifier, const TType& type)
-{
-    if ((qualifier == EvqOut || qualifier == EvqInOut) && 
-             type.getBasicType() != EbtStruct && IsSampler(type.getBasicType())) {
-        error(line, "samplers cannot be output parameters", type.getBasicString(), "");
-        return true;
-    }
-
-    return false;
-}
-
-bool TParseContext::containsSampler(TType& type)
-{
-    if (IsSampler(type.getBasicType()))
-        return true;
-
-    if (type.getBasicType() == EbtStruct) {
-        TTypeList& structure = *type.getStruct();
-        for (unsigned int i = 0; i < structure.size(); ++i) {
-            if (containsSampler(*structure[i].type))
-                return true;
-        }
-    }
-
-    return false;
-}
-
-bool TParseContext::insertBuiltInArrayAtGlobalLevel()
-{
-    TString *name = NewPoolTString("gl_TexCoord");
-    TSymbol* symbol = symbolTable.find(*name);
-    if (!symbol) {
-        error(0, "INTERNAL ERROR finding symbol", name->c_str(), "");
-        return true;
-    }
-    TVariable* variable = static_cast<TVariable*>(symbol);
-
-    TVariable* newVariable = new TVariable(name, variable->getType());
-
-    if (! symbolTable.insert(*newVariable)) {
-        delete newVariable;
-        error(0, "INTERNAL ERROR inserting new symbol", name->c_str(), "");
-        return true;
-    }
-
-    return false;
-}
-
-//
-// Do all the semantic checking for declaring an array, with and 
-// without a size, and make the right changes to the symbol table.
-//
-// size == 0 means no specified size.
-//
-// Returns true if there was an error.
-//
-bool TParseContext::arrayErrorCheck(int line, TString& identifier, TPublicType type, TIntermTyped* size)
-{
-    //
-    // Don't check for reserved word use until after we know it's not in the symbol table,
-    // because reserved arrays can be redeclared.
-    //
-
-    //
-    // Can the type be an array?
-    //
-    if (type.array || type.qualifier == EvqAttribute || type.qualifier == EvqConst) {
-        error(line, "cannot declare arrays of this type", TType(type).getCompleteString().c_str(), "");
-        return true;
-    }
-    type.array = true;
-
-    //
-    // size will be 0 if there is no size declared, otherwise it contains the size
-    // declared.
-    //
-    TIntermConstantUnion* constant = 0;
-    if (size) {
-        constant = size->getAsConstantUnion();
-        if (constant == 0 || constant->getBasicType() != EbtInt || constant->getUnionArrayPointer()->iConst <= 0) {
-            error(line, "array size must be a positive integer", identifier.c_str(), "");
-            return true;
-        }
-    }
-
-    bool builtIn = false; 
-    bool sameScope = false;
-    TSymbol* symbol = symbolTable.find(identifier, &builtIn, &sameScope);
-    if (symbol == 0 || !sameScope) {
-        if (reservedErrorCheck(line, identifier))
-            return true;
-        
-        TVariable* variable = new TVariable(&identifier, TType(type));
-
-        if (size)
-            variable->getType().setArraySize(constant->getUnionArrayPointer()->iConst);
-
-        if (! symbolTable.insert(*variable)) {
-            delete variable;
-            error(line, "INTERNAL ERROR inserting new symbol", identifier.c_str(), "");
-            return true;
-        }
-    } else {
-        if (! symbol->isVariable()) {
-            error(line, "variable expected", identifier.c_str(), "");
-            return true;
-        }
-
-        TVariable* variable = static_cast<TVariable*>(symbol);
-        if (! variable->getType().isArray()) {
-            error(line, "redeclaring non-array as array", identifier.c_str(), "");
-            return true;
-        }
-        if (variable->getType().getArraySize() > 0) {
-            error(line, "redeclaration of array with size", identifier.c_str(), "");
-            return true;
-        }
-        
-        if (variable->getType() != TType(type)) {
-            error(line, "redeclaration of array with a different type", identifier.c_str(), "");
-            return true;
-        }
-
-        TType* t = variable->getArrayInformationType();
-        while (t != 0) {
-            if (t->getMaxArraySize() > constant->getUnionArrayPointer()->iConst) {
-                error(line, "higher index value already used for the array", identifier.c_str(), "");
-                return true;
-            }
-            t->setArraySize(constant->getUnionArrayPointer()->iConst);
-            t = t->getArrayInformationType();
-        }
-
-        if (size)
-            variable->getType().setArraySize(constant->getUnionArrayPointer()->iConst);
-    } 
-
-    if (voidErrorCheck(line, identifier, type))
-        return true;
-
-    return false;
-}
-
-bool TParseContext::arraySetMaxSize(TIntermSymbol *node, TType* type, int size, bool updateFlag, TSourceLoc line)
-{
-    bool builtIn = false;
-    TSymbol* symbol = symbolTable.find(node->getSymbol(), &builtIn);
-    if (symbol == 0) {
-        error(line, " undeclared identifier", node->getSymbol().c_str(), "");
-        return true;
-    }
-    TVariable* variable = static_cast<TVariable*>(symbol);
-
-    type->setArrayInformationType(variable->getArrayInformationType());
-    variable->updateArrayInformationType(type);
-
-    // we dont want to update the maxArraySize when this flag is not set, we just want to include this 
-    // node type in the chain of node types so that its updated when a higher maxArraySize comes in.
-    if (!updateFlag)
-        return false;
-
-    size++;
-    variable->getType().setMaxArraySize(size);
-    type->setMaxArraySize(size);
-    TType* tt = type;
-
-    while(tt->getArrayInformationType() != 0) {
-        tt = tt->getArrayInformationType();
-        tt->setMaxArraySize(size);
-    }
-
-    return false;
-}
-
-//
-// Do semantic checking for a variable declaration that has no initializer,
-// and update the symbol table.
-//
-// Returns true if there was an error.
-//
-bool TParseContext::nonInitErrorCheck(int line, TString& identifier, TPublicType& type)
-{
-    if (reservedErrorCheck(line, identifier))
-        recover();
-
-    //
-    // Make the qualifier make sense, error is issued in a little bit.
-    //
-    bool constError = false;
-    if (type.qualifier == EvqConst) {
-        type.qualifier = EvqTemporary;
-        constError = true;
-    }
-
-    TVariable* variable = new TVariable(&identifier, TType(type));
-
-    if (! symbolTable.insert(*variable)) {
-        error(line, "redefinition", variable->getName().c_str(), "");
-        delete variable;
-        return true;
-    }
-    if (constError) {
-        error(line, "variables with qualifier 'const' must be initialized", identifier.c_str(), "");
-        return true;
-    }
-
-    if (voidErrorCheck(line, identifier, type))
-        return true;
-
-    return false;
-}
-
-bool TParseContext::paramErrorCheck(int line, TQualifier qualifier, TQualifier paramQualifier, TType* type)
-{    
-    if (qualifier != EvqConst && qualifier != EvqTemporary) {
-        error(line, "qualifier not allowed on function parameter", getQualifierString(qualifier), "");
-        return true;
-    }
-    if (qualifier == EvqConst && paramQualifier != EvqIn) {
-        error(line, "qualifier not allowed with ", getQualifierString(qualifier), getQualifierString(paramQualifier));
-        return true;
-    }
-
-    if (qualifier == EvqConst)
-        type->changeQualifier(EvqConstReadOnly);
-    else
-        type->changeQualifier(paramQualifier);
-
-    return false;
-}
-
-/////////////////////////////////////////////////////////////////////////////////
-//
-// Non-Errors.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-//
-// Look up a function name in the symbol table, and make sure it is a function.
-//
-// Return the function symbol if found, otherwise 0.
-//
-const TFunction* TParseContext::findFunction(int line, TFunction* call, bool *builtIn)
-{
-    const TSymbol* symbol = symbolTable.find(call->getMangledName(), builtIn);
-
-    if (symbol == 0) {        
-        error(line, "no matching overloaded function found", call->getName().c_str(), "");
-        return 0;
-    }
-
-    if (! symbol->isFunction()) {
-        error(line, "function name expected", call->getName().c_str(), "");
-        return 0;
-    }
-    
-    const TFunction* function = static_cast<const TFunction*>(symbol);
-    
-    return function;
-}
-//
-// Initializers show up in several places in the grammar.  Have one set of
-// code to handle them here.
-//
-bool TParseContext::executeInitializer(TSourceLoc line, TString& identifier, TPublicType& pType, 
-                                       TIntermTyped* initializer, TIntermNode*& intermNode)
-{
-    if (reservedErrorCheck(line, identifier))
-        return true;
-
-    if (voidErrorCheck(line, identifier, pType))
-        return true;
-
-    //
-    // add variable to symbol table
-    //
-    TVariable* variable = new TVariable(&identifier, TType(pType));
-    if (! symbolTable.insert(*variable)) {
-        error(line, "redefinition", variable->getName().c_str(), "");
-        return true;
-        // don't delete variable, it's used by error recovery, and the pool 
-        // pop will take care of the memory
-    }
-
-    //
-    // identifier must be of type constant, a global, or a temporary
-    //
-    TQualifier qualifier = variable->getType().getQualifier();
-    if ((qualifier != EvqTemporary) && (qualifier != EvqGlobal) && (qualifier != EvqConst)) {
-        error(line, " cannot initialize this type of qualifier ", variable->getType().getQualifierString(), "");
-        return true;
-    }
-    //
-    // test for and propagate constant
-    //
-
-    if (qualifier == EvqConst) {
-        if (qualifier != initializer->getType().getQualifier()) {
-            error(line, " assigning non-constant to", "=", "'%s'", variable->getType().getCompleteString().c_str());
-            variable->getType().changeQualifier(EvqTemporary);
-            return true;
-        }
-        if (TType(pType) != initializer->getType()) {
-            error(line, " non-matching types for const initializer ", 
-                variable->getType().getQualifierString(), "");
-            variable->getType().changeQualifier(EvqTemporary);
-            return true;
-        }
-        if (initializer->getAsConstantUnion()) { 
-            constUnion* unionArray = variable->getConstPointer();            
-
-            if (pType.size == 1 && TType(pType).getBasicType() != EbtStruct) {
-                switch (pType.type ) {
-                case EbtInt:
-                    unionArray->iConst = (initializer->getAsConstantUnion()->getUnionArrayPointer())[0].iConst;
-                    break;
-                case EbtFloat:
-                    unionArray->fConst = (initializer->getAsConstantUnion()->getUnionArrayPointer())[0].fConst;
-                    break;
-                case EbtBool:
-                    unionArray->bConst = (initializer->getAsConstantUnion()->getUnionArrayPointer())[0].bConst;
-                    break;
-                default:
-                    error(line, " cannot initialize constant of this type", "", "");
-                    return true;
-                }
-            } else {
-                variable->shareConstPointer(initializer->getAsConstantUnion()->getUnionArrayPointer());
-            }
-        } else if (initializer->getAsAggregate()) {
-            bool returnVal = false;
-            constUnion* unionArray = variable->getConstPointer();
-            if (initializer->getAsAggregate()->getSequence().size() == 1 && initializer->getAsAggregate()->getSequence()[0]->getAsTyped()->getAsConstantUnion())  {
-                returnVal = intermediate.parseConstTree(line, initializer, unionArray, initializer->getAsAggregate()->getOp(), symbolTable,  variable->getType(), true);
-            }
-            else {
-                returnVal = intermediate.parseConstTree(line, initializer, unionArray, initializer->getAsAggregate()->getOp(), symbolTable, variable->getType());
-            }
-            intermNode = 0;
-            constUnion *arrayUnion = unionArray;
-            if (returnVal) {
-                arrayUnion = 0;
-                variable->getType().changeQualifier(EvqTemporary);
-            } 
-            return returnVal;
-        } else if (initializer->getAsSymbolNode()) {
-            const TSymbol* symbol = symbolTable.find(initializer->getAsSymbolNode()->getSymbol());
-            const TVariable* tVar = static_cast<const TVariable*>(symbol);
-
-            constUnion* constArray = tVar->getConstPointer();
-            variable->shareConstPointer(constArray);
-        } else {
-            error(line, " assigning non-constant to", "=", "'%s'", variable->getType().getCompleteString().c_str());
-            variable->getType().changeQualifier(EvqTemporary);
-            return true;
-        }
-    }
- 
-    if (qualifier != EvqConst) {
-        TIntermSymbol* intermSymbol = intermediate.addSymbol(variable->getUniqueId(), variable->getName(), variable->getType(), line);
-        intermNode = intermediate.addAssign(EOpAssign, intermSymbol, initializer, line);
-        if (intermNode == 0) {
-            assignError(line, "=", intermSymbol->getCompleteString(), initializer->getCompleteString());
-            return true;
-        }
-    } else 
-        intermNode = 0;
-
-    return false;
-}
-
-//
-// This method checks to see if the given aggregate node has all its children nodes as constants
-// This method does not test if structure members are constant
-//
-bool TParseContext::canNodeBeRemoved(TIntermNode* childNode)
-{
-    TIntermAggregate *aggrNode = childNode->getAsAggregate();
-    if (!aggrNode)
-        return false;
-
-    if (!aggrNode->isConstructor() || aggrNode->getOp() == EOpConstructStruct)
-        return false;
-
-    bool allConstant = true;
-
-    // check if all the child nodes are constants so that they can be inserted into 
-    // the parent node
-    if (aggrNode) {
-        TIntermSequence &childSequenceVector = aggrNode->getSequence() ;
-        for (TIntermSequence::iterator p = childSequenceVector.begin(); 
-                                    p != childSequenceVector.end(); p++) {
-            if (!(*p)->getAsTyped()->getAsConstantUnion())
-                return false;
-        }
-    }
-
-    return allConstant;
-}
-
-// This function is used to test for the correctness of the parameters passed to various constructor functions
-// and also convert them to the right datatype if it is allowed and required. 
-//
-// Returns 0 for an error or the constructed node (aggregate or typed) for no error.
-//
-TIntermTyped* TParseContext::addConstructor(TIntermNode* node, TType* type, TOperator op, TFunction* fnCall, TSourceLoc line)
-{
-    if (node == 0)
-        return 0;
-
-    TIntermAggregate* aggrNode = node->getAsAggregate();
-    
-    TTypeList::iterator list;
-    TTypeList* structure = 0;  // Store the information (vector) about the return type of the structure.
-    if (op == EOpConstructStruct) {
-        const TType& ttype = fnCall->getReturnType();
-        structure = ttype.getStruct();
-        list = (*structure).begin();
-    }
-
-    bool singleArg;
-    if (aggrNode) {
-        if (aggrNode->getOp() != EOpNull || aggrNode->getSequence().size() == 1)
-            singleArg = true;
-        else
-            singleArg = false;
-    } else
-        singleArg = true;
-
-    TIntermTyped *newNode;
-    if (singleArg) {
-        if (op == EOpConstructStruct) { 
-            // If structure constructor is being called for only one parameter inside the structure,
-            // we need to call constructStruct function once.
-            if (structure->size() != 1) {
-                error(line, "Number of constructor parameters does not match the number of structure fields", "constructor", "");
-                
-                return 0;
-            } else
-                return constructStruct(node, (*list).type, 1, node->getLine(), false);
-        } else {
-            newNode =  constructBuiltIn(type, op, node, node->getLine(), false);
-            if (newNode && newNode->getAsAggregate()) {
-                if (canNodeBeRemoved(newNode->getAsAggregate()->getSequence()[0])) {
-                    TIntermAggregate* returnAggNode = newNode->getAsAggregate()->getSequence()[0]->getAsAggregate();
-                    newNode = intermediate.removeChildNode(newNode, type, returnAggNode);
-                }
-            }
-            return newNode;
-        }
-    }
-    
-    //
-    // Handle list of arguments.
-    //
-    TIntermSequence &sequenceVector = aggrNode->getSequence() ;    // Stores the information about the parameter to the constructor
-    // if the structure constructor contains more than one parameter, then construct
-    // each parameter
-    if (op == EOpConstructStruct) {
-        if (structure->size() != sequenceVector.size()) { // If the number of parameters to the constructor does not match the expected number of parameters
-            error(line, "Number of constructor parameters does not match the number of structure fields", "constructor", "");
-            
-            return 0;
-        }
-    }
-    
-    int paramCount = 0;  // keeps a track of the constructor parameter number being checked    
-    
-    // for each parameter to the constructor call, check to see if the right type is passed or convert them 
-    // to the right type if possible (and allowed).
-    // for structure constructors, just check if the right type is passed, no conversion is allowed.
-    
-    for (TIntermSequence::iterator p = sequenceVector.begin(); 
-                                   p != sequenceVector.end(); p++, paramCount++) {
-        bool move = false;
-        if (op == EOpConstructStruct) {
-            newNode = constructStruct(*p, (list[paramCount]).type, paramCount+1, node->getLine(), true);
-            if (newNode)
-                move = true;
-        } else {
-            newNode = constructBuiltIn(type, op, *p, node->getLine(), true);
-
-            if (newNode) {
-                if (canNodeBeRemoved(newNode))
-                    intermediate.removeChildNode(sequenceVector, *type, paramCount, p, newNode->getAsAggregate());
-                else
-                    move = true;    
-            } 
-        }
-        if (move) {
-            sequenceVector.erase(p); 
-            sequenceVector.insert(p, newNode);
-        }
-    }
-
-    return intermediate.setAggregateOperator(aggrNode, op, line);
-}
-
-// Function for constructor implementation. Calls addUnaryMath with appropriate EOp value
-// for the parameter to the constructor (passed to this function). Essentially, it converts
-// the parameter types correctly. If a constructor expects an int (like ivec2) and is passed a 
-// float, then float is converted to int.
-//
-// Returns 0 for an error or the constructed node.
-//
-TIntermTyped* TParseContext::constructBuiltIn(TType* type, TOperator op, TIntermNode* node, TSourceLoc line, bool subset)
-{
-    TIntermTyped* newNode;
-    TOperator basicOp;
-
-    //
-    // First, convert types as needed.
-    //
-    switch (op) {
-    case EOpConstructVec2:
-    case EOpConstructVec3:
-    case EOpConstructVec4:
-    case EOpConstructMat2:
-    case EOpConstructMat3:
-    case EOpConstructMat4:
-    case EOpConstructFloat:
-        basicOp = EOpConstructFloat;
-        break;
-
-    case EOpConstructIVec2:
-    case EOpConstructIVec3:
-    case EOpConstructIVec4:
-    case EOpConstructInt:
-        basicOp = EOpConstructInt;
-        break;
-
-    case EOpConstructBVec2:
-    case EOpConstructBVec3:
-    case EOpConstructBVec4:
-    case EOpConstructBool:
-        basicOp = EOpConstructBool;
-        break;
-
-    default:
-        error(line, "unsupported construction", "", "");
-        recover();
-
-        return 0;
-    }
-    newNode = intermediate.addUnaryMath(basicOp, node, node->getLine(), symbolTable);
-    if (newNode == 0) {
-        error(line, "can't convert", "constructor", "");
-        return 0;
-    }
-
-    //
-    // Now, if there still isn't an operation to do the construction, and we need one, add one.
-    //
-    
-    // Otherwise, skip out early.
-    if (subset || newNode != node && newNode->getType() == *type)
-        return newNode;
-
-    // setAggregateOperator will insert a new node for the constructor, as needed.
-    return intermediate.setAggregateOperator(newNode, op, line);
-}
-
-// This function tests for the type of the parameters to the structures constructors. Raises
-// an error message if the expected type does not match the parameter passed to the constructor.
-//
-// Returns 0 for an error or the input node itself if the expected and the given parameter types match.
-//
-TIntermTyped* TParseContext::constructStruct(TIntermNode* node, TType* type, int paramCount, TSourceLoc line, bool subset)
-{
-    if (*type == node->getAsTyped()->getType()) {
-        if (subset)
-            return node->getAsTyped();
-        else
-            return intermediate.setAggregateOperator(node->getAsTyped(), EOpConstructStruct, line);
-    } else {
-        error(line, "", "constructor", "cannot convert parameter %d from '%s' to '%s'", paramCount,
-                node->getAsTyped()->getType().getBasicString(), type->getBasicString());
-        recover();
-    }
-
-    return 0;
-}
-
-//
-// This function returns the tree representation for the vector field(s) being accessed from contant vector.
-// If only one component of vector is accessed (v.x or v[0] where v is a contant vector), then a contant node is
-// returned, else an aggregate node is returned (for v.xy). The input to this function could either be the symbol
-// node or it could be the intermediate tree representation of accessing fields in a constant structure or column of 
-// a constant matrix.
-//
-TIntermTyped* TParseContext::addConstVectorNode(TVectorFields& fields, TIntermTyped* node, TSourceLoc line)
-{
-    TIntermTyped* typedNode;
-    TIntermConstantUnion* tempConstantNode = node->getAsConstantUnion();
-    TIntermAggregate* aggregateNode = node->getAsAggregate();
-
-    constUnion *unionArray;
-    if (tempConstantNode) {
-        unionArray = tempConstantNode->getUnionArrayPointer();
-
-        if (!unionArray) {  // this error message should never be raised
-            infoSink.info.message(EPrefixInternalError, "constUnion not initialized in addConstVectorNode function", line);
-            recover();
-
-            return node;
-        }
-    } else if (aggregateNode) { // if an aggregate node is present, the value has to be taken from the parse tree 
-        // for a case like vec(4).xz
-        unionArray = new constUnion[aggregateNode->getType().getInstanceSize()];                        
-    
-        bool returnVal = false;
-        if (aggregateNode->getAsAggregate()->getSequence().size() == 1 && aggregateNode->getAsAggregate()->getSequence()[0]->getAsTyped()->getAsConstantUnion())  {
-            returnVal = intermediate.parseConstTree(line, aggregateNode, unionArray, aggregateNode->getOp(), symbolTable,  aggregateNode->getType(), true);
-        }
-        else {
-            returnVal = intermediate.parseConstTree(line, aggregateNode, unionArray, aggregateNode->getOp(), symbolTable, aggregateNode->getType());
-        }
-
-        if (returnVal)
-            return 0;
-
-    } else { // The node has to be either a symbol node or an aggregate node or a tempConstant node, else, its an error
-        error(line, "No aggregate or constant union node available", "Internal Error", "");
-        recover();
-
-        return 0;
-    }
-
-    constUnion* constArray = new constUnion[fields.num];
-
-    for (int i = 0; i < fields.num; i++) {
-        if (fields.offsets[i] >= node->getType().getInstanceSize()) {
-            error(line, "", "[", "vector field selection out of range '%d'", fields.offsets[i]);
-            recover();
-            fields.offsets[i] = 0;
-        }
-        
-        constArray[i] = unionArray[fields.offsets[i]];
-
-    } 
-    typedNode = intermediate.addConstantUnion(constArray, node->getType(), line);
-    return typedNode;
-}
-
-//
-// This function returns the column being accessed from a constant matrix. The values are retrieved from
-// the symbol table and parse-tree is built for a vector (each column of a matrix is a vector). The input 
-// to the function could either be a symbol node (m[0] where m is a constant matrix)that represents a 
-// constant matrix or it could be the tree representation of the constant matrix (s.m1[0] where s is a constant structure)
-//
-TIntermTyped* TParseContext::addConstMatrixNode(int index, TIntermTyped* node, TSourceLoc line)
-{
-    TIntermTyped* typedNode;
-    TIntermConstantUnion* tempConstantNode = node->getAsConstantUnion();
-    TIntermAggregate* aggregateNode = node->getAsAggregate();
-
-    if (index >= node->getType().getNominalSize()) {
-        error(line, "", "[", "matrix field selection out of range '%d'", index);
-        recover();
-        index = 0;
-    }
-
-    if (tempConstantNode) {
-         constUnion* unionArray = tempConstantNode->getUnionArrayPointer();
-         int size = tempConstantNode->getType().getNominalSize();
-         typedNode = intermediate.addConstantUnion(&unionArray[size*index], tempConstantNode->getType(), line);
-    } else if (aggregateNode) {
-        // for a case like mat4(5)[0]
-        constUnion* unionArray = new constUnion[aggregateNode->getType().getInstanceSize()];                        
-        int size = aggregateNode->getType().getNominalSize();
-    
-        bool returnVal = false;
-        if (aggregateNode->getAsAggregate()->getSequence().size() == 1 && aggregateNode->getAsAggregate()->getSequence()[0]->getAsTyped()->getAsConstantUnion())  {
-            returnVal = intermediate.parseConstTree(line, aggregateNode, unionArray, aggregateNode->getOp(), symbolTable,  aggregateNode->getType(), true);
-        }
-        else {
-            returnVal = intermediate.parseConstTree(line, aggregateNode, unionArray, aggregateNode->getOp(), symbolTable, aggregateNode->getType());
-        }
-
-        if (!returnVal)
-            typedNode = intermediate.addConstantUnion(&unionArray[size*index], aggregateNode->getType(), line);
-        else 
-            return 0;
-
-    } else {
-        error(line, "No Aggregate or Constant Union node available", "Internal Error", "");
-        recover();
-
-        return 0;
-    }
-
-    return typedNode;
-}
-
-//
-// This function returns the value of a particular field inside a constant structure from the symbol table. 
-// If there is an embedded/nested struct, it appropriately calls addConstStructNested or addConstStructFromAggr
-// function and returns the parse-tree with the values of the embedded/nested struct.
-//
-TIntermTyped* TParseContext::addConstStruct(TString& identifier, TIntermTyped* node, TSourceLoc line)
-{
-    TTypeList* fields = node->getType().getStruct();
-    TIntermTyped *typedNode;
-    int instanceSize = 0;
-    unsigned int index = 0;
-    TIntermConstantUnion *tempConstantNode = node->getAsConstantUnion();
-    TIntermAggregate* aggregateNode = node->getAsAggregate();
-
-    for ( index = 0; index < fields->size(); ++index) {
-        if ((*fields)[index].type->getFieldName() == identifier) {
-            break;
-        } else {
-            if ((*fields)[index].type->getStruct())
-                //?? We should actually be calling getStructSize() function and not setStructSize. This problem occurs in case
-                // of nested/embedded structs.                
-                instanceSize += (*fields)[index].type->setStructSize((*fields)[index].type->getStruct());
-            else
-                instanceSize += (*fields)[index].type->getInstanceSize();
-        }
-    }
-
-    if (tempConstantNode) {
-         constUnion* constArray = tempConstantNode->getUnionArrayPointer();
-
-         typedNode = intermediate.addConstantUnion(constArray+instanceSize, tempConstantNode->getType(), line); // type will be changed in the calling function
-    } else if (aggregateNode) {
-        // for a case like constStruct(1,v3).i where structure fields is int i and vec3 v3.
-
-        constUnion* unionArray = new constUnion[aggregateNode->getType().getStructSize()];                        
-    
-        bool returnVal = false;
-        if (aggregateNode->getAsAggregate()->getSequence().size() == 1 && aggregateNode->getAsAggregate()->getSequence()[0]->getAsTyped()->getAsConstantUnion())  {
-            returnVal = intermediate.parseConstTree(line, aggregateNode, unionArray, aggregateNode->getOp(), symbolTable,  aggregateNode->getType(), true);
-        }
-        else {
-            returnVal = intermediate.parseConstTree(line, aggregateNode, unionArray, aggregateNode->getOp(), symbolTable, aggregateNode->getType());
-        }
-
-        if (!returnVal)
-            typedNode = intermediate.addConstantUnion(unionArray+instanceSize, aggregateNode->getType(), line);
-        else
-            return 0;
-
-    } else {
-        error(line, "No Aggregate or Constant Union node available", "Internal Error", "");
-        recover();
-
-        return 0;
-    }
-
-    return typedNode;
-}
-
-//
-// Initialize all supported extensions to disable
-//
-void TParseContext::initializeExtensionBehavior()
-{
-    //
-    // example code: extensionBehavior["test"] = EDisable; // where "test" is the name of 
-    // supported extension
-    //
-}
-
-OS_TLSIndex GlobalParseContextIndex = OS_INVALID_TLS_INDEX;
-
-bool InitializeParseContextIndex()
-{
-    if (GlobalParseContextIndex != OS_INVALID_TLS_INDEX) {
-        assert(0 && "InitializeParseContextIndex(): Parse Context already initalised");
-        return false;
-    }
-
-    //
-    // Allocate a TLS index.
-    //
-    GlobalParseContextIndex = OS_AllocTLSIndex();
-    
-    if (GlobalParseContextIndex == OS_INVALID_TLS_INDEX) {
-        assert(0 && "InitializeParseContextIndex(): Parse Context already initalised");
-        return false;
-    }
-
-    return true;
-}
-
-bool InitializeGlobalParseContext()
-{
-    if (GlobalParseContextIndex == OS_INVALID_TLS_INDEX) {
-        assert(0 && "InitializeGlobalParseContext(): Parse Context index not initalised");
-        return false;
-    }
-
-    TThreadParseContext *lpParseContext = static_cast<TThreadParseContext *>(OS_GetTLSValue(GlobalParseContextIndex));
-    if (lpParseContext != 0) {
-        assert(0 && "InitializeParseContextIndex(): Parse Context already initalised");
-        return false;
-    }
-
-    TThreadParseContext *lpThreadData = new TThreadParseContext();
-    if (lpThreadData == 0) {
-        assert(0 && "InitializeGlobalParseContext(): Unable to create thread parse context");
-        return false;
-    }
-
-    lpThreadData->lpGlobalParseContext = 0;
-    OS_SetTLSValue(GlobalParseContextIndex, lpThreadData);
-
-    return true;
-}
-
-TParseContextPointer& GetGlobalParseContext()
-{
-    //
-    // Minimal error checking for speed
-    //
-
-    TThreadParseContext *lpParseContext = static_cast<TThreadParseContext *>(OS_GetTLSValue(GlobalParseContextIndex));
-
-    return lpParseContext->lpGlobalParseContext;
-}
-
-bool FreeParseContext()
-{
-    if (GlobalParseContextIndex == OS_INVALID_TLS_INDEX) {
-        assert(0 && "FreeParseContext(): Parse Context index not initalised");
-        return false;
-    }
-
-    TThreadParseContext *lpParseContext = static_cast<TThreadParseContext *>(OS_GetTLSValue(GlobalParseContextIndex));
-    if (lpParseContext)
-        delete lpParseContext;
-
-    return true;
-}
-
-bool FreeParseContextIndex()
-{
-    OS_TLSIndex tlsiIndex = GlobalParseContextIndex;
-
-    if (GlobalParseContextIndex == OS_INVALID_TLS_INDEX) {
-        assert(0 && "FreeParseContextIndex(): Parse Context index not initalised");
-        return false;
-    }
-
-    GlobalParseContextIndex = OS_INVALID_TLS_INDEX;
-
-    return OS_FreeTLSIndex(tlsiIndex);
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.h
deleted file mode 100755
index 00552b855..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.h
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-#ifndef _PARSER_HELPER_INCLUDED_
-#define _PARSER_HELPER_INCLUDED_
-
-#include "../Include/ShHandle.h"
-#include "SymbolTable.h"
-#include "localintermediate.h"
-
-struct TMatrixFields {
-    bool wholeRow;
-    bool wholeCol;
-    int row;
-    int col;    
-};
-
-typedef enum {
-    EBhRequire,
-    EBhEnable,
-    EBhWarn,
-    EBhDisable
-} TBehavior;
-
-struct TPragma {
-	TPragma(bool o, bool d) : optimize(o), debug(d) { }
-	bool optimize;
-	bool debug;
-	TPragmaTable pragmaTable;
-};
-
-//
-// The following are extra variables needed during parsing, grouped together so
-// they can be passed to the parser without needing a global.
-//
-struct TParseContext {
-    TParseContext(TSymbolTable& symt, TIntermediate& interm, EShLanguage L, TInfoSink& is) : 
-            intermediate(interm), symbolTable(symt), infoSink(is), language(L), treeRoot(0),
-            recoveredFromError(false), numErrors(0), lexAfterType(false), loopNestingLevel(0), 
-            inTypeParen(false), contextPragma(true, false) {  }
-    TIntermediate& intermediate; // to hold and build a parse tree
-    TSymbolTable& symbolTable;   // symbol table that goes with the language currently being parsed
-    TInfoSink& infoSink;
-    EShLanguage language;        // vertex or fragment language (future: pack or unpack)
-    TIntermNode* treeRoot;       // root of parse tree being created
-    bool recoveredFromError;     // true if a parse error has occurred, but we continue to parse
-    int numErrors;
-    bool lexAfterType;           // true if we've recognized a type, so can only be looking for an identifier
-    int loopNestingLevel;        // 0 if outside all loops
-    bool inTypeParen;            // true if in parentheses, looking only for an identifier
-    const TType* currentFunctionType;  // the return type of the function that's currently being parsed
-    bool functionReturnsValue;   // true if a non-void function has a return
-    TMap<TString, TBehavior> extensionBehavior;
-    void initializeExtensionBehavior();
-
-    void C_DECL error(TSourceLoc, const char *szReason, const char *szToken, 
-                      const char *szExtraInfoFormat, ...);
-    bool reservedErrorCheck(int line, const TString& identifier);
-    void recover();
-    
-    bool parseVectorFields(const TString&, int vecSize, TVectorFields&, int line);
-    bool parseMatrixFields(const TString&, int matSize, TMatrixFields&, int line);
-    void assignError(int line, const char* op, TString left, TString right);
-    void unaryOpError(int line, char* op, TString operand);
-    void binaryOpError(int line, char* op, TString left, TString right);
-    bool lValueErrorCheck(int line, char* op, TIntermTyped*);
-    bool constErrorCheck(TIntermTyped* node);
-    bool integerErrorCheck(TIntermTyped* node, char* token);
-    bool globalErrorCheck(int line, bool global, char* token);
-    bool constructorErrorCheck(int line, TIntermNode*, TFunction&, TOperator, TType*);
-    bool arrayErrorCheck(int line, TString& identifier, TPublicType type, TIntermTyped* size);
-    bool insertBuiltInArrayAtGlobalLevel();
-    bool voidErrorCheck(int, const TString&, const TPublicType&);
-    bool boolErrorCheck(int, const TIntermTyped*);
-    bool boolErrorCheck(int, const TPublicType&);
-    bool samplerErrorCheck(int line, const TPublicType& pType, const char* reason);
-    bool structQualifierErrorCheck(int line, const TPublicType& pType);
-    bool parameterSamplerErrorCheck(int line, TQualifier qualifier, const TType& type);
-    bool containsSampler(TType& type);
-    bool nonInitErrorCheck(int line, TString& identifier, TPublicType& type);
-    bool paramErrorCheck(int line, TQualifier qualifier, TQualifier paramQualifier, TType* type);
-    const TFunction* findFunction(int line, TFunction* pfnCall, bool *builtIn = 0);
-    bool executeInitializer(TSourceLoc line, TString& identifier, TPublicType& pType, 
-                            TIntermTyped* initializer, TIntermNode*& intermNode);
-    bool canNodeBeRemoved(TIntermNode*);
-    TIntermTyped* addConstructor(TIntermNode*, TType*, TOperator, TFunction*, TSourceLoc);
-    TIntermTyped* constructStruct(TIntermNode*, TType*, int, TSourceLoc, bool subset);
-    TIntermTyped* constructBuiltIn(TType*, TOperator, TIntermNode*, TSourceLoc, bool subset);
-    TIntermTyped* addConstVectorNode(TVectorFields&, TIntermTyped*, TSourceLoc);
-    TIntermTyped* addConstMatrixNode(int , TIntermTyped*, TSourceLoc);
-    TIntermTyped* addConstStruct(TString& , TIntermTyped*, TSourceLoc);
-    bool arraySetMaxSize(TIntermSymbol*, TType*, int, bool, TSourceLoc);
-	struct TPragma contextPragma;
-	TString HashErrMsg; 
-    bool AfterEOF;
-};
-
-int PaParseStrings(char* argv[], int strLen[], int argc, TParseContext&);
-void PaReservedWord();
-int PaIdentOrType(TString& id, TParseContext&, TSymbol*&);
-int PaParseComment(int &lineno, TParseContext&);
-void setInitialState();
-
-typedef TParseContext* TParseContextPointer;
-extern TParseContextPointer& GetGlobalParseContext();
-#define GlobalParseContext GetGlobalParseContext()
-
-typedef struct TThreadParseContextRec
-{
-	TParseContext *lpGlobalParseContext;
-} TThreadParseContext;
-
-#endif // _PARSER_HELPER_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp
deleted file mode 100755
index ba717fce1..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../Include/PoolAlloc.h"
-#include "../Include/Common.h"
-
-#include "Include/InitializeGlobals.h"
-#include "osinclude.h"
-
-OS_TLSIndex PoolIndex;
-
-void InitializeGlobalPools()
-{
-    TThreadGlobalPools* globalPools= static_cast<TThreadGlobalPools*>(OS_GetTLSValue(PoolIndex));    
-    if (globalPools)
-        return;
-
-    TPoolAllocator *globalPoolAllocator = new TPoolAllocator(true);
-
-    TThreadGlobalPools* threadData = new TThreadGlobalPools();
-    
-    threadData->globalPoolAllocator = globalPoolAllocator;
-    	
-    OS_SetTLSValue(PoolIndex, threadData);     
-	globalPoolAllocator->push();
-}
-
-void FreeGlobalPools()
-{
-    // Release the allocated memory for this thread.
-    TThreadGlobalPools* globalPools= static_cast<TThreadGlobalPools*>(OS_GetTLSValue(PoolIndex));    
-    if (!globalPools)
-        return;
-	
-    GlobalPoolAllocator.popAll();
-    delete &GlobalPoolAllocator;       
-    delete globalPools;
-}
-
-bool InitializePoolIndex()
-{
-    // Allocate a TLS index.
-    if ((PoolIndex = OS_AllocTLSIndex()) == OS_INVALID_TLS_INDEX)
-        return false;
-
-    return true;
-}
-
-void FreePoolIndex()
-{
-    // Release the TLS index.
-    OS_FreeTLSIndex(PoolIndex);
-}
-
-TPoolAllocator& GetGlobalPoolAllocator()
-{
-    TThreadGlobalPools* threadData = static_cast<TThreadGlobalPools*>(OS_GetTLSValue(PoolIndex));
-
-    return *threadData->globalPoolAllocator;
-}
-
-void SetGlobalPoolAllocatorPtr(TPoolAllocator* poolAllocator)
-{
-    TThreadGlobalPools* threadData = static_cast<TThreadGlobalPools*>(OS_GetTLSValue(PoolIndex));
-
-    threadData->globalPoolAllocator = poolAllocator;
-}
-
-//
-// Implement the functionality of the TPoolAllocator class, which
-// is documented in PoolAlloc.h.
-//
-TPoolAllocator::TPoolAllocator(bool g, int growthIncrement, int allocationAlignment) : 
-    global(g),
-    pageSize(growthIncrement),
-    alignment(allocationAlignment),
-    freeList(0),
-    inUseList(0),
-    numCalls(0)
-{
-    //
-    // Don't allow page sizes we know are smaller than all common
-    // OS page sizes.
-    //
-    if (pageSize < 4*1024)
-        pageSize = 4*1024;
-
-    //
-    // A large currentPageOffset indicates a new page needs to
-    // be obtained to allocate memory.
-    //
-    currentPageOffset = pageSize;
-
-    //
-    // Adjust alignment to be at least pointer aligned and
-    // power of 2.
-    //
-    size_t minAlign = sizeof(void*);
-    alignment &= ~(minAlign - 1);
-    if (alignment < minAlign)
-        alignment = minAlign;
-    size_t a = 1;
-    while (a < alignment)
-        a <<= 1;
-    alignment = a;
-    alignmentMask = a - 1;
-
-    //
-    // Align header skip
-    //
-    headerSkip = minAlign;
-    if (headerSkip < sizeof(tHeader)) {
-        headerSkip = (sizeof(tHeader) + alignmentMask) & ~alignmentMask;
-    }
-
-    //
-    // Put a marker at the beginning of the stack.  We won't 
-    // pop() past this.
-    //
-    tAllocState start = { currentPageOffset, 0 };
-    stack.push_back(start);
-}
-
-TPoolAllocator::~TPoolAllocator()
-{
-    if (!global) {
-        //
-        // Then we know that this object is not being 
-        // allocated after other, globally scoped objects
-        // that depend on it.  So we can delete the "in use" memory.
-        //
-	    while (inUseList) {
-	        tHeader* next = inUseList->nextPage;
-            inUseList->~tHeader();
-            delete [] reinterpret_cast<char*>(inUseList);
-	        inUseList = next;
-	    }
-    }
-
-    //
-    // Always delete the free list memory - it can't be being
-    // (correctly) referenced, whether the pool allocator was
-    // global or not.  We should not check the guard blocks
-    // here, because we did it already when the block was
-    // placed into the free list.
-    //
-    while (freeList) {
-        tHeader* next = freeList->nextPage;
-        delete [] reinterpret_cast<char*>(freeList);
-        freeList = next;
-    }
-}
-
-// Support MSVC++ 6.0
-const unsigned char TAllocation::guardBlockBeginVal = 0xfb;
-const unsigned char TAllocation::guardBlockEndVal   = 0xfe;
-const unsigned char TAllocation::userDataFill       = 0xcd;
-
-#   ifdef GUARD_BLOCKS
-    const size_t TAllocation::guardBlockSize = 16;
-#   else
-    const size_t TAllocation::guardBlockSize = 0;
-#   endif
-
-//
-// Check a single guard block for damage
-//
-void TAllocation::checkGuardBlock(unsigned char* blockMem, unsigned char val, char* locText) const
-{
-    for (int x = 0; x < guardBlockSize; x++) {
-        if (blockMem[x] != val) {
-            char assertMsg[80];
-
-            // We don't print the assert message.  It's here just to be helpful.
-            sprintf(assertMsg, "PoolAlloc: Damage %s %u byte allocation at 0x%p\n",
-                    locText, size, data());
-            assert(0 && "PoolAlloc: Damage in guard block");
-        }
-    }
-}
-
-
-void TPoolAllocator::push()
-{
-    tAllocState state = { currentPageOffset, inUseList };
-
-    stack.push_back(state);
-        
-    //
-    // Indicate there is no current page to allocate from.
-    //
-    currentPageOffset = pageSize;
-}
-
-//
-// Do a mass-deallocation of all the individual allocations
-// that have occurred since the last push(), or since the
-// last pop(), or since the object's creation.
-//
-// The deallocated pages are saved for future allocations.
-//
-void TPoolAllocator::pop()
-{
-    if (stack.size() < 1)
-        return;
-
-    tHeader* page = stack.back().page;
-    currentPageOffset = stack.back().offset;
-
-    while (inUseList != page) {
-        // invoke destructor to free allocation list
-        inUseList->~tHeader();
-        
-        tHeader* nextInUse = inUseList->nextPage;
-        if (inUseList->pageCount > 1)
-            delete [] reinterpret_cast<char*>(inUseList);
-        else {
-            inUseList->nextPage = freeList;
-            freeList = inUseList;
-        }
-        inUseList = nextInUse;
-    }
-
-    stack.pop_back();
-}
-
-//
-// Do a mass-deallocation of all the individual allocations
-// that have occurred.
-//
-void TPoolAllocator::popAll()
-{
-    while (stack.size() > 0)
-        pop();
-}
-
-void* TPoolAllocator::allocate(size_t numBytes)
-{
-    // If we are using guard blocks, all allocations are bracketed by
-    // them: [guardblock][allocation][guardblock].  numBytes is how
-    // much memory the caller asked for.  allocationSize is the total
-    // size including guard blocks.  In release build,
-    // guardBlockSize=0 and this all gets optimized away.
-    size_t allocationSize = TAllocation::allocationSize(numBytes);
-    
-    //
-    // Just keep some interesting statistics.
-    //
-    ++numCalls;
-    totalBytes += numBytes;
-
-    //
-    // Do the allocation, most likely case first, for efficiency.
-    // This step could be moved to be inline sometime.
-    //
-    if (currentPageOffset + allocationSize <= pageSize) {
-        //
-        // Safe to allocate from currentPageOffset.
-        //
-        unsigned char* memory = reinterpret_cast<unsigned char *>(inUseList) + currentPageOffset;
-        currentPageOffset += allocationSize;
-        currentPageOffset = (currentPageOffset + alignmentMask) & ~alignmentMask;
-
-        return initializeAllocation(inUseList, memory, numBytes);
-    }
-
-    if (allocationSize + headerSkip > pageSize) {
-        //
-        // Do a multi-page allocation.  Don't mix these with the others.
-        // The OS is efficient and allocating and free-ing multiple pages.
-        //
-        size_t numBytesToAlloc = allocationSize + headerSkip;
-        tHeader* memory = reinterpret_cast<tHeader*>(::new char[numBytesToAlloc]);
-        if (memory == 0)
-            return 0;
-
-        // Use placement-new to initialize header
-        new(memory) tHeader(inUseList, (numBytesToAlloc + pageSize - 1) / pageSize);
-        inUseList = memory;
-
-        currentPageOffset = pageSize;  // make next allocation come from a new page
-
-        // No guard blocks for multi-page allocations (yet)
-        return reinterpret_cast<void*>(reinterpret_cast<UINT_PTR>(memory) + headerSkip);
-    }
-
-    //
-    // Need a simple page to allocate from.
-    //
-    tHeader* memory;
-    if (freeList) {
-        memory = freeList;
-        freeList = freeList->nextPage;
-    } else {
-        memory = reinterpret_cast<tHeader*>(::new char[pageSize]);
-        if (memory == 0)
-            return 0;
-    }
-
-    // Use placement-new to initialize header
-    new(memory) tHeader(inUseList, 1);
-    inUseList = memory;
-    
-    unsigned char* ret = reinterpret_cast<unsigned char *>(inUseList) + headerSkip;
-    currentPageOffset = (headerSkip + allocationSize + alignmentMask) & ~alignmentMask;
-
-    return initializeAllocation(inUseList, ret, numBytes);
-}
-
-
-//
-// Check all allocations in a list for damage by calling check on each.
-//
-void TAllocation::checkAllocList() const
-{
-    for (const TAllocation* alloc = this; alloc != 0; alloc = alloc->prevAlloc)
-        alloc->check();
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.cpp
deleted file mode 100755
index 2897f48b1..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../Include/intermediate.h"
-
-class TAliveTraverser : public TIntermTraverser {
-public:
-    TAliveTraverser(TQualifier q) : TIntermTraverser(), found(false), qualifier(q)
-    {
-        visitSymbol    = AliveSymbol;
-        visitSelection = AliveSelection;
-        rightToLeft    = true;
-    }
-    bool wasFound() { return found; }
-protected:
-    bool found;
-    TQualifier qualifier;
-
-    friend void AliveSymbol(TIntermSymbol*, TIntermTraverser*);
-    friend bool AliveSelection(bool, TIntermSelection*, TIntermTraverser*);
-};
-
-//
-// Report whether or not a variable of the given qualifier type
-// is guaranteed written.  Not always possible to determine if
-// it is written conditionally.
-//
-// ?? It does not do this well yet, this is just a place holder
-// that simply determines if it was reference at all, anywhere.
-//
-bool QualifierWritten(TIntermNode* node, TQualifier qualifier)
-{
-    TAliveTraverser it(qualifier);
-
-    if (node)
-        node->traverse(&it);
-
-    return it.wasFound();
-}
-
-void AliveSymbol(TIntermSymbol* node, TIntermTraverser* it)
-{
-    TAliveTraverser* lit = static_cast<TAliveTraverser*>(it);
-
-    //
-    // If it's what we're looking for, record it.
-    //
-    if (node->getQualifier() == lit->qualifier)
-        lit->found = true;
-}
-
-bool AliveSelection(bool preVisit, TIntermSelection* node, TIntermTraverser* it)
-{
-    TAliveTraverser* lit = static_cast<TAliveTraverser*>(it);
-
-    if (lit->wasFound())
-        return false;
-
-    return true;
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.h
deleted file mode 100755
index 73e902cd0..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-bool QualifierWritten(TIntermNode* root, TQualifier);
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.cpp
deleted file mode 100755
index 2435a485b..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../Include/intermediate.h"
-#include "RemoveTree.h"
-//
-// Code to recursively delete the intermediate tree.
-//
-
-void RemoveSymbol(TIntermSymbol* node, TIntermTraverser* it)
-{
-	delete node;
-}
-
-bool RemoveBinary(bool  /*preVisit*/ , TIntermBinary* node, TIntermTraverser*)
-{
-	delete node;
-
-	return true;
-}
-
-bool RemoveUnary(bool /*preVisit */, TIntermUnary* node, TIntermTraverser*)
-{
-    delete node;
-
-	return true;
-}
-
-bool RemoveAggregate(bool  /*preVisit*/ , TIntermAggregate* node, TIntermTraverser*)
-{
-	delete node;
-
-	return true;
-}
-
-bool RemoveSelection(bool  /*preVisit*/ , TIntermSelection* node, TIntermTraverser*)
-{
-	delete node;
-
-	return true;
-}
-
-void RemoveConstantUnion(TIntermConstantUnion* node, TIntermTraverser*)
-{
-	delete node;
-}
-
-//
-// Entry point.
-//
-void RemoveAllTreeNodes(TIntermNode* root)
-{
-    TIntermTraverser it;
-
-    it.visitAggregate     = RemoveAggregate;
-    it.visitBinary        = RemoveBinary;
-    it.visitConstantUnion = RemoveConstantUnion;
-    it.visitSelection     = RemoveSelection;
-    it.visitSymbol        = RemoveSymbol;
-    it.visitUnary         = RemoveUnary;
-
-	it.preVisit = false;
-	it.postVisit = true;
-
-    root->traverse(&it);
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.h
deleted file mode 100755
index 171092f1a..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-void RemoveAllTreeNodes(TIntermNode*);
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ShaderLang.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ShaderLang.cpp
deleted file mode 100755
index 3f37e15f3..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ShaderLang.cpp
+++ /dev/null
@@ -1,607 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-//
-// Implement the top-level of interface to the compiler/linker,
-// as defined in ShaderLang.h
-//
-#include "SymbolTable.h"
-#include "ParseHelper.h"
-#include "../Include/ShHandle.h"
-#include "Initialisation.h"
-
-#define SH_EXPORTING
-#include "../Public/ShaderLangExt.h"
-
-#include "Include/ResourceLimits.h"
-#include "Initialize.h"
-
-extern "C" int InitPreprocessor(void);
-extern "C" int FinalizePreprocessor(void);
-extern void SetGlobalPoolAllocatorPtr(TPoolAllocator* poolAllocator);
-
-bool generateBuiltInSymbolTable(const TBuiltInResource* resources, TInfoSink&, TSymbolTable*, EShLanguage language = EShLangCount);
-bool initializeSymbolTable(TBuiltInStrings* BuiltInStrings, EShLanguage language, TInfoSink& infoSink, const TBuiltInResource *resources, TSymbolTable*);
-
-//
-// A symbol table for each language.  Each has a different
-// set of built-ins, and we want to preserve that from
-// compile to compile.
-//
-TSymbolTable SymbolTables[EShLangCount];
-
-TPoolAllocator* PerProcessGPA = 0;
-//
-// This is the platform independent interface between an OGL driver
-// and the shading language compiler/linker.
-//
-
-//
-// Driver must call this first, once, before doing any other
-// compiler/linker operations.
-//
-int ShInitialize()
-{
-    TInfoSink infoSink;
-    bool ret = true;
-
-    if (!InitProcess())
-        return 0;
-
-    // This method should be called once per process. If its called by multiple threads, then 
-    // we need to have thread synchronization code around the initialization of per process
-    // global pool allocator
-    if (!PerProcessGPA) { 
-        TPoolAllocator *builtInPoolAllocator = new TPoolAllocator(true);
-        builtInPoolAllocator->push();
-        TPoolAllocator* gPoolAllocator = &GlobalPoolAllocator;
-        SetGlobalPoolAllocatorPtr(builtInPoolAllocator);
-
-        TSymbolTable symTables[EShLangCount];
-        generateBuiltInSymbolTable(0, infoSink, symTables);
-
-        PerProcessGPA = new TPoolAllocator(true);
-        PerProcessGPA->push();
-        SetGlobalPoolAllocatorPtr(PerProcessGPA);
-
-        SymbolTables[EShLangVertex].copyTable(symTables[EShLangVertex]);
-        SymbolTables[EShLangFragment].copyTable(symTables[EShLangFragment]);
-
-        SetGlobalPoolAllocatorPtr(gPoolAllocator);
-
-        symTables[EShLangVertex].pop();
-        symTables[EShLangFragment].pop();
-
-        builtInPoolAllocator->popAll();
-        delete builtInPoolAllocator;        
-
-    }
-
-    return ret ? 1 : 0;
-}
-
-//
-// Driver calls these to create and destroy compiler/linker
-// objects.
-//
-
-ShHandle ShConstructCompiler(const EShLanguage language, int debugOptions)
-{
-    if (!InitThread())
-        return 0;
-
-    TShHandleBase* base = static_cast<TShHandleBase*>(ConstructCompiler(language, debugOptions));
-    
-    return reinterpret_cast<void*>(base);
-}
-
-ShHandle ShConstructLinker(const EShExecutable executable, int debugOptions)
-{
-    if (!InitThread())
-        return 0;
-
-    TShHandleBase* base = static_cast<TShHandleBase*>(ConstructLinker(executable, debugOptions));
-
-    return reinterpret_cast<void*>(base);
-}
-
-ShHandle ShConstructUniformMap()
-{
-    if (!InitThread())
-        return 0;
-
-    TShHandleBase* base = static_cast<TShHandleBase*>(ConstructUniformMap());
-
-    return reinterpret_cast<void*>(base);
-}
-
-void ShDestruct(ShHandle handle)
-{
-    if (handle == 0)
-        return;
-
-    TShHandleBase* base = static_cast<TShHandleBase*>(handle);
-
-    if (base->getAsCompiler())
-        DeleteCompiler(base->getAsCompiler());
-    else if (base->getAsLinker())
-        DeleteLinker(base->getAsLinker());
-    else if (base->getAsUniformMap())
-        DeleteUniformMap(base->getAsUniformMap());
-}
-
-//
-// Cleanup symbol tables
-//
-int __fastcall ShFinalize()
-{  
-  if (PerProcessGPA) {
-    PerProcessGPA->popAll();
-    delete PerProcessGPA;
-  }
-  return 1;
-}
-
-//
-// This function should be called only once by the Master Dll. Currently, this is being called for each thread 
-// which is incorrect. This is required to keep the Sh interface working for now and will eventually be called 
-// from master dll once.
-//
-bool generateBuiltInSymbolTable(const TBuiltInResource* resources, TInfoSink& infoSink, TSymbolTable* symbolTables, EShLanguage language)
-{
-    TBuiltIns builtIns;
-    
-    if (resources) {
-        builtIns.initialize(*resources);
-        initializeSymbolTable(builtIns.getBuiltInStrings(), language, infoSink, resources, symbolTables);
-    } else {
-        builtIns.initialize();
-        initializeSymbolTable(builtIns.getBuiltInStrings(), EShLangVertex, infoSink, resources, symbolTables);
-        initializeSymbolTable(builtIns.getBuiltInStrings(), EShLangFragment, infoSink, resources, symbolTables);
-    }
-
-    return true;
-}
-
-bool initializeSymbolTable(TBuiltInStrings* BuiltInStrings, EShLanguage language, TInfoSink& infoSink, const TBuiltInResource* resources, TSymbolTable* symbolTables)
-{
-    TIntermediate intermediate(infoSink);
-    TSymbolTable* symbolTable;
-    
-    if (resources)
-        symbolTable = symbolTables;
-    else
-        symbolTable = &symbolTables[language];
-
-    TParseContext parseContext(*symbolTable, intermediate, language, infoSink);
-
-    GlobalParseContext = &parseContext;
-    
-    setInitialState();
-
-    assert (symbolTable->isEmpty() || symbolTable->atSharedBuiltInLevel());
-       
-    //
-    // Parse the built-ins.  This should only happen once per
-    // language symbol table.
-    //
-    // Push the symbol table to give it an initial scope.  This
-    // push should not have a corresponding pop, so that built-ins
-    // are preserved, and the test for an empty table fails.
-    //
-
-    symbolTable->push();
-    
-    //Initialize the Preprocessor
-    int ret = InitPreprocessor();
-    if (ret) {
-        infoSink.info.message(EPrefixInternalError,  "Unable to intialize the Preprocessor");
-        return false;
-    }
-    
-    for (TBuiltInStrings::iterator i  = BuiltInStrings[parseContext.language].begin();
-                                    i != BuiltInStrings[parseContext.language].end();
-                                    ++i) {
-        const char* builtInShaders[1];
-        int builtInLengths[1];
-
-        builtInShaders[0] = (*i).c_str();
-        builtInLengths[0] = (int) (*i).size();
-
-        if (PaParseStrings(const_cast<char**>(builtInShaders), builtInLengths, 1, parseContext) != 0) {
-            infoSink.info.message(EPrefixInternalError, "Unable to parse built-ins");
-            return false;
-        }
-    }
-
-    if (resources) {
-        IdentifyBuiltIns(parseContext.language, *symbolTable, *resources);
-    } else {                                       
-        IdentifyBuiltIns(parseContext.language, *symbolTable);
-    }
-
-    FinalizePreprocessor();
-
-    return true;
-}
-
-
-//
-// Do an actual compile on the given strings.  The result is left 
-// in the given compile object.
-//
-// Return:  The return value of ShCompile is really boolean, indicating
-// success or failure.
-//
-int ShCompile(
-    const ShHandle handle,
-    const char* const shaderStrings[],
-    const int numStrings,
-    const EShOptimizationLevel optLevel,
-    const TBuiltInResource* resources,
-    int debugOptions
-    )
-{
-    if (!InitThread())
-        return 0;
-
-    if (handle == 0)
-        return 0;
-
-    TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
-    TCompiler* compiler = base->getAsCompiler();
-    if (compiler == 0)
-        return 0;
-    
-    GlobalPoolAllocator.push();
-    compiler->infoSink.info.erase();
-    compiler->infoSink.debug.erase();
-
-    if (numStrings == 0)
-        return 1;
-
-    TIntermediate intermediate(compiler->infoSink);
-    TSymbolTable symbolTable(SymbolTables[compiler->getLanguage()]);
-    
-    generateBuiltInSymbolTable(resources, compiler->infoSink, &symbolTable, compiler->getLanguage());
-
-    TParseContext parseContext(symbolTable, intermediate, compiler->getLanguage(), compiler->infoSink);
-    parseContext.initializeExtensionBehavior();
-
-    GlobalParseContext = &parseContext;
-    
-    setInitialState();
-
-    InitPreprocessor();    
-    //
-    // Parse the application's shaders.  All the following symbol table
-    // work will be throw-away, so push a new allocation scope that can
-    // be thrown away, then push a scope for the current shader's globals.
-    //
-    bool success = true;
-    
-    symbolTable.push();
-    if (!symbolTable.atGlobalLevel())
-        parseContext.infoSink.info.message(EPrefixInternalError, "Wrong symbol table level");
-
-    if (parseContext.insertBuiltInArrayAtGlobalLevel())
-        success = false;
-
-    int ret = PaParseStrings(const_cast<char**>(shaderStrings), 0, numStrings, parseContext);
-    if (ret)
-        success = false;
-
-    if (success && parseContext.treeRoot) {
-        if (optLevel == EShOptNoGeneration)
-            parseContext.infoSink.info.message(EPrefixNone, "No errors.  No code generation or linking was requested.");
-        else {
-            success = intermediate.postProcess(parseContext.treeRoot, parseContext.language);
-
-            if (success) {
-
-                if (debugOptions & EDebugOpIntermediate)
-                    intermediate.outputTree(parseContext.treeRoot);
-
-                //
-                // Call the machine dependent compiler
-                //
-                if (! compiler->compile(parseContext.treeRoot))
-                    success = false;
-            }
-        }
-    } else if (!success) {
-        parseContext.infoSink.info.prefix(EPrefixError);
-        parseContext.infoSink.info << parseContext.numErrors << " compilation errors.  No code generated.\n\n";
-        success = false;
-        if (debugOptions & EDebugOpIntermediate)
-            intermediate.outputTree(parseContext.treeRoot);
-    }
-
-    intermediate.remove(parseContext.treeRoot);
-
-    //
-    // Ensure symbol table is returned to the built-in level,
-    // throwing away all but the built-ins.
-    //
-    while (! symbolTable.atSharedBuiltInLevel())
-        symbolTable.pop();
-
-    FinalizePreprocessor();
-    //
-    // Throw away all the temporary memory used by the compilation process.
-    //
-    GlobalPoolAllocator.pop();
-
-    return success ? 1 : 0;
-}
-
-//
-// Do an actual link on the given compile objects.
-//
-// Return:  The return value of is really boolean, indicating
-// success or failure.
-//
-int ShLink(
-    const ShHandle linkHandle,
-    const ShHandle compHandles[],
-    const int numHandles,
-    ShHandle uniformMapHandle,
-    short int** uniformsAccessed,
-    int* numUniformsAccessed)
-
-{
-    if (!InitThread())
-        return 0;
-
-    TShHandleBase* base = reinterpret_cast<TShHandleBase*>(linkHandle);
-    TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
-    if (linker == 0)
-        return 0;
-
-    int returnValue;
-    GlobalPoolAllocator.push();
-    returnValue = ShLinkExt(linkHandle, compHandles, numHandles);
-    GlobalPoolAllocator.pop();
-
-    if (returnValue)
-        return 1;
-
-    return 0;
-}
-//
-// This link method will be eventually used once the ICD supports the new linker interface
-//
-int ShLinkExt(
-    const ShHandle linkHandle,
-    const ShHandle compHandles[],
-    const int numHandles)
-{
-    if (linkHandle == 0 || numHandles == 0)
-        return 0;
-
-    THandleList cObjects;
-
-    {// support MSVC++6.0
-        for (int i = 0; i < numHandles; ++i) {
-            if (compHandles[i] == 0)
-                return 0;
-            TShHandleBase* base = reinterpret_cast<TShHandleBase*>(compHandles[i]);
-            if (base->getAsLinker()) {
-                cObjects.push_back(base->getAsLinker());
-            }
-            if (base->getAsCompiler())
-                cObjects.push_back(base->getAsCompiler());
-    
-    
-            if (cObjects[i] == 0)
-                return 0;
-        }
-    }
-
-    TShHandleBase* base = reinterpret_cast<TShHandleBase*>(linkHandle);
-    TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
-
-    if (linker == 0)
-        return 0;
-
-    linker->infoSink.info.erase();
-
-    {// support MSVC++6.0
-        for (int i = 0; i < numHandles; ++i) {
-            if (cObjects[i]->getAsCompiler()) {
-                if (! cObjects[i]->getAsCompiler()->linkable()) {
-                    linker->infoSink.info.message(EPrefixError, "Not all shaders have valid object code.");                
-                    return 0;
-                }
-            }
-        }
-    }
-
-    bool ret = linker->link(cObjects);
-
-    return ret ? 1 : 0;
-}
-
-//
-// ShSetEncrpytionMethod is a place-holder for specifying
-// how source code is encrypted.
-//
-void ShSetEncryptionMethod(ShHandle handle)
-{
-    if (handle == 0)
-        return;
-}
-
-//
-// Return any compiler/linker/uniformmap log of messages for the application.
-//
-const char* ShGetInfoLog(const ShHandle handle)
-{
-    if (!InitThread())
-        return 0;
-
-    if (handle == 0)
-        return 0;
-
-    TShHandleBase* base = static_cast<TShHandleBase*>(handle);
-    TInfoSink* infoSink;
-
-    if (base->getAsCompiler())
-        infoSink = &(base->getAsCompiler()->getInfoSink());
-    else if (base->getAsLinker())
-        infoSink = &(base->getAsLinker()->getInfoSink());
-
-    infoSink->info << infoSink->debug.c_str();
-    return infoSink->info.c_str();
-}
-
-//
-// Return the resulting binary code from the link process.  Structure
-// is machine dependent.
-//
-const void* ShGetExecutable(const ShHandle handle)
-{
-    if (!InitThread())
-        return 0;
-
-    if (handle == 0)
-        return 0;
-
-    TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
-    
-    TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
-    if (linker == 0)
-        return 0;
-
-    return linker->getObjectCode();
-}
-
-//
-// Let the linker know where the application said it's attributes are bound.
-// The linker does not use these values, they are remapped by the ICD or
-// hardware.  It just needs them to know what's aliased.
-//
-// Return:  The return value of is really boolean, indicating
-// success or failure.
-//
-// This is to preserve the old linker API, P20 code can use the generic 
-// ShConstructBinding() and ShAddBinding() APIs
-//
-int ShSetVirtualAttributeBindings(const ShHandle handle, const ShBindingTable* table)
-{    
-    if (!InitThread())
-        return 0;
-
-    if (handle == 0)
-        return 0;
-
-    TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
-    TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
-
-    if (linker == 0)
-        return 0;
-   
-    linker->setAppAttributeBindings(table);
-
-    return 1;
-}
-
-//
-// Let the linker know where the predefined attributes have to live.
-// This is to preserve the old linker API, P20 code can use the generic 
-// ShConstructBinding() and ShAddBinding() APIs
-//
-int ShSetFixedAttributeBindings(const ShHandle handle, const ShBindingTable* table)
-{
-    if (!InitThread())
-        return 0;
-
-    if (handle == 0)
-        return 0;
-
-    TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
-    TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
-
-    if (linker == 0)
-        return 0;
-
-    linker->setFixedAttributeBindings(table);
-    return 1;
-}
-
-//
-// Some attribute locations are off-limits to the linker...
-//
-int ShExcludeAttributes(const ShHandle handle, int *attributes, int count)
-{
-    if (!InitThread())
-        return 0;
-
-    if (handle == 0)
-        return 0;
-
-    TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
-    TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
-    if (linker == 0)
-        return 0;
-
-    linker->setExcludedAttributes(attributes, count);
-
-    return 1;
-}
-
-//
-// Return the index for OpenGL to use for knowing where a uniform lives.
-//
-// Return:  The return value of is really boolean, indicating
-// success or failure.
-//
-// We dont have to change this code for now since the TUniformMap being
-// passed back to ICD by the linker is the same as being used for the old P10 linker
-//
-int ShGetUniformLocation(const ShHandle handle, const char* name)
-{
-    if (!InitThread())
-        return 0;
-
-    if (handle == 0)
-        return -1;
-
-    TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
-    TUniformMap* uniformMap= base->getAsUniformMap();
-    if (uniformMap == 0)
-        return -1;
-
-    return uniformMap->getLocation(name);
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.cpp
deleted file mode 100755
index 0e052c2ea..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-//
-// Symbol table for parsing.  Most functionaliy and main ideas 
-// are documented in the header file.
-//
-
-#include "SymbolTable.h"
-
-//
-// TType helper function needs a place to live.
-//
-
-//
-// Recursively generate mangled names.
-//
-void TType::buildMangledName(TString& mangledName)
-{
-    if (isMatrix())
-        mangledName += 'm';
-    else if (isVector())
-        mangledName += 'v';
-
-    switch (type) {
-    case EbtFloat:              mangledName += 'f';      break;
-    case EbtInt:                mangledName += 'i';      break;
-    case EbtBool:               mangledName += 'b';      break;
-    case EbtSampler1D:          mangledName += "s1";     break;
-    case EbtSampler2D:          mangledName += "s2";     break;
-    case EbtSampler3D:          mangledName += "s3";     break;
-    case EbtSamplerCube:        mangledName += "sC";     break;
-    case EbtSampler1DShadow:    mangledName += "sS1";    break;
-    case EbtSampler2DShadow:    mangledName += "sS2";    break;
-    case EbtStruct:        
-        mangledName += "struct-";
-        if (typeName)
-            mangledName += *typeName;
-        {// support MSVC++6.0
-            for (unsigned int i = 0; i < structure->size(); ++i) {
-                mangledName += '-';
-                (*structure)[i].type->buildMangledName(mangledName);
-            }
-        }
-    default: 
-        break;
-    }
-
-    mangledName += static_cast<char>('0' + getNominalSize());
-    if (isArray()) {
-        char buf[10];
-        sprintf(buf, "%d", arraySize);
-        mangledName += '[';
-        mangledName += buf;
-        mangledName += ']';
-    }
-}
-
-//
-// Dump functions.
-//
-
-void TVariable::dump(TInfoSink& infoSink) const 
-{
-    infoSink.debug << getName().c_str() << ": " << type.getQualifierString() << " " << type.getBasicString();
-    if (type.isArray()) {
-        infoSink.debug << "[0]";
-    }
-    infoSink.debug << "\n";
-}
-
-void TFunction::dump(TInfoSink &infoSink) const
-{
-    infoSink.debug << getName().c_str() << ": " <<  returnType.getBasicString() << " " << getMangledName().c_str() << "\n";
-}
-
-void TSymbolTableLevel::dump(TInfoSink &infoSink) const 
-{
-    tLevel::const_iterator it;
-    for (it = level.begin(); it != level.end(); ++it)
-        (*it).second->dump(infoSink);
-}
-
-void TSymbolTable::dump(TInfoSink &infoSink) const
-{
-    for (int level = currentLevel(); level >= 0; --level) {
-        infoSink.debug << "LEVEL " << level << "\n";
-        table[level]->dump(infoSink);
-    }
-}
-
-//
-// Functions have buried pointers to delete.
-//
-TFunction::~TFunction()
-{
-    for (TParamList::iterator i = parameters.begin(); i != parameters.end(); ++i)
-        delete (*i).type;
-}
-
-//
-// Symbol table levels are a map of pointers to symbols that have to be deleted.
-//
-TSymbolTableLevel::~TSymbolTableLevel()
-{
-    for (tLevel::iterator it = level.begin(); it != level.end(); ++it)
-        delete (*it).second;
-}
-
-//
-// Change all function entries in the table with the non-mangled name
-// to be related to the provided built-in operation.  This is a low
-// performance operation, and only intended for symbol tables that
-// live across a large number of compiles.
-//
-void TSymbolTableLevel::relateToOperator(const char* name, TOperator op) 
-{
-    tLevel::iterator it;
-    for (it = level.begin(); it != level.end(); ++it) {
-        if ((*it).second->isFunction()) {
-            TFunction* function = static_cast<TFunction*>((*it).second);
-            if (function->getName() == name)
-                function->relateToOperator(op);
-        }
-    }
-}    
-
-
-TSymbol::TSymbol(const TSymbol& copyOf)
-{
-    name = NewPoolTString(copyOf.name->c_str());
-    uniqueId = copyOf.uniqueId;
-}
-
-TVariable::TVariable(const TVariable& copyOf, TStructureMap& remapper) : TSymbol(copyOf)
-{    
-    type.copyType(copyOf.type, remapper);
-    userType = copyOf.userType;
-    // for builtIn symbol table level, unionArray and arrayInformation pointers should be NULL
-    assert(copyOf.arrayInformationType == 0); 
-    arrayInformationType = 0;
-
-    if (copyOf.unionArray) {        
-        assert(!copyOf.type.getStruct()); 
-        assert(copyOf.type.getInstanceSize() == 1);
-        unionArray = new constUnion[1];
-        switch (type.getBasicType()) {
-        case EbtFloat: unionArray[0].fConst = copyOf.unionArray[0].fConst; break;
-        case EbtInt:   unionArray[0].iConst = copyOf.unionArray[0].iConst; break;
-        case EbtBool:  unionArray[0].bConst = copyOf.unionArray[0].bConst; break;
-        default:
-            assert (false && "Unknown type");
-        }
-    } else
-        unionArray = 0;
-}
-
-TVariable* TVariable::clone(TStructureMap& remapper) 
-{
-    TVariable *variable = new TVariable(*this, remapper);
-
-    return variable;
-}
-
-TFunction::TFunction(const TFunction& copyOf, TStructureMap& remapper) : TSymbol(copyOf)
-{    
-    for (unsigned int i = 0; i < copyOf.parameters.size(); ++i) {
-        TParameter param;
-        parameters.push_back(param);
-        parameters.back().copyParam(copyOf.parameters[i], remapper);
-    }
-
-    returnType.copyType(copyOf.returnType, remapper);
-    mangledName = copyOf.mangledName;
-    op = copyOf.op;
-    defined = copyOf.defined;
-}
-
-TFunction* TFunction::clone(TStructureMap& remapper) 
-{
-    TFunction *function = new TFunction(*this, remapper);
-
-    return function;
-}
-
-TSymbolTableLevel* TSymbolTableLevel::clone(TStructureMap& remapper)
-{
-    TSymbolTableLevel *symTableLevel = new TSymbolTableLevel();
-    tLevel::iterator iter;
-    for (iter = level.begin(); iter != level.end(); ++iter) {
-        symTableLevel->insert(*iter->second->clone(remapper));
-    }
-
-    return symTableLevel;
-}
-
-void TSymbolTable::copyTable(const TSymbolTable& copyOf)
-{
-    TStructureMap remapper;
-    uniqueId = copyOf.uniqueId;
-    for (unsigned int i = 0; i < copyOf.table.size(); ++i) {
-        table.push_back(copyOf.table[i]->clone(remapper));
-    }
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.h
deleted file mode 100755
index 7e4ff6824..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.h
+++ /dev/null
@@ -1,320 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _SYMBOL_TABLE_INCLUDED_
-#define _SYMBOL_TABLE_INCLUDED_
-
-//
-// Symbol table for parsing.  Has these design characteristics:
-//
-// * Same symbol table can be used to compile many shaders, to preserve
-//   effort of creating and loading with the large numbers of built-in
-//   symbols.
-//
-// * Name mangling will be used to give each function a unique name
-//   so that symbol table lookups are never ambiguous.  This allows
-//   a simpler symbol table structure.
-//
-// * Pushing and popping of scope, so symbol table will really be a stack 
-//   of symbol tables.  Searched from the top, with new inserts going into
-//   the top.
-//
-// * Constants:  Compile time constant symbols will keep their values
-//   in the symbol table.  The parser can substitute constants at parse
-//   time, including doing constant folding and constant propagation.
-//
-// * No temporaries:  Temporaries made from operations (+, --, .xy, etc.)
-//   are tracked in the intermediate representation, not the symbol table.
-//
-
-#include "Include/Common.h"
-#include "Include/intermediate.h"
-#include "Include/InfoSink.h"
- 
-//
-// Symbol base class.  (Can build functions or variables out of these...)
-//
-class TSymbol {    
-public:
-    POOL_ALLOCATOR_NEW_DELETE(GlobalPoolAllocator)
-    TSymbol(const TString *n) :  name(n) { }
-    virtual ~TSymbol() { /* don't delete name, it's from the pool */ }
-    const TString& getName() const { return *name; }
-    virtual const TString& getMangledName() const { return getName(); }
-    virtual bool isFunction() const { return false; }
-    virtual bool isVariable() const { return false; }
-    void setUniqueId(int id) { uniqueId = id; }
-    int getUniqueId() const { return uniqueId; }
-    virtual void dump(TInfoSink &infoSink) const = 0;
-	TSymbol(const TSymbol&);
-	virtual TSymbol* clone(TStructureMap& remapper) = 0;
-
-protected:
-    const TString *name;
-    unsigned int uniqueId;      // For real comparing during code generation
-};
-
-//
-// Variable class, meaning a symbol that's not a function.
-// 
-// There could be a separate class heirarchy for Constant variables;
-// Only one of int, bool, or float, (or none) is correct for
-// any particular use, but it's easy to do this way, and doesn't
-// seem worth having separate classes, and "getConst" can't simply return
-// different values for different types polymorphically, so this is 
-// just simple and pragmatic.
-//
-class TVariable : public TSymbol {
-public:
-    TVariable(const TString *name, const TType& t, bool uT = false ) : TSymbol(name), type(t), userType(uT), unionArray(0), arrayInformationType(0) { }
-    virtual ~TVariable() { }
-    virtual bool isVariable() const { return true; }    
-    TType& getType() { return type; }    
-    const TType& getType() const { return type; }
-    bool isUserType() const { return userType; }
-    void changeQualifier(TQualifier qualifier) { type.changeQualifier(qualifier); }
-    void updateArrayInformationType(TType *t) { arrayInformationType = t; }
-    TType* getArrayInformationType() { return arrayInformationType; }
-
-    virtual void dump(TInfoSink &infoSink) const;
-
-    constUnion* getConstPointer() { 
-        if (!unionArray) {
-            if (!type.getStruct())
-                unionArray = new constUnion[type.getInstanceSize()];
-            else
-                unionArray = new constUnion[type.getStructSize()];
-        }
-        return unionArray;
-    }
-
-    constUnion* getConstPointer() const { return unionArray; }
-
-    void shareConstPointer( constUnion *constArray)
-    {
-        delete unionArray;
-        unionArray = constArray;  
-    }
-	TVariable(const TVariable&, TStructureMap& remapper); // copy constructor
-	virtual TVariable* clone(TStructureMap& remapper);
-      
-protected:
-    TType type;
-    bool userType;
-    // we are assuming that Pool Allocator will free the memory allocated to unionArray
-    // when this object is destroyed
-    constUnion *unionArray;
-    TType *arrayInformationType;  // this is used for updating maxArraySize in all the references to a given symbol
-};
-
-//
-// The function sub-class of symbols and the parser will need to
-// share this definition of a function parameter.
-//
-struct TParameter {
-    TString *name;
-    TType* type;
-	void copyParam(const TParameter& param, TStructureMap& remapper) {
-		name = NewPoolTString(param.name->c_str());
-		type = param.type->clone(remapper);
-	}
-};
-
-//
-// The function sub-class of a symbol.  
-//
-class TFunction : public TSymbol {
-public:
-    TFunction(TOperator o) :
-        TSymbol(0),
-        returnType(TType(EbtVoid)),
-        op(o),
-        defined(false) { }
-    TFunction(const TString *name, TType& retType, TOperator tOp = EOpNull) : 
-        TSymbol(name), 
-        returnType(retType),
-        mangledName(*name + '('),
-        op(tOp),
-        defined(false) { }
-	virtual ~TFunction();
-    virtual bool isFunction() const { return true; }    
-    
-    void addParameter(TParameter& p) 
-    { 
-        parameters.push_back(p);
-        mangledName = mangledName + p.type->getMangledName();
-    }
-    
-    const TString& getMangledName() const { return mangledName; }
-    const TType& getReturnType() const { return returnType; }
-    void relateToOperator(TOperator o) { op = o; }
-    TOperator getBuiltInOp() const { return op; }
-    void setDefined() { defined = true; }
-    bool isDefined() { return defined; }
-
-    int getParamCount() const { return static_cast<int>(parameters.size()); }    
-          TParameter& operator [](int i)       { return parameters[i]; }
-    const TParameter& operator [](int i) const { return parameters[i]; }
-    
-    virtual void dump(TInfoSink &infoSink) const;
-	TFunction(const TFunction&, TStructureMap& remapper);
-	virtual TFunction* clone(TStructureMap& remapper);
-    
-protected:
-    typedef TVector<TParameter> TParamList;
-	TParamList parameters;
-    TType returnType;
-    TString mangledName;
-    TOperator op;
-    bool defined;
-};
-
-
-class TSymbolTableLevel {
-public:
-    POOL_ALLOCATOR_NEW_DELETE(GlobalPoolAllocator)
-    TSymbolTableLevel() { }
-	~TSymbolTableLevel();
-    
-    bool insert(TSymbol& symbol) 
-    {
-        //
-        // returning true means symbol was added to the table
-        //
-        tInsertResult result;
-        result = level.insert(tLevelPair(symbol.getMangledName(), &symbol));
-        
-        return result.second;
-    }
-
-    TSymbol* find(const TString& name) const
-    {
-        tLevel::const_iterator it = level.find(name);
-        if (it == level.end())
-            return 0;
-        else
-            return (*it).second;
-    }
-
-    void relateToOperator(const char* name, TOperator op);
-    void dump(TInfoSink &infoSink) const;    
-	TSymbolTableLevel* clone(TStructureMap& remapper);
-    
-protected:
-    typedef std::map<TString, TSymbol*, std::less<TString>, pool_allocator<std::pair<const TString, TSymbol*> > > tLevel;
-    typedef const tLevel::value_type tLevelPair;
-    typedef std::pair<tLevel::iterator, bool> tInsertResult;
-
-    tLevel level;
-};
-
-class TSymbolTable {
-public:
-    TSymbolTable() : uniqueId(0)
-    {
-        //
-        // The symbol table cannot be used until push() is called, but
-        // the lack of an initial call to push() can be used to detect
-        // that the symbol table has not been preloaded with built-ins.
-        //
-    }
-
-    TSymbolTable(TSymbolTable& symTable)
-    {
-        table.push_back(symTable.table[0]);
-        uniqueId = symTable.uniqueId;
-    }
-
-    ~TSymbolTable()
-    {
-        // level 0 is always built In symbols, so we never pop that out
-        while (table.size() > 1)
-            pop();
-    }
-
-    //
-    // When the symbol table is initialized with the built-ins, there should
-    // 'push' calls, so that built-ins are at level 0 and the shader
-    // globals are at level 1.
-    //
-    bool isEmpty() { return table.size() == 0; }
-    bool atBuiltInLevel() { return atSharedBuiltInLevel() || atDynamicBuiltInLevel(); }
-    bool atSharedBuiltInLevel() { return table.size() == 1; }	
-    bool atGlobalLevel() { return table.size() <= 3; }
-    void push() { 
-        table.push_back(new TSymbolTableLevel);
-    }
-
-    void pop() { 
-        delete table[currentLevel()]; 
-        table.pop_back(); 
-    }
-
-    bool insert(TSymbol& symbol)
-    {
-        symbol.setUniqueId(++uniqueId);
-        return table[currentLevel()]->insert(symbol);
-    }
-    
-    TSymbol* find(const TString& name, bool* builtIn = 0, bool *sameScope = 0) 
-    {
-        int level = currentLevel();
-        TSymbol* symbol;
-        do {
-            symbol = table[level]->find(name);
-            --level;
-        } while (symbol == 0 && level >= 0);
-        level++;
-        if (builtIn)
-            *builtIn = level == 0;
-        if (sameScope)
-            *sameScope = level == currentLevel();
-        return symbol;
-    }
-
-    TSymbolTableLevel* getGlobalLevel() { assert (table.size() >= 3); return table[2]; }
-    void relateToOperator(const char* name, TOperator op) { table[0]->relateToOperator(name, op); }
-    int getMaxSymbolId() { return uniqueId; }
-    void dump(TInfoSink &infoSink) const;    
-	void copyTable(const TSymbolTable& copyOf);
-
-protected:    
-    int currentLevel() const { return static_cast<int>(table.size()) - 1; }
-    bool atDynamicBuiltInLevel() { return table.size() == 2; }
-
-    std::vector<TSymbolTableLevel*> table;
-    int uniqueId;     // for unique identification in code generation
-};
-
-#endif // _SYMBOL_TABLE_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang.l b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang.l
deleted file mode 100644
index f6cd3ca66..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang.l
+++ /dev/null
@@ -1,614 +0,0 @@
-/*
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-*/
-/* Based on
-ANSI C grammar, Lex specification
-
-In 1985, Jeff Lee published this Lex specification together with a Yacc 
-grammar for the April 30, 1985 ANSI C draft.  Tom Stockfisch reposted 
-both to net.sources in 1987; that original, as mentioned in the answer 
-to question 17.25 of the comp.lang.c FAQ, can be ftp'ed from ftp.uu.net, 
-file usenet/net.sources/ansi.c.grammar.Z. 
-
-I intend to keep this version as close to the current C Standard grammar 
-as possible; please let me know if you discover discrepancies. 
-
-Jutta Degener, 1995 
-*/
-
-D           [0-9]
-L           [a-zA-Z_]
-H           [a-fA-F0-9]
-E           [Ee][+-]?{D}+
-O           [0-7]
-
-%option nounput 
-%{
-#include <stdio.h>
-#include <stdlib.h>
-#include "ParseHelper.h"
-#include "glslang_tab.h"
-
-/* windows only pragma */
-#ifdef _MSC_VER
-#pragma warning(disable : 4102)
-#endif
-
-int yy_input(char* buf, int max_size);
-TSourceLoc yylineno;
-
-#ifdef _WIN32
-    extern int yyparse(TParseContext&);
-    #define YY_DECL int yylex(YYSTYPE* pyylval, TParseContext& parseContext)    
-#else
-    extern int yyparse(void*);
-    #define YY_DECL int yylex(YYSTYPE* pyylval, void* parseContextLocal)
-    #define parseContext (*((TParseContext*)(parseContextLocal)))
-#endif
- 
-#define YY_INPUT(buf,result,max_size) (result = yy_input(buf, max_size))
-
-%}
-
-%option noyywrap
-%option never-interactive
-%option outfile="Gen_glslang.cpp"
-%x FIELDS
-
-
-%%
-<*>"//"[^\n]*"\n"     { /* ?? carriage and/or line-feed? */ };
-
-"attribute"    {  pyylval->lex.line = yylineno; return(ATTRIBUTE); }
-"const"        {  pyylval->lex.line = yylineno; return(CONST_QUAL); }
-"uniform"      {  pyylval->lex.line = yylineno; return(UNIFORM); }
-"varying"      {  pyylval->lex.line = yylineno; return(VARYING); }
-
-"break"        {  pyylval->lex.line = yylineno; return(BREAK); }
-"continue"     {  pyylval->lex.line = yylineno; return(CONTINUE); }
-"do"           {  pyylval->lex.line = yylineno; return(DO); }
-"for"          {  pyylval->lex.line = yylineno; return(FOR); }
-"while"        {  pyylval->lex.line = yylineno; return(WHILE); }
-
-"if"           {  pyylval->lex.line = yylineno; return(IF); }
-"else"         {  pyylval->lex.line = yylineno; return(ELSE); }
-
-"in"           {  pyylval->lex.line = yylineno; return(IN_QUAL); }
-"out"          {  pyylval->lex.line = yylineno; return(OUT_QUAL); }
-"inout"        {  pyylval->lex.line = yylineno; return(INOUT_QUAL); }
-
-"float"        {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(FLOAT_TYPE); }
-"int"          {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(INT_TYPE); }
-"void"         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(VOID_TYPE); }
-"bool"         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(BOOL_TYPE); }
-"true"         {  pyylval->lex.line = yylineno; pyylval->lex.b = true;  return(BOOLCONSTANT); }
-"false"        {  pyylval->lex.line = yylineno; pyylval->lex.b = false; return(BOOLCONSTANT); }
-
-"discard"      {  pyylval->lex.line = yylineno; return(DISCARD); }
-"return"       {  pyylval->lex.line = yylineno; return(RETURN); }
-
-"mat2"         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(MATRIX2); }
-"mat3"         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(MATRIX3); }
-"mat4"         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return(MATRIX4); }
-
-"vec2"         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (VEC2); }
-"vec3"         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (VEC3); }
-"vec4"         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (VEC4); }
-"ivec2"        {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (IVEC2); }
-"ivec3"        {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (IVEC3); }
-"ivec4"        {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (IVEC4); }
-"bvec2"        {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (BVEC2); }
-"bvec3"        {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (BVEC3); }
-"bvec4"        {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return (BVEC4); }
-
-"sampler1D"       {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER1D; }
-"sampler2D"       {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER2D; }
-"sampler3D"       {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER3D; }
-"samplerCube"     {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLERCUBE; }
-"sampler1DShadow" {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER1DSHADOW; }
-"sampler2DShadow" {  pyylval->lex.line = yylineno; parseContext.lexAfterType = true; return SAMPLER2DSHADOW; }
-
-"struct"       {  pyylval->lex.line = yylineno; return(STRUCT); }
-
-"asm"          {  PaReservedWord(); return 0; }
-
-"class"        {  PaReservedWord(); return 0; }
-"union"        {  PaReservedWord(); return 0; }
-"enum"         {  PaReservedWord(); return 0; }
-"typedef"      {  PaReservedWord(); return 0; }
-"template"     {  PaReservedWord(); return 0; }
-"this"         {  PaReservedWord(); return 0; }
-"packed"       {  PaReservedWord(); return 0; }
-
-"goto"         {  PaReservedWord(); return 0; }
-"switch"       {  PaReservedWord(); return 0; }
-"default"      {  PaReservedWord(); return 0; }
-
-"inline"       {  PaReservedWord(); return 0; }
-"noinline"     {  PaReservedWord(); return 0; }
-"volatile"     {  PaReservedWord(); return 0; }
-"public"       {  PaReservedWord(); return 0; }
-"static"       {  PaReservedWord(); return 0; }
-"extern"       {  PaReservedWord(); return 0; }
-"external"     {  PaReservedWord(); return 0; }
-"interface"    {  PaReservedWord(); return 0; }
-
-"long"         {  PaReservedWord(); return 0; }
-"short"        {  PaReservedWord(); return 0; }
-"double"       {  PaReservedWord(); return 0; }
-"half"         {  PaReservedWord(); return 0; }
-"fixed"        {  PaReservedWord(); return 0; }
-"unsigned"     {  PaReservedWord(); return 0; }
-
-"input"        {  PaReservedWord(); return 0; }
-"output"       {  PaReservedWord(); return 0; }
-
-"hvec2"        {  PaReservedWord(); return 0; }
-"hvec3"        {  PaReservedWord(); return 0; }
-"hvec4"        {  PaReservedWord(); return 0; }
-"fvec2"        {  PaReservedWord(); return 0; }
-"fvec3"        {  PaReservedWord(); return 0; }
-"fvec4"        {  PaReservedWord(); return 0; }
-"dvec2"        {  PaReservedWord(); return 0; }
-"dvec3"        {  PaReservedWord(); return 0; }
-"dvec4"        {  PaReservedWord(); return 0; }
-
-"sampler2DRect"        {  PaReservedWord(); return 0; }
-"sampler3DRect"        {  PaReservedWord(); return 0; }
-"sampler2DRectShadow"  {  PaReservedWord(); return 0; }
-
-"sizeof"       {  PaReservedWord(); return 0; }
-"cast"         {  PaReservedWord(); return 0; }
-
-"namespace"    {  PaReservedWord(); return 0; }
-"using"        {  PaReservedWord(); return 0; }
-
-{L}({L}|{D})*       {  
-   pyylval->lex.line = yylineno; 
-   pyylval->lex.string = NewPoolTString(yytext); 
-   return PaIdentOrType(*pyylval->lex.string, parseContext, pyylval->lex.symbol); 
-}
-
-0[xX]{H}+         { pyylval->lex.line = yylineno; pyylval->lex.i = strtol(yytext, 0, 0); return(INTCONSTANT); }
-0{O}+             { pyylval->lex.line = yylineno; pyylval->lex.i = strtol(yytext, 0, 0); return(INTCONSTANT); }
-0{D}+             { pyylval->lex.line = yylineno; parseContext.error(yylineno, "Invalid Octal number.", yytext, "", ""); parseContext.recover(); return 0;}
-{D}+              { pyylval->lex.line = yylineno; pyylval->lex.i = strtol(yytext, 0, 0); return(INTCONSTANT); }
-
-{D}+{E}           { pyylval->lex.line = yylineno; pyylval->lex.f = static_cast<float>(atof(yytext)); return(FLOATCONSTANT); }
-{D}+"."{D}*({E})? { pyylval->lex.line = yylineno; pyylval->lex.f = static_cast<float>(atof(yytext)); return(FLOATCONSTANT); }
-"."{D}+({E})?     { pyylval->lex.line = yylineno; pyylval->lex.f = static_cast<float>(atof(yytext)); return(FLOATCONSTANT); }
-
-"/*"            {  int ret = PaParseComment(pyylval->lex.line, parseContext); if (!ret) return ret; }   
-
-"+="            {  pyylval->lex.line = yylineno; return(ADD_ASSIGN); }
-"-="            {  pyylval->lex.line = yylineno; return(SUB_ASSIGN); }
-"*="            {  pyylval->lex.line = yylineno; return(MUL_ASSIGN); }
-"/="            {  pyylval->lex.line = yylineno; return(DIV_ASSIGN); }
-"%="            {  pyylval->lex.line = yylineno; return(MOD_ASSIGN); }
-"<<="           {  pyylval->lex.line = yylineno; return(LEFT_ASSIGN); }
-">>="           {  pyylval->lex.line = yylineno; return(RIGHT_ASSIGN); }
-"&="            {  pyylval->lex.line = yylineno; return(AND_ASSIGN); }
-"^="            {  pyylval->lex.line = yylineno; return(XOR_ASSIGN); }
-"|="            {  pyylval->lex.line = yylineno; return(OR_ASSIGN); }
-
-"++"            {  pyylval->lex.line = yylineno; return(INC_OP); }
-"--"            {  pyylval->lex.line = yylineno; return(DEC_OP); }
-"&&"            {  pyylval->lex.line = yylineno; return(AND_OP); }
-"||"            {  pyylval->lex.line = yylineno; return(OR_OP); }
-"^^"            {  pyylval->lex.line = yylineno; return(XOR_OP); }
-"<="            {  pyylval->lex.line = yylineno; return(LE_OP); }
-">="            {  pyylval->lex.line = yylineno; return(GE_OP); }
-"=="            {  pyylval->lex.line = yylineno; return(EQ_OP); }
-"!="            {  pyylval->lex.line = yylineno; return(NE_OP); }
-"<<"            {  pyylval->lex.line = yylineno; return(LEFT_OP); }
-">>"            {  pyylval->lex.line = yylineno; return(RIGHT_OP); }
-";"         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = false; return(SEMICOLON); }
-("{"|"<%")      {  pyylval->lex.line = yylineno; parseContext.lexAfterType = false; return(LEFT_BRACE); }
-("}"|"%>")      {  pyylval->lex.line = yylineno; return(RIGHT_BRACE); }
-","         {  pyylval->lex.line = yylineno; if (parseContext.inTypeParen) parseContext.lexAfterType = false; return(COMMA); }
-":"         {  pyylval->lex.line = yylineno; return(COLON); }
-"="         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = false; return(EQUAL); }
-"("         {  pyylval->lex.line = yylineno; parseContext.lexAfterType = false; parseContext.inTypeParen = true; return(LEFT_PAREN); }
-")"         {  pyylval->lex.line = yylineno; parseContext.inTypeParen = false; return(RIGHT_PAREN); }
-("["|"<:")      {  pyylval->lex.line = yylineno; return(LEFT_BRACKET); }
-("]"|":>")      {  pyylval->lex.line = yylineno; return(RIGHT_BRACKET); }
-"."         { BEGIN(FIELDS);  return(DOT); }
-"!"         {  pyylval->lex.line = yylineno; return(BANG); }
-"-"         {  pyylval->lex.line = yylineno; return(DASH); }
-"~"         {  pyylval->lex.line = yylineno; return(TILDE); }
-"+"         {  pyylval->lex.line = yylineno; return(PLUS); }
-"*"         {  pyylval->lex.line = yylineno; return(STAR); }
-"/"         {  pyylval->lex.line = yylineno; return(SLASH); }
-"%"         {  pyylval->lex.line = yylineno; return(PERCENT); }
-"<"         {  pyylval->lex.line = yylineno; return(LEFT_ANGLE); }
-">"         {  pyylval->lex.line = yylineno; return(RIGHT_ANGLE); }
-"|"         {  pyylval->lex.line = yylineno; return(VERTICAL_BAR); }
-"^"         {  pyylval->lex.line = yylineno; return(CARET); }
-"&"         {  pyylval->lex.line = yylineno; return(AMPERSAND); }
-"?"         {  pyylval->lex.line = yylineno; return(QUESTION); }
-
-<FIELDS>{L}({L}|{D})* { 
-BEGIN(INITIAL);      
-    pyylval->lex.line = yylineno;     
-    pyylval->lex.string = NewPoolTString(yytext); 
-    return FIELD_SELECTION; }
-<FIELDS>[ \t\v\f\r] {}
-
-[ \t\v\n\f\r]   {  }
-<*><<EOF>> { (&parseContext)->AfterEOF = true; yy_delete_buffer(YY_CURRENT_BUFFER); yyterminate();}
-<*>.    { parseContext.infoSink.info << "FLEX: Unknown char " << yytext << "\n";
-          return 0; }
-
-%%
-
-
-//Including Pre-processor.
-extern "C" {
-  #include "./preprocessor/preprocess.h"
-} 
-
-//
-// The YY_INPUT macro just calls this.  Maybe this could be just put into
-// the macro directly.
-//
-
-int yy_input(char* buf, int max_size)
-{
-     char *char_token =NULL;
-     int len;
-
-    if ((len = yylex_CPP(buf, max_size)) == 0)
-        return 0;
-    if (len >= max_size) 
-        YY_FATAL_ERROR( "input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-
- 	buf[len] = ' ';
-	return len+1;
-}
-
-
-//
-// Parse an array of strings using yyparse.  We set up globals used by
-// yywrap.
-//
-// Returns 0 for success, as per yyparse().
-//
-int PaParseStrings(char* argv[], int strLen[], int argc, TParseContext& parseContextLocal)
-{
-    int argv0len;
-    ScanFromString(argv[0]); 
-    
-    //Storing the Current Compiler Parse context into the cpp structure.
-	cpp->pC = (void*)&parseContextLocal;
-	
-	if (!argv || argc == 0 || !argv[0])
-        return 1;
-    
-    if (!strLen) {
-        argv0len = (int) strlen(argv[0]);
-        strLen   = &argv0len;
-    }
-    yyrestart(0);
-    (&parseContextLocal)->AfterEOF = false;
-    cpp->PaWhichStr = 0;
-    cpp->PaArgv     = argv;
-    cpp->PaArgc     = argc;
-    cpp->PaStrLen   = strLen;
-    yylineno   = 1;
-   
-    if (*cpp->PaStrLen >= 0) {    
-        int ret;
-        #ifdef _WIN32
-            ret = yyparse(parseContextLocal);
-        #else
-            ret = yyparse((void*)(&parseContextLocal));
-        #endif
-        if (cpp->CompileError == 1 || parseContextLocal.recoveredFromError || parseContextLocal.numErrors > 0)
-             return 1;
-        else
-             return 0;
-    }
-    else
-        return 0;
-}
-
-void yyerror(char *s) 
-{
-    if (((TParseContext *)cpp->pC)->AfterEOF) {
-        if (cpp->tokensBeforeEOF == 1) {
-            GlobalParseContext->error(yylineno, "syntax error", "pre-mature EOF", s, "");
-            GlobalParseContext->recover();
-        }
-    } else {
-        GlobalParseContext->error(yylineno, "syntax error", yytext, s, "");
-        GlobalParseContext->recover();
-    }            
-}
-
-void PaReservedWord()
-{
-    GlobalParseContext->error(yylineno, "Reserved word.", yytext, "", "");
-    GlobalParseContext->recover();
-}
-
-int PaIdentOrType(TString& id, TParseContext& parseContextLocal, TSymbol*& symbol)
-{
-    symbol = parseContextLocal.symbolTable.find(id);
-    if (parseContextLocal.lexAfterType == false && symbol && symbol->isVariable()) {
-        TVariable* variable = static_cast<TVariable*>(symbol);
-        if (variable->isUserType()) {
-            parseContextLocal.lexAfterType = true;
-            return TYPE_NAME;
-        }
-    }
-    
-    return IDENTIFIER;
-}
-
-int PaParseComment(int &lineno, TParseContext& parseContextLocal)
-{
-    int transitionFlag = 0;
-    int nextChar;
-    
-    while (transitionFlag != 2) {
-        nextChar = yyinput();
-        if (nextChar == '\n')
-             lineno++;
-        switch (nextChar) {
-        case '*' :
-            transitionFlag = 1;
-            break;
-        case '/' :  /* if star is the previous character, then it is the end of comment */
-            if (transitionFlag == 1) {
-                return 1 ;
-            }
-            break;
-        case EOF :
-            /* Raise error message here */
-            parseContextLocal.error(yylineno, "End of shader found before end of comment.", "", "", "");
-            GlobalParseContext->recover();
-            return YY_NULL; 
-        default :  /* Any other character will be a part of the comment */
-            transitionFlag = 0;
-        }
-    }
-    return 1;
-}
-
-extern "C" {
-
-void CPPDebugLogMsg(const char *msg)
-{
-    ((TParseContext *)cpp->pC)->infoSink.debug.message(EPrefixNone, msg);
-}
-
-void CPPWarningToInfoLog(const char *msg)
-{
-    ((TParseContext *)cpp->pC)->infoSink.info.message(EPrefixWarning, msg, yylineno); 
-}
-
-void CPPShInfoLogMsg(const char *msg)
-{
-    ((TParseContext *)cpp->pC)->error(yylineno,"", "",msg,"");
-    GlobalParseContext->recover();
-}
-
-void CPPErrorToInfoLog(char *msg)
-{
-    ((TParseContext *)cpp->pC)->error(yylineno,"syntax error", "",msg,"");
-    GlobalParseContext->recover();
-}
-
-void SetLineNumber(int line)
-{
-    yylineno &= ~SourceLocLineMask;
-    yylineno |= line;
-}
-
-void SetStringNumber(int string)
-{
-    yylineno = (string << SourceLocStringShift) | (yylineno & SourceLocLineMask);
-}
-
-int GetStringNumber(void)
-{
-    return yylineno >> 16;
-}
-
-int GetLineNumber(void)
-{
-    return yylineno & SourceLocLineMask;
-}
-
-void IncLineNumber(void)
-{
-    if ((yylineno & SourceLocLineMask) <= SourceLocLineMask)
-        ++yylineno;
-}
-
-void DecLineNumber(void)
-{
-    if ((yylineno & SourceLocLineMask) > 0)
-        --yylineno;
-}
-
-void HandlePragma(const char **tokens, int numTokens)
-{
-    if (!strcmp(tokens[0], "optimize")) {
-        if (numTokens != 4) {
-            CPPShInfoLogMsg("optimize pragma syntax is incorrect");
-            return;
-        }
-        
-        if (strcmp(tokens[1], "(")) {
-            CPPShInfoLogMsg("\"(\" expected after 'optimize' keyword");
-            return;
-        }
-            
-        if (!strcmp(tokens[2], "on"))
-            ((TParseContext *)cpp->pC)->contextPragma.optimize = true;
-        else if (!strcmp(tokens[2], "off"))
-            ((TParseContext *)cpp->pC)->contextPragma.optimize = false;
-        else {
-            CPPShInfoLogMsg("\"on\" or \"off\" expected after '(' for 'optimize' pragma");
-            return;
-        }
-        
-        if (strcmp(tokens[3], ")")) {
-            CPPShInfoLogMsg("\")\" expected to end 'optimize' pragma");
-            return;
-        }
-    } else if (!strcmp(tokens[0], "debug")) {
-        if (numTokens != 4) {
-            CPPShInfoLogMsg("debug pragma syntax is incorrect");
-            return;
-        }
-        
-        if (strcmp(tokens[1], "(")) {
-            CPPShInfoLogMsg("\"(\" expected after 'debug' keyword");
-            return;
-        }
-            
-        if (!strcmp(tokens[2], "on"))
-            ((TParseContext *)cpp->pC)->contextPragma.debug = true;
-        else if (!strcmp(tokens[2], "off"))
-            ((TParseContext *)cpp->pC)->contextPragma.debug = false;
-        else {
-            CPPShInfoLogMsg("\"on\" or \"off\" expected after '(' for 'debug' pragma");
-            return;
-        }
-        
-        if (strcmp(tokens[3], ")")) {
-            CPPShInfoLogMsg("\")\" expected to end 'debug' pragma");
-            return;
-        }
-    } else {
-        /*
-        // implementation specific pragma
-        // use ((TParseContext *)cpp->pC)->contextPragma.pragmaTable to store the information about pragma
-        // For now, just ignore the pragma that the implementation cannot recognize
-        // An Example of one such implementation for a pragma that has a syntax like
-        // #pragma pragmaname(pragmavalue)
-        // This implementation stores the current pragmavalue against the pragma name in pragmaTable.
-        if (numTokens == 4 && !strcmp(tokens[1], "(") && !strcmp(tokens[3], ")")) {              
-            TPragmaTable& pragmaTable = ((TParseContext *)cpp->pC)->contextPragma.pragmaTable;
-            TPragmaTable::iterator iter;
-            iter = pragmaTable.find(TString(tokens[0]));
-            if (iter != pragmaTable.end()) {
-                iter->second = tokens[2];
-            } else {
-                pragmaTable[tokens[0]] = tokens[2];
-            }        
-        }
-        */
-    }
-}
-
-void StoreStr(char *string)
-{
-    TString strSrc;
-    strSrc = TString(string);
-
-    ((TParseContext *)cpp->pC)->HashErrMsg = ((TParseContext *)cpp->pC)->HashErrMsg + " " + strSrc;
-}
-
-const char* GetStrfromTStr(void)
-{
-    cpp->ErrMsg = (((TParseContext *)cpp->pC)->HashErrMsg).c_str();
-    return cpp->ErrMsg;
-}
-
-void ResetTString(void)
-{
-    ((TParseContext *)cpp->pC)->HashErrMsg = "";
-}
-
-TBehavior GetBehavior(const char* behavior)
-{
-    if (!strcmp("require", behavior))
-        return EBhRequire;
-    else if (!strcmp("enable", behavior))
-        return EBhEnable;
-    else if (!strcmp("disable", behavior))
-        return EBhDisable;
-    else if (!strcmp("warn", behavior))
-        return EBhWarn;
-    else {
-        CPPShInfoLogMsg((TString("behavior '") + behavior + "' is not supported").c_str());
-        return EBhDisable;
-    }        
-}
-
-void  updateExtensionBehavior(const char* extName, const char* behavior)
-{
-    TBehavior behaviorVal = GetBehavior(behavior);
-    TMap<TString, TBehavior>:: iterator iter;
-    TString msg;
-    
-    // special cased for all extension
-    if (!strcmp(extName, "all")) {
-        if (behaviorVal == EBhRequire || behaviorVal == EBhEnable) {
-            CPPShInfoLogMsg("extension 'all' cannot have 'require' or 'enable' behavior");  
-            return;
-        } else {
-            for (iter =  ((TParseContext *)cpp->pC)->extensionBehavior.begin(); iter != ((TParseContext *)cpp->pC)->extensionBehavior.end(); ++iter)
-                iter->second = behaviorVal;
-        }        
-    } else {
-        iter = ((TParseContext *)cpp->pC)->extensionBehavior.find(TString(extName));
-        if (iter == ((TParseContext *)cpp->pC)->extensionBehavior.end()) {
-            switch (behaviorVal) {
-            case EBhRequire:
-                CPPShInfoLogMsg((TString("extension '") + extName + "' is not supported").c_str());  
-                break;
-            case EBhEnable:
-            case EBhWarn:
-            case EBhDisable:
-                msg = TString("extension '") + extName + "' is not supported";
-                ((TParseContext *)cpp->pC)->infoSink.info.message(EPrefixWarning, msg.c_str(), yylineno); 
-                break;
-            }
-            return;
-        } else
-            iter->second = behaviorVal;
-    }
-}
-        
-}
-
-void setInitialState()
-{
-    yy_start = 1;
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang.y b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang.y
deleted file mode 100644
index d2dc1db37..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang.y
+++ /dev/null
@@ -1,2009 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-/**
- * This is bison grammar and production code for parsing the OpenGL 2.0 shading
- * languages.
- */
-%{
-
-/* Based on:
-ANSI C Yacc grammar
-
-In 1985, Jeff Lee published his Yacc grammar (which is accompanied by a 
-matching Lex specification) for the April 30, 1985 draft version of the 
-ANSI C standard.  Tom Stockfisch reposted it to net.sources in 1987; that
-original, as mentioned in the answer to question 17.25 of the comp.lang.c
-FAQ, can be ftp'ed from ftp.uu.net, file usenet/net.sources/ansi.c.grammar.Z.
- 
-I intend to keep this version as close to the current C Standard grammar as 
-possible; please let me know if you discover discrepancies. 
-
-Jutta Degener, 1995 
-*/
-
-#include "SymbolTable.h"
-#include "ParseHelper.h"
-#include "../Public/ShaderLang.h"
-
-#ifdef _WIN32
-    #define YYPARSE_PARAM parseContext
-    #define YYPARSE_PARAM_DECL TParseContext&
-    #define YY_DECL int yylex(YYSTYPE* pyylval, TParseContext& parseContext)
-    #define YYLEX_PARAM parseContext
-#else
-    #define YYPARSE_PARAM parseContextLocal
-    #define parseContext (*((TParseContext*)(parseContextLocal)))
-    #define YY_DECL int yylex(YYSTYPE* pyylval, void* parseContextLocal)
-    #define YYLEX_PARAM (void*)(parseContextLocal)
-    extern void yyerror(char*);    
-#endif
-
-#define FRAG_VERT_ONLY(S, L) {                                                  \
-    if (parseContext.language != EShLangFragment &&                             \
-        parseContext.language != EShLangVertex) {                               \
-        parseContext.error(L, " supported in vertex/fragment shaders only ", S, "", "");   \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define VERTEX_ONLY(S, L) {                                                     \
-    if (parseContext.language != EShLangVertex) {                               \
-        parseContext.error(L, " supported in vertex shaders only ", S, "", "");            \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define FRAG_ONLY(S, L) {                                                       \
-    if (parseContext.language != EShLangFragment) {                             \
-        parseContext.error(L, " supported in fragment shaders only ", S, "", "");          \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define PACK_ONLY(S, L) {                                                       \
-    if (parseContext.language != EShLangPack) {                                 \
-        parseContext.error(L, " supported in pack shaders only ", S, "", "");              \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define UNPACK_ONLY(S, L) {                                                     \
-    if (parseContext.language != EShLangUnpack) {                               \
-        parseContext.error(L, " supported in unpack shaders only ", S, "", "");            \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-
-#define PACK_UNPACK_ONLY(S, L) {                                                \
-    if (parseContext.language != EShLangUnpack &&                               \
-        parseContext.language != EShLangPack) {                                 \
-        parseContext.error(L, " supported in pack/unpack shaders only ", S, "", "");       \
-        parseContext.recover();                                                            \
-    }                                                                           \
-}
-%}
-%union {
-    struct {
-        TSourceLoc line;
-        union {
-            TString *string;
-            float f;
-            int i;
-            bool b;
-        };
-        TSymbol* symbol;
-    } lex;
-    struct {
-        TSourceLoc line;
-        TOperator op;
-        union {
-            TIntermNode* intermNode;
-            TIntermNodePair nodePair;
-            TIntermTyped* intermTypedNode;
-            TIntermAggregate* intermAggregate;
-        };
-        union {
-            TPublicType type;
-            TQualifier qualifier;
-            TFunction* function;
-            TParameter param;
-            TTypeLine typeLine;
-            TTypeList* typeList;
-        };
-    } interm;
-}
-
-%{
-#ifndef _WIN32
-    extern int yylex(YYSTYPE*, void*);
-#endif
-%}
-
-%pure_parser /* Just in case is called from multiple threads */
-%expect 1 /* One shift reduce conflict because of if | else */
-%token <lex> ATTRIBUTE CONST_QUAL BOOL_TYPE FLOAT_TYPE INT_TYPE
-%token <lex> BREAK CONTINUE DO ELSE FOR IF DISCARD RETURN
-%token <lex> BVEC2 BVEC3 BVEC4 IVEC2 IVEC3 IVEC4 VEC2 VEC3 VEC4
-%token <lex> MATRIX2 MATRIX3 MATRIX4 IN_QUAL OUT_QUAL INOUT_QUAL UNIFORM VARYING
-%token <lex> STRUCT VOID_TYPE WHILE
-%token <lex> SAMPLER1D SAMPLER2D SAMPLER3D SAMPLERCUBE SAMPLER1DSHADOW SAMPLER2DSHADOW
-
-%token <lex> IDENTIFIER TYPE_NAME FLOATCONSTANT INTCONSTANT BOOLCONSTANT
-%token <lex> FIELD_SELECTION
-%token <lex> LEFT_OP RIGHT_OP
-%token <lex> INC_OP DEC_OP LE_OP GE_OP EQ_OP NE_OP
-%token <lex> AND_OP OR_OP XOR_OP MUL_ASSIGN DIV_ASSIGN ADD_ASSIGN
-%token <lex> MOD_ASSIGN LEFT_ASSIGN RIGHT_ASSIGN AND_ASSIGN XOR_ASSIGN OR_ASSIGN
-%token <lex> SUB_ASSIGN
-
-%token <lex> LEFT_PAREN RIGHT_PAREN LEFT_BRACKET RIGHT_BRACKET LEFT_BRACE RIGHT_BRACE DOT
-%token <lex> COMMA COLON EQUAL SEMICOLON BANG DASH TILDE PLUS STAR SLASH PERCENT
-%token <lex> LEFT_ANGLE RIGHT_ANGLE VERTICAL_BAR CARET AMPERSAND QUESTION
-
-%type <interm> assignment_operator constructor_identifier unary_operator
-%type <interm.intermTypedNode> variable_identifier primary_expression postfix_expression
-%type <interm.intermTypedNode> expression integer_expression assignment_expression
-%type <interm.intermTypedNode> unary_expression multiplicative_expression additive_expression
-%type <interm.intermTypedNode> relational_expression equality_expression 
-%type <interm.intermTypedNode> conditional_expression constant_expression
-%type <interm.intermTypedNode> logical_or_expression logical_xor_expression logical_and_expression
-%type <interm.intermTypedNode> shift_expression and_expression exclusive_or_expression inclusive_or_expression
-%type <interm.intermTypedNode> function_call initializer condition conditionopt
-
-%type <interm.intermNode> translation_unit function_definition
-%type <interm.intermNode> statement simple_statement
-%type <interm.intermAggregate>  statement_list compound_statement 
-%type <interm.intermNode> declaration_statement selection_statement expression_statement
-%type <interm.intermNode> declaration external_declaration
-%type <interm.intermNode> for_init_statement compound_statement_no_new_scope
-%type <interm.nodePair> selection_rest_statement for_rest_statement
-%type <interm.intermNode> iteration_statement jump_statement statement_no_new_scope
-%type <interm> single_declaration init_declarator_list
-
-%type <interm> parameter_declaration parameter_declarator parameter_type_specifier
-%type <interm.qualifier> parameter_qualifier
-
-%type <interm.type> type_qualifier fully_specified_type type_specifier 
-%type <interm.type> struct_specifier 
-%type <interm.typeLine> struct_declarator 
-%type <interm.typeList> struct_declarator_list struct_declaration struct_declaration_list
-%type <interm.function> function_header function_declarator function_identifier
-%type <interm.function> function_header_with_parameters function_call_header 
-%type <interm> function_call_header_with_parameters function_call_header_no_parameters function_call_generic function_prototype
-
-%start translation_unit 
-%%
-
-variable_identifier 
-    : IDENTIFIER {
-        // The symbol table search was done in the lexical phase
-        const TSymbol* symbol = $1.symbol;
-        const TVariable* variable;
-        if (symbol == 0) {
-            parseContext.error($1.line, "undeclared identifier", $1.string->c_str(), "");
-            parseContext.recover();
-            TType type(EbtFloat);
-            TVariable* fakeVariable = new TVariable($1.string, type);
-            parseContext.symbolTable.insert(*fakeVariable);
-            variable = fakeVariable;
-        } else {
-            // This identifier can only be a variable type symbol 
-            if (! symbol->isVariable()) {
-                parseContext.error($1.line, "variable expected", $1.string->c_str(), "");
-                parseContext.recover();
-            }
-            variable = static_cast<const TVariable*>(symbol);
-        }
-
-        // don't delete $1.string, it's used by error recovery, and the pool
-        // pop will reclaim the memory
-
-        if (variable->getType().getQualifier() == EvqConst ) {
-            constUnion* constArray = variable->getConstPointer();
-            TType t(variable->getType());
-            $$ = parseContext.intermediate.addConstantUnion(constArray, t, $1.line);        
-        } else
-            $$ = parseContext.intermediate.addSymbol(variable->getUniqueId(), 
-                                                     variable->getName(), 
-                                                     variable->getType(), $1.line);
-    }
-    ;
-
-primary_expression
-    : variable_identifier {
-        $$ = $1;
-    }
-    | INTCONSTANT {
-        //
-        // INT_TYPE is only 16-bit plus sign bit for vertex/fragment shaders, 
-        // check for overflow for constants
-        //
-        if (abs($1.i) >= (1 << 16)) {
-            parseContext.error($1.line, " integer constant overflow", "", "");
-            parseContext.recover();
-        }
-        constUnion *unionArray = new constUnion[1];
-        unionArray->iConst = $1.i;
-        $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), $1.line);
-    }
-    | FLOATCONSTANT {
-        constUnion *unionArray = new constUnion[1];
-        unionArray->fConst = $1.f;
-        $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtFloat, EvqConst), $1.line);
-    }
-    | BOOLCONSTANT {
-        constUnion *unionArray = new constUnion[1];
-        unionArray->bConst = $1.b;
-        $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $1.line);
-    }
-    | LEFT_PAREN expression RIGHT_PAREN {
-        $$ = $2;
-    }
-    ;
-
-postfix_expression
-    : primary_expression { 
-        $$ = $1;
-    } 
-    | postfix_expression LEFT_BRACKET integer_expression RIGHT_BRACKET {
-        if (!$1->isArray() && !$1->isMatrix() && !$1->isVector()) {
-            if ($1->getAsSymbolNode())
-                parseContext.error($2.line, " left of '[' is not of type array, matrix, or vector ", $1->getAsSymbolNode()->getSymbol().c_str(), "");
-            else
-                parseContext.error($2.line, " left of '[' is not of type array, matrix, or vector ", "expression", "");
-            parseContext.recover();
-        }
-        if ($1->getType().getQualifier() == EvqConst && !$1->isArray() && $3->getQualifier() == EvqConst) {
-             if ($1->isVector()) {  // constant folding for vectors
-                TVectorFields fields;
-                fields.num = 1;
-                fields.offsets[0] = $3->getAsConstantUnion()->getUnionArrayPointer()->iConst; // need to do it this way because v.xy sends fields integer array
-                $$ = parseContext.addConstVectorNode(fields, $1, $2.line);
-            } else if ($1->isMatrix()) { // constant folding for matrices
-                $$ = parseContext.addConstMatrixNode($3->getAsConstantUnion()->getUnionArrayPointer()->iConst, $1, $2.line);
-            }
-        } else {
-            if ($3->getQualifier() == EvqConst) {
-                if (($1->isVector() || $1->isMatrix()) && $1->getType().getNominalSize() <= $3->getAsConstantUnion()->getUnionArrayPointer()->iConst && !$1->isArray() ) {
-                    parseContext.error($2.line, "", "[", "field selection out of range '%d'", $3->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-                    parseContext.recover();
-                } else {
-                    if ($1->isArray()) {
-                        if ($1->getType().getArraySize() == 0) {
-                            if ($1->getType().getMaxArraySize() <= $3->getAsConstantUnion()->getUnionArrayPointer()->iConst) {
-                                if (parseContext.arraySetMaxSize($1->getAsSymbolNode(), $1->getTypePointer(), $3->getAsConstantUnion()->getUnionArrayPointer()->iConst, true, $2.line))
-                                    parseContext.recover(); 
-                            } else {
-                                if (parseContext.arraySetMaxSize($1->getAsSymbolNode(), $1->getTypePointer(), 0, false, $2.line))
-                                    parseContext.recover(); 
-                            }
-                        } else if ( $3->getAsConstantUnion()->getUnionArrayPointer()->iConst >= $1->getType().getArraySize()) {
-                            parseContext.error($2.line, "", "[", "array index out of range '%d'", $3->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-                            parseContext.recover();
-                        }
-                    }
-                    $$ = parseContext.intermediate.addIndex(EOpIndexDirect, $1, $3, $2.line);
-                }
-            } else {
-                if ($1->isArray() && $1->getType().getArraySize() == 0) {
-                    parseContext.error($2.line, "", "[", "array must be redeclared with a size before being indexed with a variable");
-                    parseContext.recover();
-                }
-                
-                $$ = parseContext.intermediate.addIndex(EOpIndexIndirect, $1, $3, $2.line);
-            }
-        } 
-        if ($$ == 0) {
-            constUnion *unionArray = new constUnion[1];
-            unionArray->fConst = 0.0;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtFloat, EvqConst), $2.line);
-        } else if ($1->isArray()) {
-            if ($1->getType().getStruct())
-                $$->setType(TType($1->getType().getStruct(), $1->getType().getTypeName()));
-            else
-                $$->setType(TType($1->getBasicType(), EvqTemporary, $1->getNominalSize(), $1->isMatrix()));
-        } else if ($1->isMatrix() && $1->getType().getQualifier() == EvqConst)         
-            $$->setType(TType($1->getBasicType(), EvqConst, $1->getNominalSize()));     
-        else if ($1->isMatrix())            
-            $$->setType(TType($1->getBasicType(), EvqTemporary, $1->getNominalSize()));     
-        else if ($1->isVector() && $1->getType().getQualifier() == EvqConst)          
-            $$->setType(TType($1->getBasicType(), EvqConst));     
-        else if ($1->isVector())       
-            $$->setType(TType($1->getBasicType(), EvqTemporary));
-        else
-            $$->setType($1->getType()); 
-    }
-    | function_call {
-        $$ = $1;
-    }
-    | postfix_expression DOT FIELD_SELECTION {        
-        if ($1->isArray()) {
-            parseContext.error($3.line, "cannot apply dot operator to an array", ".", "");
-            parseContext.recover();
-        }
-
-        if ($1->isVector()) {
-            TVectorFields fields;
-            if (! parseContext.parseVectorFields(*$3.string, $1->getNominalSize(), fields, $3.line)) {
-                fields.num = 1;
-                fields.offsets[0] = 0;
-                parseContext.recover();
-            }
-
-            if ($1->getType().getQualifier() == EvqConst) { // constant folding for vector fields
-                $$ = parseContext.addConstVectorNode(fields, $1, $3.line);
-                if ($$ == 0) {
-                    parseContext.recover();
-                    $$ = $1;
-                }
-                else
-                    $$->setType(TType($1->getBasicType(), EvqConst, (int) (*$3.string).size()));
-            } else {
-                if (fields.num == 1) {
-                    constUnion *unionArray = new constUnion[1];
-                    unionArray->iConst = fields.offsets[0];
-                    TIntermTyped* index = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), $3.line);
-                    $$ = parseContext.intermediate.addIndex(EOpIndexDirect, $1, index, $2.line);
-                    $$->setType(TType($1->getBasicType()));
-                } else {
-                    TString vectorString = *$3.string;
-                    TIntermTyped* index = parseContext.intermediate.addSwizzle(fields, $3.line);                
-                    $$ = parseContext.intermediate.addIndex(EOpVectorSwizzle, $1, index, $2.line);
-                    $$->setType(TType($1->getBasicType(),EvqTemporary, (int) vectorString.size()));  
-                }
-            }
-        } else if ($1->isMatrix()) {
-            TMatrixFields fields;
-            if (! parseContext.parseMatrixFields(*$3.string, $1->getNominalSize(), fields, $3.line)) {
-                fields.wholeRow = false;
-                fields.wholeCol = false;
-                fields.row = 0;
-                fields.col = 0;
-                parseContext.recover();
-            }
-
-            if (fields.wholeRow || fields.wholeCol) {
-                parseContext.error($2.line, " non-scalar fields not implemented yet", ".", "");
-                parseContext.recover();
-                constUnion *unionArray = new constUnion[1];
-                unionArray->iConst = 0;
-                TIntermTyped* index = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), $3.line);
-                $$ = parseContext.intermediate.addIndex(EOpIndexDirect, $1, index, $2.line);                
-                $$->setType(TType($1->getBasicType(), EvqTemporary, $1->getNominalSize()));
-            } else {
-                constUnion *unionArray = new constUnion[1];
-                unionArray->iConst = fields.col * $1->getNominalSize() + fields.row;
-                TIntermTyped* index = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), $3.line);
-                $$ = parseContext.intermediate.addIndex(EOpIndexDirect, $1, index, $2.line);                
-                $$->setType(TType($1->getBasicType()));
-            }
-        } else if ($1->getBasicType() == EbtStruct) {
-            bool fieldFound = false;
-            TTypeList* fields = $1->getType().getStruct();
-            if (fields == 0) {
-                parseContext.error($2.line, "structure has no fields", "Internal Error", "");
-                parseContext.recover();
-                $$ = $1;
-            } else {
-                unsigned int i;
-                for (i = 0; i < fields->size(); ++i) {
-                    if ((*fields)[i].type->getFieldName() == *$3.string) {
-                        fieldFound = true;
-                        break;
-                    }                
-                }
-                if (fieldFound) {
-                    if ($1->getType().getQualifier() == EvqConst) {
-                        $$ = parseContext.addConstStruct(*$3.string, $1, $2.line);
-                        if ($$ == 0) {
-                            parseContext.recover();
-                            $$ = $1;
-                        }
-                        else {
-                            $$->setType(*(*fields)[i].type);
-                            // change the qualifier of the return type, not of the structure field
-                            // as the structure definition is shared between various structures.
-                            $$->getTypePointer()->changeQualifier(EvqConst);
-                        }
-                    } else {
-                        constUnion *unionArray = new constUnion[1];
-                        unionArray->iConst = i;
-                        TIntermTyped* index = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtInt, EvqConst), $3.line);
-                        $$ = parseContext.intermediate.addIndex(EOpIndexDirectStruct, $1, index, $2.line);                
-                        $$->setType(*(*fields)[i].type);
-                    }
-                } else {
-                    parseContext.error($2.line, " no such field in structure", $3.string->c_str(), "");
-                    parseContext.recover();
-                    $$ = $1;
-                }
-            }
-        } else {
-            parseContext.error($2.line, " field selection requires structure, vector, or matrix on left hand side", $3.string->c_str(), "");
-            parseContext.recover();
-            $$ = $1;
-        }
-        // don't delete $3.string, it's from the pool
-    }
-    | postfix_expression INC_OP {
-        if (parseContext.lValueErrorCheck($2.line, "++", $1))
-            parseContext.recover();
-        $$ = parseContext.intermediate.addUnaryMath(EOpPostIncrement, $1, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.unaryOpError($2.line, "++", $1->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    | postfix_expression DEC_OP {
-        if (parseContext.lValueErrorCheck($2.line, "--", $1))
-            parseContext.recover();
-        $$ = parseContext.intermediate.addUnaryMath(EOpPostDecrement, $1, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.unaryOpError($2.line, "--", $1->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    ;
-
-integer_expression 
-    : expression {
-        if (parseContext.integerErrorCheck($1, "[]"))
-            parseContext.recover();
-        $$ = $1; 
-    }
-    ;
-
-function_call 
-    : function_call_generic {
-        TFunction* fnCall = $1.function;
-        TOperator op = fnCall->getBuiltInOp();
-        
-        if (op != EOpNull) {
-            //
-            // Then this should be a constructor.
-            //
-            TType type(EbtVoid);  // use this to get the type back
-            if (parseContext.constructorErrorCheck($1.line, $1.intermNode, *fnCall, op, &type)) {
-                $$ = 0;
-            } else {
-                //
-                // It's a constructor, of type 'type'.
-                //
-                $$ = parseContext.addConstructor($1.intermNode, &type, op, fnCall, $1.line);
-            }
-            
-            if ($$ == 0) {        
-                parseContext.recover();
-                $$ = parseContext.intermediate.setAggregateOperator(0, op, $1.line);
-            }
-            $$->setType(type);
-        } else {
-            //
-            // Not a constructor.  Find it in the symbol table.
-            //
-            const TFunction* fnCandidate;
-            bool builtIn;
-            fnCandidate = parseContext.findFunction($1.line, fnCall, &builtIn);
-            if (fnCandidate) {
-                //
-                // A declared function.  But, it might still map to a built-in
-                // operation.
-                //
-                op = fnCandidate->getBuiltInOp();
-                if (builtIn && op != EOpNull) {
-                    //
-                    // A function call mapped to a built-in operation.
-                    //
-                    if (fnCandidate->getParamCount() == 1) {
-                        //
-                        // Treat it like a built-in unary operator.
-                        //
-                        $$ = parseContext.intermediate.addUnaryMath(op, $1.intermNode, 0, parseContext.symbolTable);
-                        if ($$ == 0)  {
-                            parseContext.error($1.intermNode->getLine(), " wrong operand type", "Internal Error", 
-                                "built in unary operator function.  Type: %s",
-                                static_cast<TIntermTyped*>($1.intermNode)->getCompleteString().c_str());
-                            YYERROR;
-                        }
-                    } else {
-                        $$ = parseContext.intermediate.setAggregateOperator($1.intermAggregate, op, $1.line);
-                    }
-                } else {
-                    // This is a real function call
-                    
-                    $$ = parseContext.intermediate.setAggregateOperator($1.intermAggregate, EOpFunctionCall, $1.line);
-                    $$->setType(fnCandidate->getReturnType());                   
-                    
-                    // this is how we know whether the given function is a builtIn function or a user defined function
-                    // if builtIn == false, it's a userDefined -> could be an overloaded builtIn function also
-                    // if builtIn == true, it's definitely a builtIn function with EOpNull
-                    if (!builtIn) 
-                        $$->getAsAggregate()->setUserDefined(); 
-                    $$->getAsAggregate()->setName(fnCandidate->getMangledName());
-
-                    TQualifier qual;
-                    TQualifierList& qualifierList = $$->getAsAggregate()->getQualifier();
-                    for (int i = 0; i < fnCandidate->getParamCount(); ++i) {
-                        qual = (*fnCandidate)[i].type->getQualifier();
-                        if (qual == EvqOut || qual == EvqInOut) {
-                            if (parseContext.lValueErrorCheck($$->getLine(), "assign", $$->getAsAggregate()->getSequence()[i]->getAsTyped())) {
-                                parseContext.error($1.intermNode->getLine(), "Constant value cannot be passed for 'out' or 'inout' parameters.", "Error", "");
-                                parseContext.recover();
-                            }
-                        }
-                        qualifierList.push_back(qual);
-                    }
-                }
-                $$->setType(fnCandidate->getReturnType());
-            } else {
-                // error message was put out by PaFindFunction()
-                // Put on a dummy node for error recovery
-                constUnion *unionArray = new constUnion[1];
-                unionArray->fConst = 0.0;
-                $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtFloat, EvqConst), $1.line);
-                parseContext.recover();
-            }
-        }
-        delete fnCall;
-    }
-    ;
-
-function_call_generic
-    : function_call_header_with_parameters RIGHT_PAREN {
-        $$ = $1;
-        $$.line = $2.line;
-    }
-    | function_call_header_no_parameters RIGHT_PAREN {
-        $$ = $1;
-        $$.line = $2.line;
-    }
-    ;
-    
-function_call_header_no_parameters 
-    : function_call_header VOID_TYPE {
-        $$.function = $1;
-        $$.intermNode = 0;
-    }
-    | function_call_header {
-        $$.function = $1;
-        $$.intermNode = 0;
-    }
-    ;
-
-function_call_header_with_parameters
-    : function_call_header assignment_expression {
-        TParameter param = { 0, new TType($2->getType()) };
-        $1->addParameter(param);
-        $$.function = $1;
-        $$.intermNode = $2;
-    }
-    | function_call_header_with_parameters COMMA assignment_expression {
-        TParameter param = { 0, new TType($3->getType()) };
-        $1.function->addParameter(param);
-        $$.function = $1.function;
-        $$.intermNode = parseContext.intermediate.growAggregate($1.intermNode, $3, $2.line);
-    }
-    ;
-
-function_call_header 
-    : function_identifier LEFT_PAREN {
-        $$ = $1;
-    }
-    ;
-
-function_identifier
-    : constructor_identifier {
-        if ($1.op == EOpConstructStruct) {
-            TString tempString = "";
-            TFunction *function = new TFunction(&tempString, *($1.type.userDef), $1.op);
-            $$ = function;
-        }
-        else {
-            TFunction *function = new TFunction($1.op);
-            $$ = function;
-        }
-    }
-    | IDENTIFIER {
-        if (parseContext.reservedErrorCheck($1.line, *$1.string)) 
-            parseContext.recover();
-        TType type(EbtVoid);
-        TFunction *function = new TFunction($1.string, type);
-        $$ = function;        
-    }
-    ;
-
-// Grammar Note:  Constructors look like functions, but lexical anaylsis recognized most of them as keywords.
-
-//
-// Don't go through the symbol table for constructors.  
-// Their parameters will be verified algorithmically.
-//
-constructor_identifier
-    : FLOAT_TYPE {                                   $$.line = $1.line; $$.op = EOpConstructFloat; }
-    | INT_TYPE   {                                   $$.line = $1.line; $$.op = EOpConstructInt;   }
-    | BOOL_TYPE  {                                   $$.line = $1.line; $$.op = EOpConstructBool;  }
-    | VEC2       {                                   $$.line = $1.line; $$.op = EOpConstructVec2;  }
-    | VEC3       {                                   $$.line = $1.line; $$.op = EOpConstructVec3;  }
-    | VEC4       {                                   $$.line = $1.line; $$.op = EOpConstructVec4;  }
-    | BVEC2      { FRAG_VERT_ONLY("bvec2", $1.line); $$.line = $1.line; $$.op = EOpConstructBVec2; }
-    | BVEC3      { FRAG_VERT_ONLY("bvec3", $1.line); $$.line = $1.line; $$.op = EOpConstructBVec3; }
-    | BVEC4      { FRAG_VERT_ONLY("bvec4", $1.line); $$.line = $1.line; $$.op = EOpConstructBVec4; }
-    | IVEC2      { FRAG_VERT_ONLY("ivec2", $1.line); $$.line = $1.line; $$.op = EOpConstructIVec2; }
-    | IVEC3      { FRAG_VERT_ONLY("ivec3", $1.line); $$.line = $1.line; $$.op = EOpConstructIVec3; }
-    | IVEC4      { FRAG_VERT_ONLY("ivec4", $1.line); $$.line = $1.line; $$.op = EOpConstructIVec4; }
-    | MATRIX2    { FRAG_VERT_ONLY("mat2", $1.line);  $$.line = $1.line; $$.op = EOpConstructMat2;  }
-    | MATRIX3    { FRAG_VERT_ONLY("mat3", $1.line);  $$.line = $1.line; $$.op = EOpConstructMat3;  }
-    | MATRIX4    { FRAG_VERT_ONLY("mat4", $1.line);  $$.line = $1.line; $$.op = EOpConstructMat4;  }
-    | TYPE_NAME  {                                   
-        TType& structure = static_cast<TVariable*>($1.symbol)->getType();
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtStruct, qual, 1, false, false, &structure, $1.line }; 
-        $$.type = t;
-        $$.line = $1.line; 
-        $$.op = EOpConstructStruct; 
-    }    
-    ;
-
-unary_expression
-    : postfix_expression {
-        $$ = $1;
-    }
-    | INC_OP unary_expression {
-        if (parseContext.lValueErrorCheck($1.line, "++", $2))
-            parseContext.recover();
-        $$ = parseContext.intermediate.addUnaryMath(EOpPreIncrement, $2, $1.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.unaryOpError($1.line, "++", $2->getCompleteString());
-            parseContext.recover();
-            $$ = $2;
-        }
-    }
-    | DEC_OP unary_expression {
-        if (parseContext.lValueErrorCheck($1.line, "--", $2))
-            parseContext.recover();
-        $$ = parseContext.intermediate.addUnaryMath(EOpPreDecrement, $2, $1.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.unaryOpError($1.line, "--", $2->getCompleteString());
-            parseContext.recover();
-            $$ = $2;
-        }
-    }
-    | unary_operator unary_expression {
-        if ($1.op != EOpNull) {
-            $$ = parseContext.intermediate.addUnaryMath($1.op, $2, $1.line, parseContext.symbolTable);
-            if ($$ == 0) {
-                char* errorOp = "";
-                switch($1.op) {
-                case EOpNegative:   errorOp = "-"; break;
-                case EOpLogicalNot: errorOp = "!"; break;
-                case EOpBitwiseNot: errorOp = "~"; break;
-				default: break;
-                }
-                parseContext.unaryOpError($1.line, errorOp, $2->getCompleteString());
-                parseContext.recover();
-                $$ = $2;
-            }
-        } else
-            $$ = $2;
-    }
-    ;
-// Grammar Note:  No traditional style type casts.
-
-unary_operator
-    : PLUS  { $$.line = $1.line; $$.op = EOpNull; }
-    | DASH  { $$.line = $1.line; $$.op = EOpNegative; }
-    | BANG  { $$.line = $1.line; $$.op = EOpLogicalNot; }
-    | TILDE { PACK_UNPACK_ONLY("~", $1.line);  
-              $$.line = $1.line; $$.op = EOpBitwiseNot; }
-    ;
-// Grammar Note:  No '*' or '&' unary ops.  Pointers are not supported.
-
-multiplicative_expression
-    : unary_expression { $$ = $1; }
-    | multiplicative_expression STAR unary_expression {
-        FRAG_VERT_ONLY("*", $2.line);
-        $$ = parseContext.intermediate.addBinaryMath(EOpMul, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "*", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    | multiplicative_expression SLASH unary_expression {
-        FRAG_VERT_ONLY("/", $2.line); 
-        $$ = parseContext.intermediate.addBinaryMath(EOpDiv, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "/", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    | multiplicative_expression PERCENT unary_expression {
-        PACK_UNPACK_ONLY("%", $2.line);
-        $$ = parseContext.intermediate.addBinaryMath(EOpMod, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "%", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    ;
-
-additive_expression
-    : multiplicative_expression { $$ = $1; }
-    | additive_expression PLUS multiplicative_expression {  
-        $$ = parseContext.intermediate.addBinaryMath(EOpAdd, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "+", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    | additive_expression DASH multiplicative_expression {
-        $$ = parseContext.intermediate.addBinaryMath(EOpSub, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "-", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        } 
-    }
-    ;
-
-shift_expression
-    : additive_expression { $$ = $1; }
-    | shift_expression LEFT_OP additive_expression {
-        PACK_UNPACK_ONLY("<<", $2.line);
-        $$ = parseContext.intermediate.addBinaryMath(EOpLeftShift, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "<<", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    | shift_expression RIGHT_OP additive_expression {
-        PACK_UNPACK_ONLY(">>", $2.line);
-        $$ = parseContext.intermediate.addBinaryMath(EOpRightShift, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, ">>", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    ;
-
-relational_expression
-    : shift_expression { $$ = $1; }
-    | relational_expression LEFT_ANGLE shift_expression { 
-        $$ = parseContext.intermediate.addBinaryMath(EOpLessThan, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "<", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $2.line);
-        }
-    }
-    | relational_expression RIGHT_ANGLE shift_expression  { 
-        $$ = parseContext.intermediate.addBinaryMath(EOpGreaterThan, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, ">", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $2.line);
-        }
-    }
-    | relational_expression LE_OP shift_expression  { 
-        $$ = parseContext.intermediate.addBinaryMath(EOpLessThanEqual, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "<=", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $2.line);
-        }
-    }
-    | relational_expression GE_OP shift_expression  { 
-        $$ = parseContext.intermediate.addBinaryMath(EOpGreaterThanEqual, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, ">=", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $2.line);
-        }
-    }
-    ;
-
-equality_expression
-    : relational_expression { $$ = $1; }
-    | equality_expression EQ_OP relational_expression  { 
-        $$ = parseContext.intermediate.addBinaryMath(EOpEqual, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "==", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $2.line);
-        }
-    }
-    | equality_expression  NE_OP relational_expression { 
-        $$ = parseContext.intermediate.addBinaryMath(EOpNotEqual, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "!=", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $2.line);
-        }
-    }
-    ;
-
-and_expression
-    : equality_expression { $$ = $1; }
-    | and_expression AMPERSAND equality_expression {
-        PACK_UNPACK_ONLY("&", $2.line);
-        $$ = parseContext.intermediate.addBinaryMath(EOpAnd, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "&", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    ;
-
-exclusive_or_expression
-    : and_expression { $$ = $1; }
-    | exclusive_or_expression CARET and_expression {
-        PACK_UNPACK_ONLY("^", $2.line);
-        $$ = parseContext.intermediate.addBinaryMath(EOpExclusiveOr, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "^", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    ;
-
-inclusive_or_expression
-    : exclusive_or_expression { $$ = $1; }
-    | inclusive_or_expression VERTICAL_BAR exclusive_or_expression {
-        PACK_UNPACK_ONLY("|", $2.line);
-        $$ = parseContext.intermediate.addBinaryMath(EOpInclusiveOr, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "|", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    ;
-
-logical_and_expression
-    : inclusive_or_expression { $$ = $1; }
-    | logical_and_expression AND_OP inclusive_or_expression {
-        $$ = parseContext.intermediate.addBinaryMath(EOpLogicalAnd, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "&&", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $2.line);
-        }
-    }
-    ;
-
-logical_xor_expression
-    : logical_and_expression { $$ = $1; }
-    | logical_xor_expression XOR_OP logical_and_expression  { 
-        $$ = parseContext.intermediate.addBinaryMath(EOpLogicalXor, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "^^", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $2.line);
-        }
-    }
-    ;
-
-logical_or_expression
-    : logical_xor_expression { $$ = $1; }
-    | logical_or_expression OR_OP logical_xor_expression  { 
-        $$ = parseContext.intermediate.addBinaryMath(EOpLogicalOr, $1, $3, $2.line, parseContext.symbolTable);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, "||", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            constUnion *unionArray = new constUnion[1];
-            unionArray->bConst = false;
-            $$ = parseContext.intermediate.addConstantUnion(unionArray, TType(EbtBool, EvqConst), $2.line);
-        }
-    }
-    ;
-
-conditional_expression
-    : logical_or_expression { $$ = $1; }
-    | logical_or_expression QUESTION expression COLON assignment_expression {
-       if (parseContext.boolErrorCheck($2.line, $1))
-            parseContext.recover();
-       
-        $$ = parseContext.intermediate.addSelection($1, $3, $5, $2.line);
-        if ($3->getType() != $5->getType())
-            $$ = 0;
-            
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, ":", $3->getCompleteString(), $5->getCompleteString());
-            parseContext.recover();
-            $$ = $5;
-        }
-    }
-    ;
-
-assignment_expression
-    : conditional_expression { $$ = $1; }
-    | unary_expression assignment_operator assignment_expression {
-        if (parseContext.lValueErrorCheck($2.line, "assign", $1))
-            parseContext.recover();
-        $$ = parseContext.intermediate.addAssign($2.op, $1, $3, $2.line);
-        if ($$ == 0) {
-            parseContext.assignError($2.line, "assign", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $1;
-        }
-    }
-    ;
-
-assignment_operator
-    : EQUAL        {                                    $$.line = $1.line; $$.op = EOpAssign; }
-    | MUL_ASSIGN   { FRAG_VERT_ONLY("*=", $1.line);     $$.line = $1.line; $$.op = EOpMulAssign; }
-    | DIV_ASSIGN   { FRAG_VERT_ONLY("/=", $1.line);     $$.line = $1.line; $$.op = EOpDivAssign; }
-    | MOD_ASSIGN   { PACK_UNPACK_ONLY("%=", $1.line);   $$.line = $1.line; $$.op = EOpModAssign; }
-    | ADD_ASSIGN   {                                    $$.line = $1.line; $$.op = EOpAddAssign; }
-    | SUB_ASSIGN   {                                    $$.line = $1.line; $$.op = EOpSubAssign; }
-    | LEFT_ASSIGN  { PACK_UNPACK_ONLY("<<=", $1.line);  $$.line = $1.line; $$.op = EOpLeftShiftAssign; }
-    | RIGHT_ASSIGN { PACK_UNPACK_ONLY("<<=", $1.line);  $$.line = $1.line; $$.op = EOpRightShiftAssign; }
-    | AND_ASSIGN   { PACK_UNPACK_ONLY("&=",  $1.line);  $$.line = $1.line; $$.op = EOpAndAssign; }
-    | XOR_ASSIGN   { PACK_UNPACK_ONLY("^=",  $1.line);  $$.line = $1.line; $$.op = EOpExclusiveOrAssign; }
-    | OR_ASSIGN    { PACK_UNPACK_ONLY("|=",  $1.line);  $$.line = $1.line; $$.op = EOpInclusiveOrAssign; }
-    ;
-
-expression
-    : assignment_expression {
-        $$ = $1;
-    }
-    | expression COMMA assignment_expression {
-        $$ = parseContext.intermediate.addComma($1, $3, $2.line);
-        if ($$ == 0) {
-            parseContext.binaryOpError($2.line, ",", $1->getCompleteString(), $3->getCompleteString());
-            parseContext.recover();
-            $$ = $3;
-        }
-    }
-    ;
-
-constant_expression
-    : conditional_expression {
-        if (parseContext.constErrorCheck($1))
-            parseContext.recover();
-        $$ = $1;
-    }
-    ;
-
-declaration
-    : function_prototype SEMICOLON   { $$ = 0; }
-    | init_declarator_list SEMICOLON { 
-        if ($1.intermAggregate)
-            $1.intermAggregate->setOperator(EOpSequence); 
-        $$ = $1.intermAggregate; 
-    }
-    ;
-
-function_prototype 
-    : function_declarator RIGHT_PAREN  {
-        //
-        // Multiple declarations of the same function are allowed.
-        //
-        // If this is a definition, the definition production code will check for redefinitions 
-        // (we don't know at this point if it's a definition or not).
-        //
-        // Redeclarations are allowed.  But, return types and parameter qualifiers must match.
-        //        
-        TFunction* prevDec = static_cast<TFunction*>(parseContext.symbolTable.find($1->getMangledName()));
-        if (prevDec) {
-            if (prevDec->getReturnType() != $1->getReturnType()) {
-                parseContext.error($2.line, "overloaded functions must have the same return type", $1->getReturnType().getBasicString(), "");
-                parseContext.recover();
-            }
-            for (int i = 0; i < prevDec->getParamCount(); ++i) {
-                if ((*prevDec)[i].type->getQualifier() != (*$1)[i].type->getQualifier()) {
-                    parseContext.error($2.line, "overloaded functions must have the same parameter qualifiers", (*$1)[i].type->getQualifierString(), "");
-                    parseContext.recover();
-                }
-            }
-        }
-        
-        //
-        // If this is a redeclaration, it could also be a definition,
-        // in which case, we want to use the variable names from this one, and not the one that's
-        // being redeclared.  So, pass back up this declaration, not the one in the symbol table.
-        //
-        $$.function = $1;
-        $$.line = $2.line;
-
-        parseContext.symbolTable.insert(*$$.function);
-    }
-    ;
-
-function_declarator 
-    : function_header {
-        $$ = $1;
-    }
-    | function_header_with_parameters { 
-        $$ = $1;  
-    }
-    ;
-
-
-function_header_with_parameters
-    : function_header parameter_declaration {
-        // Add the parameter 
-        $$ = $1;
-        if ($2.param.type->getBasicType() != EbtVoid)
-            $1->addParameter($2.param);
-        else
-            delete $2.param.type;
-    }
-    | function_header_with_parameters COMMA parameter_declaration {   
-        //
-        // Only first parameter of one-parameter functions can be void
-        // The check for named parameters not being void is done in parameter_declarator 
-        //
-        if ($3.param.type->getBasicType() == EbtVoid) {
-            //
-            // This parameter > first is void
-            //
-            parseContext.error($2.line, "cannot be an argument type except for '(void)'", "void", "");
-            parseContext.recover();
-            delete $3.param.type;
-        } else {
-            // Add the parameter 
-            $$ = $1; 
-            $1->addParameter($3.param);
-        }
-    }
-    ;
-
-function_header 
-    : fully_specified_type IDENTIFIER LEFT_PAREN {
-        if ($1.qualifier != EvqGlobal && $1.qualifier != EvqTemporary) {
-            parseContext.error($2.line, "no qualifiers allowed for function return", getQualifierString($1.qualifier), "");
-            parseContext.recover();
-        }
-        // make sure a sampler is not involved as well...
-        if (parseContext.structQualifierErrorCheck($2.line, $1))
-            parseContext.recover();
-        
-        // Add the function as a prototype after parsing it (we do not support recursion) 
-        TFunction *function;
-        TType type($1);
-        function = new TFunction($2.string, type);
-        $$ = function;
-    }
-    ;
-
-parameter_declarator
-    // Type + name 
-    : type_specifier IDENTIFIER {
-        if ($1.type == EbtVoid) {
-            parseContext.error($2.line, "illegal use of type 'void'", $2.string->c_str(), "");
-            parseContext.recover();
-        }
-        if (parseContext.reservedErrorCheck($2.line, *$2.string))
-            parseContext.recover();
-        TParameter param = {$2.string, new TType($1)};
-        $$.line = $2.line;
-        $$.param = param;
-    }
-    | type_specifier IDENTIFIER LEFT_BRACKET constant_expression RIGHT_BRACKET {
-        // Check that we can make an array out of this type
-        if ($1.array) {
-            parseContext.error($3.line, "cannot declare arrays of this type", TType($1).getCompleteString().c_str(), "");
-            parseContext.recover();
-        }
-        if (parseContext.reservedErrorCheck($2.line, *$2.string))
-            parseContext.recover();
-        $1.array = true;
-        TType* type = new TType($1);        
-        if ($4->getAsConstantUnion())
-            type->setArraySize($4->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-        TParameter param = { $2.string, type };
-        $$.line = $2.line;
-        $$.param = param;
-    }
-    ;
-
-parameter_declaration 
-    // 
-    // The only parameter qualifier a parameter can have are 
-    // IN_QUAL, OUT_QUAL, INOUT_QUAL, or CONST.
-    //
-    
-    //
-    // Type + name 
-    //
-    : type_qualifier parameter_qualifier parameter_declarator {
-        $$ = $3;
-        if (parseContext.paramErrorCheck($3.line, $1.qualifier, $2, $$.param.type))
-            parseContext.recover();
-    }
-    | parameter_qualifier parameter_declarator {
-        $$ = $2;
-        if (parseContext.parameterSamplerErrorCheck($2.line, $1, *$2.param.type))
-            parseContext.recover();
-        if (parseContext.paramErrorCheck($2.line, EvqTemporary, $1, $$.param.type))
-            parseContext.recover();
-    }
-    //
-    // Only type 
-    //
-    | type_qualifier parameter_qualifier parameter_type_specifier {
-        $$ = $3;
-        if (parseContext.paramErrorCheck($3.line, $1.qualifier, $2, $$.param.type))
-            parseContext.recover();
-    }
-    | parameter_qualifier parameter_type_specifier {
-        $$ = $2;
-        if (parseContext.parameterSamplerErrorCheck($2.line, $1, *$2.param.type))
-            parseContext.recover();
-        if (parseContext.paramErrorCheck($2.line, EvqTemporary, $1, $$.param.type))
-            parseContext.recover();
-    }
-    ;
-    
-parameter_qualifier
-    : /* empty */ {
-        $$ = EvqIn;
-    }
-    | IN_QUAL {
-        $$ = EvqIn;
-    }
-    | OUT_QUAL {
-        $$ = EvqOut;
-    }
-    | INOUT_QUAL {
-        $$ = EvqInOut;
-    }
-    ;
-
-parameter_type_specifier 
-    : type_specifier {
-        TParameter param = { 0, new TType($1) };
-        $$.param = param;
-        
-    }
-    | type_specifier LEFT_BRACKET constant_expression RIGHT_BRACKET {
-        // Check that we can make an array out of this type 
-        if ($1.array) {
-            parseContext.error($2.line, "cannot declare arrays of this type", TType($1).getCompleteString().c_str(), "");
-            parseContext.recover();
-        }
-        $1.array = true;
-        TType* type = new TType($1);       
-        if ($3->getAsConstantUnion())
-            type->setArraySize($3->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-
-        TParameter param = { 0, type };
-        $$.line = $2.line;
-        $$.param = param;
-    }
-    ;
-
-init_declarator_list
-    : single_declaration {
-        $$ = $1;
-    } 
-    | init_declarator_list COMMA IDENTIFIER {
-        $$ = $1;
-        if (parseContext.structQualifierErrorCheck($3.line, $1.type))
-            parseContext.recover();
-        
-        if (parseContext.nonInitErrorCheck($3.line, *$3.string, $$.type))
-            parseContext.recover();
-    }
-    | init_declarator_list COMMA IDENTIFIER LEFT_BRACKET RIGHT_BRACKET {
-        $$ = $1;
-        if (parseContext.structQualifierErrorCheck($3.line, $1.type))
-            parseContext.recover();
-            
-        if (parseContext.arrayErrorCheck($4.line, *$3.string, $$.type, 0))
-            parseContext.recover();
-    }
-    | init_declarator_list COMMA IDENTIFIER LEFT_BRACKET constant_expression RIGHT_BRACKET {
-        $$ = $1;
-        if (parseContext.structQualifierErrorCheck($3.line, $1.type))
-            parseContext.recover();
-            
-        if (parseContext.arrayErrorCheck($4.line, *$3.string, $$.type, $5))
-            parseContext.recover();
-    }
-    | init_declarator_list COMMA IDENTIFIER EQUAL initializer {
-        $$ = $1;
-        if (parseContext.structQualifierErrorCheck($3.line, $1.type))
-            parseContext.recover();
-        
-        TIntermNode* intermNode;
-        if (!parseContext.executeInitializer($3.line, *$3.string, $1.type, $5, intermNode)) {
-            //
-            // build the intermediate representation
-            //
-            if (intermNode)
-                $$.intermAggregate = parseContext.intermediate.growAggregate($1.intermNode, intermNode, $4.line);
-            else
-                $$.intermAggregate = $1.intermAggregate;
-        } else {
-            parseContext.recover();
-            $$.intermAggregate = 0;
-        }
-    }
-    ;
-
-single_declaration 
-    : fully_specified_type {
-        $$.type = $1;
-        $$.intermAggregate = 0;
-    }    
-    | fully_specified_type IDENTIFIER {
-        $$.intermAggregate = 0;
-        $$.type = $1;
-        if (parseContext.structQualifierErrorCheck($2.line, $1))
-            parseContext.recover();
-        
-        if (parseContext.nonInitErrorCheck($2.line, *$2.string, $$.type))
-            parseContext.recover();
-    }
-    | fully_specified_type IDENTIFIER LEFT_BRACKET RIGHT_BRACKET {
-        $$.intermAggregate = 0;
-        $$.type = $1;
-        if (parseContext.structQualifierErrorCheck($2.line, $1))
-            parseContext.recover();
-        
-        if (parseContext.arrayErrorCheck($3.line, *$2.string, $$.type, 0))
-            parseContext.recover();
-    }
-    | fully_specified_type IDENTIFIER LEFT_BRACKET constant_expression RIGHT_BRACKET {
-        $$.intermAggregate = 0;
-        $$.type = $1;
-        if (parseContext.structQualifierErrorCheck($2.line, $1))
-            parseContext.recover();
-        
-        if (parseContext.arrayErrorCheck($3.line, *$2.string, $$.type, $4))
-            parseContext.recover();
-    }
-    | fully_specified_type IDENTIFIER EQUAL initializer {
-        $$.type = $1;
-        if (parseContext.structQualifierErrorCheck($2.line, $1))
-            parseContext.recover();
-        
-        TIntermNode* intermNode;
-        if (!parseContext.executeInitializer($2.line, *$2.string, $1, $4, intermNode)) {
-            //
-            // Build intermediate representation
-            //
-            if (intermNode)
-                $$.intermAggregate = parseContext.intermediate.makeAggregate(intermNode, $3.line);
-            else
-                $$.intermAggregate = 0;
-        } else {
-            parseContext.recover();
-            $$.intermAggregate = 0;
-        }
-    }
-    
-//
-// Place holder for the pack/unpack languages.
-//
-//    | buffer_specifier {
-//        $$.intermAggregate = 0;
-//    }
-    ;
-
-// Grammar Note:  No 'enum', or 'typedef'.
-
-//
-// Place holder for the pack/unpack languages.
-//
-//%type <interm> buffer_declaration
-//%type <interm.type> buffer_specifier input_or_output buffer_declaration_list 
-//buffer_specifier
-//    : input_or_output LEFT_BRACE buffer_declaration_list RIGHT_BRACE {
-//    }
-//    ;
-//
-//input_or_output
-//    : INPUT {
-//        if (parseContext.globalErrorCheck($1.line, parseContext.symbolTable.atGlobalLevel(), "input"))
-//            parseContext.recover();
-//        UNPACK_ONLY("input", $1.line);
-//        $$.qualifier = EvqInput;        
-//    }
-//    | OUTPUT {
-//        if (parseContext.globalErrorCheck($1.line, parseContext.symbolTable.atGlobalLevel(), "output"))
-//            parseContext.recover();
-//        PACK_ONLY("output", $1.line);
-//        $$.qualifier = EvqOutput;
-//    }
-//    ;
-
-//
-// Place holder for the pack/unpack languages.
-//
-//buffer_declaration_list
-//    : buffer_declaration {
-//    }
-//    | buffer_declaration_list buffer_declaration {
-//    }
-//    ;
-
-//
-// Input/output semantics:
-//   float must be 16 or 32 bits
-//   float alignment restrictions?
-//   check for only one input and only one output
-//   sum of bitfields has to be multiple of 32
-//
-
-//
-// Place holder for the pack/unpack languages.
-//
-//buffer_declaration
-//    : type_specifier IDENTIFIER COLON constant_expression SEMICOLON {
-//        if (parseContext.reservedErrorCheck($2.line, *$2.string, parseContext))
-//            parseContext.recover();
-//        $$.variable = new TVariable($2.string, $1);
-//        if (! parseContext.symbolTable.insert(*$$.variable)) {
-//            parseContext.error($2.line, "redefinition", $$.variable->getName().c_str(), "");
-//            parseContext.recover();
-//            // don't have to delete $$.variable, the pool pop will take care of it
-//        }
-//    }
-//    ;
-
-fully_specified_type
-    : type_specifier {
-        $$ = $1;
-    }
-    | type_qualifier type_specifier  { 
-        TPublicType t = { $2.type, $1.qualifier, $2.size, $2.matrix, false, $2.userDef, 0 };
-        if ($1.qualifier == EvqAttribute &&
-            ($2.type == EbtBool || $2.type == EbtInt)) {
-            parseContext.error($2.line, "cannot be bool or int", getQualifierString($1.qualifier), "");
-            parseContext.recover();
-        }
-        if (($1.qualifier == EvqVaryingIn || $1.qualifier == EvqVaryingOut) &&
-            ($2.type == EbtBool || $2.type == EbtInt)) {
-            parseContext.error($2.line, "cannot be bool or int", getQualifierString($1.qualifier), "");
-            parseContext.recover();
-        }
-        $$ = t;
-    }
-    ;
-
-type_qualifier
-    : CONST_QUAL { 
-        TPublicType t = { EbtVoid,  EvqConst,     1, false, false, 0 }; 
-        $$ = t; 
-    }
-    | ATTRIBUTE { 
-        VERTEX_ONLY("attribute", $1.line);
-        if (parseContext.globalErrorCheck($1.line, parseContext.symbolTable.atGlobalLevel(), "attribute"))
-            parseContext.recover();
-        TPublicType t = { EbtVoid,  EvqAttribute, 1, false, false, 0 }; 
-        $$ = t; 
-    }
-    | VARYING {
-        if (parseContext.globalErrorCheck($1.line, parseContext.symbolTable.atGlobalLevel(), "varying"))
-            parseContext.recover();
-        TPublicType t = { EbtVoid,  EvqVaryingIn, 1, false, false, 0 };
-        if (parseContext.language == EShLangVertex)
-            t.qualifier = EvqVaryingOut;
-        $$ = t; 
-    }
-    | UNIFORM {
-        if (parseContext.globalErrorCheck($1.line, parseContext.symbolTable.atGlobalLevel(), "uniform"))
-            parseContext.recover();
-        TPublicType t = { EbtVoid,  EvqUniform,   1, false, false, 0 }; 
-        $$ = t;
-    }
-    ;
-
-type_specifier
-    : VOID_TYPE {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtVoid, qual, 1, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | FLOAT_TYPE {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 1, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | INT_TYPE {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtInt, qual, 1, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | BOOL_TYPE {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtBool, qual, 1, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-//    | UNSIGNED INT_TYPE { 
-//        PACK_UNPACK_ONLY("unsigned", $1.line); 
-//        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-//        TPublicType t = { EbtInt, qual, 1, false, false, 0, $1.line }; 
-//        $$ = t; 
-//    }
-    | VEC2 {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 2, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | VEC3 {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 3, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | VEC4 {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 4, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | BVEC2 {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtBool, qual, 2, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | BVEC3 {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtBool, qual, 3, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | BVEC4 {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtBool, qual, 4, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | IVEC2 {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtInt, qual, 2, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | IVEC3 {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtInt, qual, 3, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | IVEC4 {
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtInt, qual, 4, false, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | MATRIX2 {
-        FRAG_VERT_ONLY("mat2", $1.line); 
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 2, true, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | MATRIX3 { 
-        FRAG_VERT_ONLY("mat3", $1.line); 
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 3, true, false, 0, $1.line }; 
-        $$ = t; 
-    }
-    | MATRIX4 { 
-        FRAG_VERT_ONLY("mat4", $1.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtFloat, qual, 4, true, false, 0, $1.line }; 
-        $$ = t; 
-    } 
-    | SAMPLER1D {
-        FRAG_VERT_ONLY("sampler1D", $1.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler1D, qual, 1, false, false, 0, $1.line }; 
-        $$ = t;
-    } 
-    | SAMPLER2D {
-        FRAG_VERT_ONLY("sampler2D", $1.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler2D, qual, 1, false, false, 0, $1.line }; 
-        $$ = t;
-    } 
-    | SAMPLER3D {
-        FRAG_VERT_ONLY("sampler3D", $1.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler3D, qual, 1, false, false, 0, $1.line }; 
-        $$ = t;
-    } 
-    | SAMPLERCUBE {
-        FRAG_VERT_ONLY("samplerCube", $1.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSamplerCube, qual, 1, false, false, 0, $1.line }; 
-        $$ = t;
-    } 
-    | SAMPLER1DSHADOW {
-        FRAG_VERT_ONLY("sampler1DShadow", $1.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler1DShadow, qual, 1, false, false, 0, $1.line }; 
-        $$ = t;
-    } 
-    | SAMPLER2DSHADOW {
-        FRAG_VERT_ONLY("sampler2DShadow", $1.line);
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtSampler2DShadow, qual, 1, false, false, 0, $1.line }; 
-        $$ = t;
-    }
-    | struct_specifier {
-        FRAG_VERT_ONLY("struct", $1.line);
-        $$ = $1;
-        $$.qualifier = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-    }
-    | TYPE_NAME {     
-        //
-        // This is for user defined type names.  The lexical phase looked up the 
-        // type.
-        //
-        TType& structure = static_cast<TVariable*>($1.symbol)->getType();
-        TQualifier qual = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
-        TPublicType t = { EbtStruct, qual, 1, false, false, &structure, $1.line }; 
-        $$ = t;
-    }
-    ;
-
-struct_specifier
-    : STRUCT IDENTIFIER LEFT_BRACE struct_declaration_list RIGHT_BRACE {
-        TType* structure = new TType($4, *$2.string);
-        TVariable* userTypeDef = new TVariable($2.string, *structure, true);
-        if (! parseContext.symbolTable.insert(*userTypeDef)) {
-            parseContext.error($2.line, "redefinition", $2.string->c_str(), "struct");
-            parseContext.recover();
-        }
-        TPublicType t = { EbtStruct, EvqTemporary, 1, false, false, structure, $1.line };
-        $$ = t;
-    }
-    | STRUCT LEFT_BRACE struct_declaration_list RIGHT_BRACE {
-        TType* structure = new TType($3, TString(""));
-        TPublicType t = { EbtStruct, EvqTemporary, 1, false, false, structure, $1.line };
-        $$ = t;
-    }
-    ;
-    
-struct_declaration_list
-    : struct_declaration {
-        $$ = $1;
-    }
-    | struct_declaration_list struct_declaration {
-        $$ = $1;
-        for (unsigned int i = 0; i < $2->size(); ++i) {
-            for (unsigned int j = 0; j < $$->size(); ++j) {
-                if ((*$$)[j].type->getFieldName() == (*$2)[i].type->getFieldName()) {
-                    parseContext.error((*$2)[i].line, "duplicate field name in structure:", "struct", (*$2)[i].type->getFieldName().c_str());
-                    parseContext.recover();
-                }
-            }
-            $$->push_back((*$2)[i]);
-        }
-    }
-    ;
-    
-struct_declaration
-    : type_specifier struct_declarator_list SEMICOLON {
-        $$ = $2;
-        
-        if (parseContext.voidErrorCheck($1.line, (*$2)[0].type->getFieldName(), $1)) {
-            parseContext.recover();
-        }
-        for (unsigned int i = 0; i < $$->size(); ++i) {
-            //
-            // Careful not to replace already know aspects of type, like array-ness
-            //
-            (*$$)[i].type->setType($1.type, $1.size, $1.matrix, $1.userDef);
-            if ($1.userDef)
-                (*$$)[i].type->setTypeName($1.userDef->getTypeName());
-        }
-    }
-    ;
-    
-struct_declarator_list
-    : struct_declarator {
-        $$ = NewPoolTTypeList();
-        $$->push_back($1);
-    }
-    | struct_declarator_list COMMA struct_declarator {
-        $$->push_back($3);
-    }
-    ;
-    
-struct_declarator
-    : IDENTIFIER {
-        $$.type = new TType(EbtVoid);
-        $$.line = $1.line;
-        $$.type->setFieldName(*$1.string);
-    }
-    | IDENTIFIER LEFT_BRACKET constant_expression RIGHT_BRACKET {
-        $$.type = new TType(EbtVoid);
-        $$.line = $1.line;
-        $$.type->setFieldName(*$1.string);
-        
-        if ($3->getAsConstantUnion() == 0 || $3->getAsConstantUnion()->getBasicType() != EbtInt ||
-            $3->getAsConstantUnion()->getUnionArrayPointer()->iConst <= 0) {
-            parseContext.error($2.line, "structure field array size must be a positive integer", $1.string->c_str(), "");
-            parseContext.recover();
-        } else {           
-            $$.type->setArraySize($3->getAsConstantUnion()->getUnionArrayPointer()->iConst);
-        }
-    }
-    ;
-
-initializer
-    : assignment_expression { $$ = $1; }
-    ;
-
-declaration_statement 
-    : declaration { $$ = $1; }
-    ;
-
-statement
-    : compound_statement  { $$ = $1; }
-    | simple_statement    { $$ = $1; }
-    ;
-
-// Grammar Note:  No labeled statements; 'goto' is not supported.
-
-simple_statement 
-    : declaration_statement { $$ = $1; }
-    | expression_statement  { $$ = $1; } 
-    | selection_statement   { $$ = $1; }
-    | iteration_statement   { $$ = $1; }
-    | jump_statement        { $$ = $1; }
-    ;
-
-compound_statement
-    : LEFT_BRACE RIGHT_BRACE { $$ = 0; }
-    | LEFT_BRACE { parseContext.symbolTable.push(); } statement_list { parseContext.symbolTable.pop(); } RIGHT_BRACE {
-        if ($3 != 0)            
-            $3->setOperator(EOpSequence); 
-        $$ = $3;
-    }
-    ;
-
-statement_no_new_scope 
-    : compound_statement_no_new_scope { $$ = $1; }
-    | simple_statement                { $$ = $1; }
-    ;
-
-compound_statement_no_new_scope 
-    // Statement that doesn't create a new scope, for selection_statement, iteration_statement 
-    : LEFT_BRACE RIGHT_BRACE { 
-        $$ = 0; 
-    }
-    | LEFT_BRACE statement_list RIGHT_BRACE { 
-        if ($2)
-            $2->setOperator(EOpSequence); 
-        $$ = $2; 
-    }
-    ;
-
-statement_list
-    : statement {
-        $$ = parseContext.intermediate.makeAggregate($1, 0); 
-    }
-    | statement_list statement { 
-        $$ = parseContext.intermediate.growAggregate($1, $2, 0);
-    }
-    ;
-
-expression_statement
-    : SEMICOLON  { $$ = 0; }
-    | expression SEMICOLON  { $$ = static_cast<TIntermNode*>($1); }
-    ;
-
-selection_statement
-    : IF LEFT_PAREN expression RIGHT_PAREN selection_rest_statement { 
-        if (parseContext.boolErrorCheck($1.line, $3))
-            parseContext.recover();
-        $$ = parseContext.intermediate.addSelection($3, $5, $1.line);
-    }
-    ;
-
-selection_rest_statement 
-    : statement ELSE statement {
-        $$.node1 = $1;
-        $$.node2 = $3;
-    }
-    | statement { 
-        $$.node1 = $1;
-        $$.node2 = 0;
-    }
-    ;
-
-// Grammar Note:  No 'switch'.  Switch statements not supported.
-
-condition
-    // In 1996 c++ draft, conditions can include single declarations 
-    : expression {
-        $$ = $1;
-        if (parseContext.boolErrorCheck($1->getLine(), $1))
-            parseContext.recover();          
-    }
-    | fully_specified_type IDENTIFIER EQUAL initializer {
-        TIntermNode* intermNode;
-        if (parseContext.structQualifierErrorCheck($2.line, $1))
-            parseContext.recover();
-        if (parseContext.boolErrorCheck($2.line, $1))
-            parseContext.recover();
-        
-        if (!parseContext.executeInitializer($2.line, *$2.string, $1, $4, intermNode))
-            $$ = $4;
-        else {
-            parseContext.recover();
-            $$ = 0;
-        }
-    }
-    ;
-
-iteration_statement
-    : WHILE LEFT_PAREN { parseContext.symbolTable.push(); ++parseContext.loopNestingLevel; } condition RIGHT_PAREN statement_no_new_scope { 
-        parseContext.symbolTable.pop();
-        $$ = parseContext.intermediate.addLoop($6, $4, 0, true, $1.line);
-        --parseContext.loopNestingLevel;
-    }
-    | DO { ++parseContext.loopNestingLevel; } statement WHILE LEFT_PAREN expression RIGHT_PAREN SEMICOLON {
-        if (parseContext.boolErrorCheck($8.line, $6))
-            parseContext.recover();
-                    
-        $$ = parseContext.intermediate.addLoop($3, $6, 0, false, $4.line);
-        --parseContext.loopNestingLevel;
-    }
-    | FOR LEFT_PAREN { parseContext.symbolTable.push(); ++parseContext.loopNestingLevel; } for_init_statement for_rest_statement RIGHT_PAREN statement_no_new_scope {
-        parseContext.symbolTable.pop();
-        $$ = parseContext.intermediate.makeAggregate($4, $2.line);
-        $$ = parseContext.intermediate.growAggregate(
-                $$,
-                parseContext.intermediate.addLoop($7, reinterpret_cast<TIntermTyped*>($5.node1), reinterpret_cast<TIntermTyped*>($5.node2), true, $1.line),
-                $1.line);
-        $$->getAsAggregate()->setOperator(EOpSequence);
-        --parseContext.loopNestingLevel;
-    }
-    ;
-
-for_init_statement 
-    : expression_statement {
-        $$ = $1; 
-    } 
-    | declaration_statement {
-        $$ = $1;
-    }
-    ;
-
-conditionopt 
-    : condition { 
-        $$ = $1; 
-    }
-    | /* May be null */ { 
-        $$ = 0; 
-    }
-    ;
-
-for_rest_statement 
-    : conditionopt SEMICOLON { 
-        $$.node1 = $1;
-        $$.node2 = 0;
-    }
-    | conditionopt SEMICOLON expression  {
-        $$.node1 = $1;
-        $$.node2 = $3;
-    }
-    ;
-
-jump_statement
-    : CONTINUE SEMICOLON {
-        if (parseContext.loopNestingLevel <= 0) {
-            parseContext.error($1.line, "continue statement only allowed in loops", "", "");
-            parseContext.recover();
-        }        
-        $$ = parseContext.intermediate.addBranch(EOpContinue, $1.line);
-    }
-    | BREAK SEMICOLON {
-        if (parseContext.loopNestingLevel <= 0) {
-            parseContext.error($1.line, "break statement only allowed in loops", "", "");
-            parseContext.recover();
-        }        
-        $$ = parseContext.intermediate.addBranch(EOpBreak, $1.line);
-    }
-    | RETURN SEMICOLON {
-        $$ = parseContext.intermediate.addBranch(EOpReturn, $1.line);
-        if (parseContext.currentFunctionType->getBasicType() != EbtVoid) {
-            parseContext.error($1.line, "non-void function must return a value", "return", "");
-            parseContext.recover();
-        }
-    }
-    | RETURN expression SEMICOLON {        
-        $$ = parseContext.intermediate.addBranch(EOpReturn, $2, $1.line);
-        parseContext.functionReturnsValue = true;
-        if (parseContext.currentFunctionType->getBasicType() == EbtVoid) {
-            parseContext.error($1.line, "void function cannot return a value", "return", "");
-            parseContext.recover();
-        } else if (*(parseContext.currentFunctionType) != $2->getType()) {
-            parseContext.error($1.line, "function return is not matching type:", "return", "");
-            parseContext.recover();
-        }
-    }
-    | DISCARD SEMICOLON {
-        FRAG_ONLY("discard", $1.line);
-        $$ = parseContext.intermediate.addBranch(EOpKill, $1.line);
-    }        
-    ;
-
-// Grammar Note:  No 'goto'.  Gotos are not supported.
-
-translation_unit
-    : external_declaration { 
-        $$ = $1; 
-        parseContext.treeRoot = $$; 
-    }
-    | translation_unit external_declaration {
-        $$ = parseContext.intermediate.growAggregate($1, $2, 0);
-        parseContext.treeRoot = $$;
-    }
-    ;
-
-external_declaration
-    : function_definition { 
-        $$ = $1; 
-    }
-    | declaration { 
-        $$ = $1; 
-    }
-    ;
-
-function_definition
-    : function_prototype {
-        TFunction& function = *($1.function);
-        TFunction* prevDec = static_cast<TFunction*>(parseContext.symbolTable.find(function.getMangledName()));
-        //
-        // Note:  'prevDec' could be 'function' if this is the first time we've seen function
-        // as it would have just been put in the symbol table.  Otherwise, we're looking up
-        // an earlier occurance.
-        //
-        if (prevDec->isDefined()) {
-            //
-            // Then this function already has a body.
-            //
-            parseContext.error($1.line, "function already has a body", function.getName().c_str(), "");
-            parseContext.recover();
-        }
-        prevDec->setDefined();
-        
-        //
-        // Raise error message if main function takes any parameters or return anything other than void
-        //
-        if (function.getName() == "main") {
-            if (function.getParamCount() > 0) {
-                parseContext.error($1.line, "function cannot take any parameter(s)", function.getName().c_str(), "");
-                parseContext.recover();
-            }
-            if (function.getReturnType().getBasicType() != EbtVoid) {
-                parseContext.error($1.line, "", function.getReturnType().getBasicString(), "main function cannot return a value" );
-                parseContext.recover();
-            }            
-        }
-   
-        //
-        // New symbol table scope for body of function plus its arguments
-        //
-        parseContext.symbolTable.push();
-        
-        //
-        // Remember the return type for later checking for RETURN statements.
-        //
-        parseContext.currentFunctionType = &(prevDec->getReturnType());
-        parseContext.functionReturnsValue = false;
-        
-        // 
-        // Insert parameters into the symbol table.
-        // If the parameter has no name, it's not an error, just don't insert it 
-        // (could be used for unused args).
-        //
-        // Also, accumulate the list of parameters into the HIL, so lower level code
-        // knows where to find parameters.
-        //
-        TIntermAggregate* paramNodes = new TIntermAggregate;
-        for (int i = 0; i < function.getParamCount(); i++) {
-            TParameter& param = function[i];
-            if (param.name != 0) {
-                TVariable *variable = new TVariable(param.name, *param.type);
-                // 
-                // Insert the parameters with name in the symbol table.
-                //
-                if (! parseContext.symbolTable.insert(*variable)) {
-                    parseContext.error($1.line, "redefinition", variable->getName().c_str(), "");
-                    parseContext.recover();
-                    delete variable;
-                }
-                //
-                // Transfer ownership of name pointer to symbol table.
-                //
-                param.name = 0;
-                
-                //
-                // Add the parameter to the HIL
-                //                
-                paramNodes = parseContext.intermediate.growAggregate(
-                                               paramNodes, 
-                                               parseContext.intermediate.addSymbol(variable->getUniqueId(),
-                                                                       variable->getName(),
-                                                                       variable->getType(), $1.line), 
-                                               $1.line);
-            } else {
-                paramNodes = parseContext.intermediate.growAggregate(paramNodes, parseContext.intermediate.addSymbol(0, "", *param.type, $1.line), $1.line);
-            }
-        }
-        parseContext.intermediate.setAggregateOperator(paramNodes, EOpParameters, $1.line);
-        $1.intermAggregate = paramNodes;
-        parseContext.loopNestingLevel = 0;
-    }
-    compound_statement_no_new_scope {
-        //?? Check that all paths return a value if return type != void ?
-        //   May be best done as post process phase on intermediate code
-        if (parseContext.currentFunctionType->getBasicType() != EbtVoid && ! parseContext.functionReturnsValue) {
-            parseContext.error($1.line, "function does not return a value:", "", $1.function->getName().c_str());
-            parseContext.recover();
-        }
-        parseContext.symbolTable.pop();
-        $$ = parseContext.intermediate.growAggregate($1.intermAggregate, $3, 0);
-        parseContext.intermediate.setAggregateOperator($$, EOpFunction, $1.line);
-        $$->getAsAggregate()->setName($1.function->getMangledName().c_str());
-        $$->getAsAggregate()->setType($1.function->getReturnType());
-        
-        // store the pragma information for debug and optimize and other vendor specific 
-        // information. This information can be queried from the parse tree
-        $$->getAsAggregate()->setOptimize(parseContext.contextPragma.optimize);
-        $$->getAsAggregate()->setDebug(parseContext.contextPragma.debug);
-        $$->getAsAggregate()->addToPragmaTable(parseContext.contextPragma.pragmaTable);
-    }
-    ;
-
-%%
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang_tab.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang_tab.h
deleted file mode 100755
index 97d827fe9..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang_tab.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ATTRIBUTE = 258,
-     CONST_QUAL = 259,
-     BOOL_TYPE = 260,
-     FLOAT_TYPE = 261,
-     INT_TYPE = 262,
-     BREAK = 263,
-     CONTINUE = 264,
-     DO = 265,
-     ELSE = 266,
-     FOR = 267,
-     IF = 268,
-     DISCARD = 269,
-     RETURN = 270,
-     BVEC2 = 271,
-     BVEC3 = 272,
-     BVEC4 = 273,
-     IVEC2 = 274,
-     IVEC3 = 275,
-     IVEC4 = 276,
-     VEC2 = 277,
-     VEC3 = 278,
-     VEC4 = 279,
-     MATRIX2 = 280,
-     MATRIX3 = 281,
-     MATRIX4 = 282,
-     IN_QUAL = 283,
-     OUT_QUAL = 284,
-     INOUT_QUAL = 285,
-     UNIFORM = 286,
-     VARYING = 287,
-     STRUCT = 288,
-     VOID_TYPE = 289,
-     WHILE = 290,
-     SAMPLER1D = 291,
-     SAMPLER2D = 292,
-     SAMPLER3D = 293,
-     SAMPLERCUBE = 294,
-     SAMPLER1DSHADOW = 295,
-     SAMPLER2DSHADOW = 296,
-     IDENTIFIER = 297,
-     TYPE_NAME = 298,
-     FLOATCONSTANT = 299,
-     INTCONSTANT = 300,
-     BOOLCONSTANT = 301,
-     FIELD_SELECTION = 302,
-     LEFT_OP = 303,
-     RIGHT_OP = 304,
-     INC_OP = 305,
-     DEC_OP = 306,
-     LE_OP = 307,
-     GE_OP = 308,
-     EQ_OP = 309,
-     NE_OP = 310,
-     AND_OP = 311,
-     OR_OP = 312,
-     XOR_OP = 313,
-     MUL_ASSIGN = 314,
-     DIV_ASSIGN = 315,
-     ADD_ASSIGN = 316,
-     MOD_ASSIGN = 317,
-     LEFT_ASSIGN = 318,
-     RIGHT_ASSIGN = 319,
-     AND_ASSIGN = 320,
-     XOR_ASSIGN = 321,
-     OR_ASSIGN = 322,
-     SUB_ASSIGN = 323,
-     LEFT_PAREN = 324,
-     RIGHT_PAREN = 325,
-     LEFT_BRACKET = 326,
-     RIGHT_BRACKET = 327,
-     LEFT_BRACE = 328,
-     RIGHT_BRACE = 329,
-     DOT = 330,
-     COMMA = 331,
-     COLON = 332,
-     EQUAL = 333,
-     SEMICOLON = 334,
-     BANG = 335,
-     DASH = 336,
-     TILDE = 337,
-     PLUS = 338,
-     STAR = 339,
-     SLASH = 340,
-     PERCENT = 341,
-     LEFT_ANGLE = 342,
-     RIGHT_ANGLE = 343,
-     VERTICAL_BAR = 344,
-     CARET = 345,
-     AMPERSAND = 346,
-     QUESTION = 347
-   };
-#endif
-#define ATTRIBUTE 258
-#define CONST_QUAL 259
-#define BOOL_TYPE 260
-#define FLOAT_TYPE 261
-#define INT_TYPE 262
-#define BREAK 263
-#define CONTINUE 264
-#define DO 265
-#define ELSE 266
-#define FOR 267
-#define IF 268
-#define DISCARD 269
-#define RETURN 270
-#define BVEC2 271
-#define BVEC3 272
-#define BVEC4 273
-#define IVEC2 274
-#define IVEC3 275
-#define IVEC4 276
-#define VEC2 277
-#define VEC3 278
-#define VEC4 279
-#define MATRIX2 280
-#define MATRIX3 281
-#define MATRIX4 282
-#define IN_QUAL 283
-#define OUT_QUAL 284
-#define INOUT_QUAL 285
-#define UNIFORM 286
-#define VARYING 287
-#define STRUCT 288
-#define VOID_TYPE 289
-#define WHILE 290
-#define SAMPLER1D 291
-#define SAMPLER2D 292
-#define SAMPLER3D 293
-#define SAMPLERCUBE 294
-#define SAMPLER1DSHADOW 295
-#define SAMPLER2DSHADOW 296
-#define IDENTIFIER 297
-#define TYPE_NAME 298
-#define FLOATCONSTANT 299
-#define INTCONSTANT 300
-#define BOOLCONSTANT 301
-#define FIELD_SELECTION 302
-#define LEFT_OP 303
-#define RIGHT_OP 304
-#define INC_OP 305
-#define DEC_OP 306
-#define LE_OP 307
-#define GE_OP 308
-#define EQ_OP 309
-#define NE_OP 310
-#define AND_OP 311
-#define OR_OP 312
-#define XOR_OP 313
-#define MUL_ASSIGN 314
-#define DIV_ASSIGN 315
-#define ADD_ASSIGN 316
-#define MOD_ASSIGN 317
-#define LEFT_ASSIGN 318
-#define RIGHT_ASSIGN 319
-#define AND_ASSIGN 320
-#define XOR_ASSIGN 321
-#define OR_ASSIGN 322
-#define SUB_ASSIGN 323
-#define LEFT_PAREN 324
-#define RIGHT_PAREN 325
-#define LEFT_BRACKET 326
-#define RIGHT_BRACKET 327
-#define LEFT_BRACE 328
-#define RIGHT_BRACE 329
-#define DOT 330
-#define COMMA 331
-#define COLON 332
-#define EQUAL 333
-#define SEMICOLON 334
-#define BANG 335
-#define DASH 336
-#define TILDE 337
-#define PLUS 338
-#define STAR 339
-#define SLASH 340
-#define PERCENT 341
-#define LEFT_ANGLE 342
-#define RIGHT_ANGLE 343
-#define VERTICAL_BAR 344
-#define CARET 345
-#define AMPERSAND 346
-#define QUESTION 347
-
-
-
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 117 "glslang.y"
-typedef union YYSTYPE {
-    struct {
-        TSourceLoc line;
-        union {
-            TString *string;
-            float f;
-            int i;
-            bool b;
-        };
-        TSymbol* symbol;
-    } lex;
-    struct {
-        TSourceLoc line;
-        TOperator op;
-        union {
-            TIntermNode* intermNode;
-            TIntermNodePair nodePair;
-            TIntermTyped* intermTypedNode;
-            TIntermAggregate* intermAggregate;
-        };
-        union {
-            TPublicType type;
-            TQualifier qualifier;
-            TFunction* function;
-            TParameter param;
-            TTypeLine typeLine;
-            TTypeList* typeList;
-        };
-    } interm;
-} YYSTYPE;
-/* Line 1240 of yacc.c.  */
-#line 251 "glslang.tab.h"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/intermOut.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/intermOut.cpp
deleted file mode 100755
index e75608c45..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/intermOut.cpp
+++ /dev/null
@@ -1,496 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "localintermediate.h"
-#include "../Include/ShHandle.h"
-
-//
-// Two purposes:
-// 1.  Show an example of how to iterate tree.  Functions can
-//     also directly call Traverse() on children themselves to
-//     have finer grained control over the process than shown here.
-//     See the last function for how to get started.
-// 2.  Print out a text based description of the tree.
-//
-
-//
-// Use this class to carry along data from node to node in 
-// the traversal
-//
-class TOutputTraverser : public TIntermTraverser {
-public:
-    TOutputTraverser(TInfoSink& i) : infoSink(i) { }
-    TInfoSink& infoSink;
-};
-
-TString TType::getCompleteString() const
-{
-    char buf[100];
-    char *p = &buf[0];
-
-    if (qualifier != EvqTemporary && qualifier != EvqGlobal)
-        p += sprintf(p, "%s ", getQualifierString());
-    if (array)
-        p += sprintf(p, "array of ");
-    if (matrix)
-        p += sprintf(p, "%dX%d matrix of ", size, size);
-    else if (size > 1)
-        p += sprintf(p, "%d-component vector of ", size);
-
-    sprintf(p, "%s", getBasicString());
-
-    return TString(buf);
-}   
-
-//
-// Helper functions for printing, not part of traversing.
-//
-
-void OutputTreeText(TInfoSink& infoSink, TIntermNode* node, const int depth)
-{
-    int i;
-
-    infoSink.debug << FormatSourceLoc(node->getLine());
-    
-    for (i = 0; i < depth; ++i)
-        infoSink.debug << "  ";
-}
-
-//
-// The rest of the file are the traversal functions.  The last one
-// is the one that starts the traversal.
-//
-// Return true from interior nodes to have the external traversal
-// continue on to children.  If you process children yourself,
-// return false.
-//
-
-void OutputSymbol(TIntermSymbol* node, TIntermTraverser* it)
-{
-    TOutputTraverser* oit = static_cast<TOutputTraverser*>(it);
-
-    OutputTreeText(oit->infoSink, node, oit->depth);
-
-    char buf[100];
-    sprintf(buf, "'%s' (%s)\n",
-           node->getSymbol().c_str(),
-           node->getCompleteString().c_str());
-
-    oit->infoSink.debug << buf;
-}
-
-bool OutputBinary(bool /* preVisit */, TIntermBinary* node, TIntermTraverser* it)
-{
-    TOutputTraverser* oit = static_cast<TOutputTraverser*>(it);
-    TInfoSink& out = oit->infoSink;
-
-    OutputTreeText(out, node, oit->depth);
-
-    switch (node->getOp()) {
-    case EOpAssign:                   out.debug << "move second child to first child";           break;
-    case EOpAddAssign:                out.debug << "add second child into first child";          break;
-    case EOpSubAssign:                out.debug << "subtract second child into first child";     break;
-    case EOpMulAssign:                out.debug << "multiply second child into first child";     break;
-    case EOpVectorTimesMatrixAssign:  out.debug << "matrix mult second child into first child";  break;
-    case EOpVectorTimesScalarAssign:  out.debug << "vector scale second child into first child"; break;
-    case EOpMatrixTimesScalarAssign:  out.debug << "matrix scale second child into first child"; break;
-    case EOpMatrixTimesMatrixAssign:  out.debug << "matrix mult second child into first child"; break;
-    case EOpDivAssign:                out.debug << "divide second child into first child";       break;
-    case EOpModAssign:                out.debug << "mod second child into first child";          break;
-    case EOpAndAssign:                out.debug << "and second child into first child";          break;
-    case EOpInclusiveOrAssign:        out.debug << "or second child into first child";           break;
-    case EOpExclusiveOrAssign:        out.debug << "exclusive or second child into first child"; break;
-    case EOpLeftShiftAssign:          out.debug << "left shift second child into first child";   break;
-    case EOpRightShiftAssign:         out.debug << "right shift second child into first child";  break;
-
-    case EOpIndexDirect:   out.debug << "direct index";   break;
-    case EOpIndexIndirect: out.debug << "indirect index"; break;
-    case EOpIndexDirectStruct:   out.debug << "direct index for structure";   break;
-    case EOpVectorSwizzle: out.debug << "vector swizzle"; break;
-
-    case EOpAdd:    out.debug << "add";                     break;
-    case EOpSub:    out.debug << "subtract";                break;
-    case EOpMul:    out.debug << "component-wise multiply"; break;
-    case EOpDiv:    out.debug << "divide";                  break;
-    case EOpMod:    out.debug << "mod";                     break;
-    case EOpRightShift:  out.debug << "right-shift";  break;
-    case EOpLeftShift:   out.debug << "left-shift";   break;
-    case EOpAnd:         out.debug << "bitwise and";  break;
-    case EOpInclusiveOr: out.debug << "inclusive-or"; break;
-    case EOpExclusiveOr: out.debug << "exclusive-or"; break;
-    case EOpEqual:            out.debug << "Compare Equal";                 break;
-    case EOpNotEqual:         out.debug << "Compare Not Equal";             break;
-    case EOpLessThan:         out.debug << "Compare Less Than";             break;
-    case EOpGreaterThan:      out.debug << "Compare Greater Than";          break;
-    case EOpLessThanEqual:    out.debug << "Compare Less Than or Equal";    break;
-    case EOpGreaterThanEqual: out.debug << "Compare Greater Than or Equal"; break;
-
-    case EOpVectorTimesScalar: out.debug << "vector-scale";          break;
-    case EOpVectorTimesMatrix: out.debug << "vector-times-matrix";   break;
-    case EOpMatrixTimesVector: out.debug << "matrix-times-vector";   break;
-    case EOpMatrixTimesScalar: out.debug << "matrix-scale";          break;
-    case EOpMatrixTimesMatrix: out.debug << "matrix-multiply";       break;
-
-    case EOpLogicalOr:  out.debug << "logical-or";   break;
-    case EOpLogicalXor: out.debug << "logical-xor"; break;
-    case EOpLogicalAnd: out.debug << "logical-and"; break;
-    default: out.debug << "<unknown op>";
-    }
-
-    out.debug << " (" << node->getCompleteString() << ")";
-
-    out.debug << "\n";
-
-    return true;
-}
-
-bool OutputUnary(bool /* preVisit */, TIntermUnary* node, TIntermTraverser* it)
-{
-    TOutputTraverser* oit = static_cast<TOutputTraverser*>(it);
-    TInfoSink& out = oit->infoSink;
-
-    OutputTreeText(out, node, oit->depth);
-
-    switch (node->getOp()) {        
-    case EOpNegative:       out.debug << "Negate value";         break;
-    case EOpVectorLogicalNot:
-    case EOpLogicalNot:     out.debug << "Negate conditional";   break;
-    case EOpBitwiseNot:     out.debug << "Bitwise not";          break;
-
-    case EOpPostIncrement:  out.debug << "Post-Increment";       break;
-    case EOpPostDecrement:  out.debug << "Post-Decrement";       break;
-    case EOpPreIncrement:   out.debug << "Pre-Increment";        break;
-    case EOpPreDecrement:   out.debug << "Pre-Decrement";        break;
-
-    case EOpConvIntToBool:  out.debug << "Convert int to bool";  break;
-    case EOpConvFloatToBool:out.debug << "Convert float to bool";break;
-    case EOpConvBoolToFloat:out.debug << "Convert bool to float";break;
-    case EOpConvIntToFloat: out.debug << "Convert int to float"; break;
-    case EOpConvFloatToInt: out.debug << "Convert float to int"; break;
-    case EOpConvBoolToInt:  out.debug << "Convert bool to int";  break;
-
-    case EOpRadians:        out.debug << "radians";              break;
-    case EOpDegrees:        out.debug << "degrees";              break;
-    case EOpSin:            out.debug << "sine";                 break;
-    case EOpCos:            out.debug << "cosine";               break;
-    case EOpTan:            out.debug << "tangent";              break;
-    case EOpAsin:           out.debug << "arc sine";             break;
-    case EOpAcos:           out.debug << "arc cosine";           break;
-    case EOpAtan:           out.debug << "arc tangent";          break;
-
-    case EOpExp:            out.debug << "exp";                  break;
-    case EOpLog:            out.debug << "log";                  break;
-    case EOpExp2:           out.debug << "exp2";                 break;
-    case EOpLog2:           out.debug << "log2";                 break;
-    case EOpSqrt:           out.debug << "sqrt";                 break;
-    case EOpInverseSqrt:    out.debug << "inverse sqrt";         break;
-
-    case EOpAbs:            out.debug << "Absolute value";       break;
-    case EOpSign:           out.debug << "Sign";                 break;
-    case EOpFloor:          out.debug << "Floor";                break;
-    case EOpCeil:           out.debug << "Ceiling";              break;
-    case EOpFract:          out.debug << "Fraction";             break;
-
-    case EOpLength:         out.debug << "length";               break;
-    case EOpNormalize:      out.debug << "normalize";            break;
-    case EOpDPdx:           out.debug << "dPdx";                 break;               
-    case EOpDPdy:           out.debug << "dPdy";                 break;   
-    case EOpFwidth:         out.debug << "fwidth";               break;                   
-    
-    case EOpAny:            out.debug << "any";                  break;
-    case EOpAll:            out.debug << "all";                  break;
-
-    default: out.debug.message(EPrefixError, "Bad unary op");
-    }
-
-    out.debug << " (" << node->getCompleteString() << ")";
-
-    out.debug << "\n";
-
-    return true;
-}
-
-bool OutputAggregate(bool /* preVisit */, TIntermAggregate* node, TIntermTraverser* it)
-{
-    TOutputTraverser* oit = static_cast<TOutputTraverser*>(it);
-    TInfoSink& out = oit->infoSink;
-
-    if (node->getOp() == EOpNull) {
-        out.debug.message(EPrefixError, "node is still EOpNull!");
-        return true;
-    }
-
-    OutputTreeText(out, node, oit->depth);
-
-    switch (node->getOp()) {
-    case EOpSequence:      out.debug << "Sequence\n"; return true;
-    case EOpComma:         out.debug << "Comma\n"; return true;
-    case EOpFunction:      out.debug << "Function Definition: " << node->getName(); break;
-    case EOpFunctionCall:  out.debug << "Function Call: " << node->getName(); break;
-    case EOpParameters:    out.debug << "Function Parameters: ";              break;
-    
-    case EOpConstructFloat: out.debug << "Construct float"; break;
-    case EOpConstructVec2:  out.debug << "Construct vec2";  break;
-    case EOpConstructVec3:  out.debug << "Construct vec3";  break;
-    case EOpConstructVec4:  out.debug << "Construct vec4";  break;
-    case EOpConstructBool:  out.debug << "Construct bool";  break;
-    case EOpConstructBVec2: out.debug << "Construct bvec2"; break;
-    case EOpConstructBVec3: out.debug << "Construct bvec3"; break;
-    case EOpConstructBVec4: out.debug << "Construct bvec4"; break;
-    case EOpConstructInt:   out.debug << "Construct int";   break;
-    case EOpConstructIVec2: out.debug << "Construct ivec2"; break;
-    case EOpConstructIVec3: out.debug << "Construct ivec3"; break;
-    case EOpConstructIVec4: out.debug << "Construct ivec4"; break;
-    case EOpConstructMat2:  out.debug << "Construct mat2";  break;
-    case EOpConstructMat3:  out.debug << "Construct mat3";  break;
-    case EOpConstructMat4:  out.debug << "Construct mat4";  break;
-    case EOpConstructStruct:  out.debug << "Construct structure";  break;
-        
-    case EOpLessThan:         out.debug << "Compare Less Than";             break;
-    case EOpGreaterThan:      out.debug << "Compare Greater Than";          break;
-    case EOpLessThanEqual:    out.debug << "Compare Less Than or Equal";    break;
-    case EOpGreaterThanEqual: out.debug << "Compare Greater Than or Equal"; break;
-    case EOpVectorEqual:      out.debug << "Equal";                         break;
-    case EOpVectorNotEqual:   out.debug << "NotEqual";                      break;
-
-    case EOpMod:           out.debug << "mod";         break;
-    case EOpPow:           out.debug << "pow";         break;
-
-    case EOpAtan:          out.debug << "arc tangent"; break;
-
-    case EOpMin:           out.debug << "min";         break;
-    case EOpMax:           out.debug << "max";         break;
-    case EOpClamp:         out.debug << "clamp";       break;
-    case EOpMix:           out.debug << "mix";         break;
-    case EOpStep:          out.debug << "step";        break;
-    case EOpSmoothStep:    out.debug << "smoothstep";  break;
-
-    case EOpDistance:      out.debug << "distance";                break;
-    case EOpDot:           out.debug << "dot-product";             break;
-    case EOpCross:         out.debug << "cross-product";           break;
-    case EOpFaceForward:   out.debug << "face-forward";            break;
-    case EOpReflect:       out.debug << "reflect";                 break;
-    case EOpRefract:       out.debug << "refract";                 break;
-    case EOpMul:           out.debug << "component-wise multiply"; break;
-
-    case EOpItof:          out.debug << "itof";        break;
-    case EOpFtoi:          out.debug << "ftoi";        break;
-    case EOpSkipPixels:    out.debug << "skipPixels";  break;
-    case EOpReadInput:     out.debug << "readInput";   break;
-    case EOpWritePixel:    out.debug << "writePixel";  break;
-    case EOpBitmapLsb:     out.debug << "bitmapLSB";   break;
-    case EOpBitmapMsb:     out.debug << "bitmapMSB";   break;
-    case EOpWriteOutput:   out.debug << "writeOutput"; break;
-    case EOpReadPixel:     out.debug << "readPixel";   break;
-
-    default: out.debug.message(EPrefixError, "Bad aggregation op");
-    }
-
-    if (node->getOp() != EOpSequence && node->getOp() != EOpParameters)
-        out.debug << " (" << node->getCompleteString() << ")";
-    
-    out.debug << "\n";
-
-    return true;
-}
-
-bool OutputSelection(bool /* preVisit */, TIntermSelection* node, TIntermTraverser* it)
-{
-    TOutputTraverser* oit = static_cast<TOutputTraverser*>(it);
-    TInfoSink& out = oit->infoSink;
-
-    OutputTreeText(out, node, oit->depth);
-
-    out.debug << "Test condition and select";
-    out.debug << " (" << node->getCompleteString() << ")\n";
-    
-    ++oit->depth;
-    
-    OutputTreeText(oit->infoSink, node, oit->depth);
-    out.debug << "Condition\n";
-    node->getCondition()->traverse(it);
-
-    OutputTreeText(oit->infoSink, node, oit->depth);
-	if (node->getTrueBlock()) {
-		out.debug << "true case\n";
-		node->getTrueBlock()->traverse(it);
-	} else
-		out.debug << "true case is null\n";
-    
-    if (node->getFalseBlock()) {
-        OutputTreeText(oit->infoSink, node, oit->depth);
-        out.debug << "false case\n";
-        node->getFalseBlock()->traverse(it);
-    }
-    
-    --oit->depth;
-
-    return false;
-}
-
-void OutputConstantUnion(TIntermConstantUnion* node, TIntermTraverser* it)
-{
-    TOutputTraverser* oit = static_cast<TOutputTraverser*>(it);
-    TInfoSink& out = oit->infoSink;
-    
-    int size = 0;
-    if (node->getType().getBasicType() == EbtStruct)
-        size = node->getType().getStructSize();
-    else
-        size = node->getType().getInstanceSize();
-
-    for (int i = 0; i < size; i++) {
-        OutputTreeText(out, node, oit->depth);
-        switch (node->getType().getBasicType()) {
-        case EbtBool:
-            if (node->getUnionArrayPointer()[i].bConst)
-                out.debug << "true";
-            else
-                out.debug << "false";
-
-            out.debug << " (" << "const bool" << ")";
-
-            out.debug << "\n";
-            break;
-        case EbtFloat:
-            {
-                char buf[300];
-                sprintf(buf, "%f (%s)", node->getUnionArrayPointer()[i].fConst, "const float");
-
-                out.debug << buf << "\n";           
-            }
-            break;
-        case EbtInt:
-            {
-                char buf[300];
-                sprintf(buf, "%d (%s)", node->getUnionArrayPointer()[i].iConst, "const int");
-
-                out.debug << buf << "\n";
-                break;
-            }
-        default: 
-            out.info.message(EPrefixInternalError, "Unknown constant", node->getLine());
-            break;
-        }
-    }
-}
-
-bool OutputLoop(bool /* preVisit */, TIntermLoop* node, TIntermTraverser* it)
-{
-    TOutputTraverser* oit = static_cast<TOutputTraverser*>(it);
-    TInfoSink& out = oit->infoSink;
-
-    OutputTreeText(out, node, oit->depth);
-    
-    out.debug << "Loop with condition ";
-    if (! node->testFirst())
-        out.debug << "not ";
-    out.debug << "tested first\n";
-    
-    ++oit->depth;
-    
-    OutputTreeText(oit->infoSink, node, oit->depth);
-    if (node->getTest()) {
-        out.debug << "Loop Condition\n";
-        node->getTest()->traverse(it);
-    } else
-        out.debug << "No loop condition\n";
-    
-    OutputTreeText(oit->infoSink, node, oit->depth);
-    if (node->getBody()) {
-        out.debug << "Loop Body\n";
-        node->getBody()->traverse(it);
-    } else
-        out.debug << "No loop body\n";
-
-    if (node->getTerminal()) {
-        OutputTreeText(oit->infoSink, node, oit->depth);
-        out.debug << "Loop Terminal Expression\n";
-        node->getTerminal()->traverse(it);
-    }
-
-    --oit->depth;
-
-    return false;
-}
-
-bool OutputBranch(bool /* previsit*/, TIntermBranch* node, TIntermTraverser* it)
-{
-    TOutputTraverser* oit = static_cast<TOutputTraverser*>(it);
-    TInfoSink& out = oit->infoSink;
-
-    OutputTreeText(out, node, oit->depth);
-
-    switch (node->getFlowOp()) {
-    case EOpKill:      out.debug << "Branch: Kill";           break;
-    case EOpBreak:     out.debug << "Branch: Break";          break;
-    case EOpContinue:  out.debug << "Branch: Continue";       break;
-    case EOpReturn:    out.debug << "Branch: Return";         break;
-    default:               out.debug << "Branch: Unknown Branch"; break;
-    }
-
-    if (node->getExpression()) {
-        out.debug << " with expression\n";
-        ++oit->depth;
-        node->getExpression()->traverse(it);
-        --oit->depth;
-    } else
-        out.debug << "\n";
-
-    return false;
-}
-
-//
-// This function is the one to call externally to start the traversal.
-// Individual functions can be initialized to 0 to skip processing of that
-// type of node.  It's children will still be processed.
-//
-void TIntermediate::outputTree(TIntermNode* root)
-{
-    if (root == 0)
-        return;
-
-    TOutputTraverser it(infoSink);
-
-    it.visitAggregate = OutputAggregate;
-    it.visitBinary = OutputBinary;
-    it.visitConstantUnion = OutputConstantUnion;
-    it.visitSelection = OutputSelection;
-    it.visitSymbol = OutputSymbol;
-    it.visitUnary = OutputUnary;
-    it.visitLoop = OutputLoop;
-    it.visitBranch = OutputBranch;
-
-    root->traverse(&it);
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/localintermediate.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/localintermediate.h
deleted file mode 100755
index 5b4e5ea11..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/localintermediate.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef _LOCAL_INTERMEDIATE_INCLUDED_
-#define _LOCAL_INTERMEDIATE_INCLUDED_
-
-#include "../Include/intermediate.h"
-#include "../Public/ShaderLang.h"
-#include "SymbolTable.h"
-
-struct TVectorFields {
-    int offsets[4];
-    int num;
-};
-
-//
-// Set of helper functions to help parse and build the tree.
-//
-class TInfoSink;
-class TIntermediate {
-public:    
-    POOL_ALLOCATOR_NEW_DELETE(GlobalPoolAllocator)
-
-    TIntermediate(TInfoSink& i) : infoSink(i) { }
-    TIntermSymbol* addSymbol(int Id, const TString&, const TType&, TSourceLoc);
-    TIntermTyped* addConversion(TOperator, const TType&, TIntermTyped*);
-    TIntermTyped* addBinaryMath(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc, TSymbolTable&);
-    TIntermTyped* addAssign(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc);
-    TIntermTyped* addIndex(TOperator op, TIntermTyped* base, TIntermTyped* index, TSourceLoc);
-    TIntermTyped* addUnaryMath(TOperator op, TIntermNode* child, TSourceLoc, TSymbolTable&);
-    TIntermAggregate* growAggregate(TIntermNode* left, TIntermNode* right, TSourceLoc);
-    TIntermAggregate* makeAggregate(TIntermNode* node, TSourceLoc);
-    TIntermAggregate* setAggregateOperator(TIntermNode*, TOperator, TSourceLoc);
-    TIntermNode*  addSelection(TIntermTyped* cond, TIntermNodePair code, TSourceLoc);
-    TIntermTyped* addSelection(TIntermTyped* cond, TIntermTyped* trueBlock, TIntermTyped* falseBlock, TSourceLoc);
-    TIntermTyped* addComma(TIntermTyped* left, TIntermTyped* right, TSourceLoc);
-    TIntermConstantUnion* addConstantUnion(constUnion*, const TType&, TSourceLoc);
-    TIntermTyped* promoteConstantUnion(TBasicType, TIntermConstantUnion*) ;
-    TIntermTyped* copyConstUnion(TIntermConstantUnion*) ;
-    TIntermConstantUnion* changeAggrToTempConst(TIntermAggregate*, TSymbolTable&, TSourceLoc ); 
-    bool parseConstTree(TSourceLoc, TIntermNode*, constUnion*, TOperator, TSymbolTable&, TType, bool singleConstantParam = false);        
-    TIntermNode* addLoop(TIntermNode*, TIntermTyped*, TIntermTyped*, bool testFirst, TSourceLoc);
-    TIntermBranch* addBranch(TOperator, TSourceLoc);
-    TIntermBranch* addBranch(TOperator, TIntermTyped*, TSourceLoc);
-    TIntermTyped* addSwizzle(TVectorFields&, TSourceLoc);
-    bool postProcess(TIntermNode*, EShLanguage);
-	void remove(TIntermNode*);
-    void outputTree(TIntermNode*);
-    void removeChildNode(TIntermSequence&, TType&, int&, TIntermSequence::iterator&, TIntermAggregate*);
-    TIntermTyped* removeChildNode(TIntermTyped*, TType*, TIntermAggregate*);
-    bool removeMatrixConstNode(TIntermSequence&, TType&, TIntermAggregate*, int);
-    
-protected:
-    TInfoSink& infoSink;
-
-private:
-    void operator=(TIntermediate&); // prevent assignments
-};
-
-#endif // _LOCAL_INTERMEDIATE_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/parseConst.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/parseConst.cpp
deleted file mode 100755
index 1ea91b3c5..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/parseConst.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "ParseHelper.h"
-
-//
-// Use this class to carry along data from node to node in 
-// the traversal
-//
-class TConstTraverser : public TIntermTraverser {
-public:
-    TConstTraverser(constUnion* cUnion, bool singleConstParam, TOperator constructType, TInfoSink& sink, TSymbolTable& symTable, TType& t) : unionArray(cUnion), type(t),
-        constructorType(constructType), singleConstantParam(singleConstParam), infoSink(sink), symbolTable(symTable), error(false), isMatrix(false), matrixSize(0) {  index = 0; tOp = EOpNull;}
-    int index ;
-    constUnion *unionArray;
-    TOperator tOp;
-    TType type;
-    TOperator constructorType;
-    bool singleConstantParam;
-    TInfoSink& infoSink;
-    TSymbolTable& symbolTable;
-    bool error;
-    int size; // size of the constructor ( 4 for vec4)
-    bool isMatrix;
-    int matrixSize; // dimension of the matrix (nominal size and not the instance size)
-};
-
-//
-// The rest of the file are the traversal functions.  The last one
-// is the one that starts the traversal.
-//
-// Return true from interior nodes to have the external traversal
-// continue on to children.  If you process children yourself,
-// return false.
-//
-
-void ParseSymbol(TIntermSymbol* node, TIntermTraverser* it)
-{
-    TConstTraverser* oit = static_cast<TConstTraverser*>(it);
-    TQualifier qualifier = node->getType().getQualifier();
-    constUnion* unionArray = oit->unionArray;
-    int instanceSize;
-    if (oit->type.getBasicType() == EbtStruct)
-        instanceSize = oit->type.getStructSize();
-    else
-        instanceSize = oit->type.getInstanceSize();
-
-    if (oit->index >= instanceSize)
-        return;
-
-    if (qualifier != EvqConst) {
-        char buf[200];
-        sprintf(buf, "'constructor' : assigning non-constant to %s", oit->type.getCompleteString().c_str());
-        oit->infoSink.info.message(EPrefixError, buf, node->getLine());
-        oit->error = true;
-        return ;  
-    }
-    TSymbol* symbol = oit->symbolTable.find(node->getSymbol());
-    TVariable* tVar = static_cast<TVariable*>(symbol);
-
-    constUnion* constArray = tVar->getConstPointer();
-    if (!constArray) {
-        char buf[200];
-        sprintf(buf, "'constructor' : constant '%s' has not been initialized correctly", node->getSymbol().c_str());
-        oit->infoSink.info.message(EPrefixError, buf, node->getLine());
-        oit->error = true;
-        return;
-    }
-    int symbolSize;
-
-    if (tVar->getType().getBasicType() == EbtStruct)
-        symbolSize = tVar->getType().getStructSize();
-    else 
-        symbolSize = tVar->getType().getInstanceSize();
-    
-    // for constructors such as ivec4(vec4), if vec4 is a symbol node, then the appropriate conversion is required as the
-    // types do not match
-    for (int i = 0; i < symbolSize; i++) {
-        if (oit->index >= instanceSize)
-            return;
-        if (tVar->getType().getBasicType() == oit->type.getBasicType() || oit->type.getBasicType() == EbtStruct)
-            (unionArray[oit->index]) = constArray[i];
-        else {
-            switch (tVar->getType().getBasicType()) {
-            case EbtFloat:
-                switch (oit->type.getBasicType()) {
-                case EbtInt:  unionArray[oit->index].iConst = static_cast<int> (constArray[i].fConst);  break;
-                case EbtBool: unionArray[oit->index].bConst = constArray[i].fConst != 0.0; break;    
-                default: oit->infoSink.info.message(EPrefixInternalError, "Incorrect type, cannot parse symbol", node->getLine()); break;
-                }
-                break;
-            case EbtInt:
-                switch (oit->type.getBasicType()) {
-                case EbtFloat:  unionArray[oit->index].fConst = static_cast<float>(constArray[i].iConst);  break;
-                case EbtBool: unionArray[oit->index].bConst = constArray[i].iConst != 0 ; break;    
-                default: oit->infoSink.info.message(EPrefixInternalError, "Incorrect type, cannot parse symbol", node->getLine()); break;
-                }
-                break;
-            case EbtBool:
-                switch (oit->type.getBasicType()) {
-                case EbtFloat:  unionArray[oit->index].fConst = static_cast<float>(constArray[i].bConst);  break;
-                case EbtInt: unionArray[oit->index].iConst = static_cast<int> (constArray[i].bConst); break;    
-                default: oit->infoSink.info.message(EPrefixInternalError, "Incorrect type, cannot parse symbol", node->getLine()); break;
-                }
-                break;
-            default: oit->infoSink.info.message(EPrefixInternalError, "Incorrect type, cannot parse symbol", node->getLine()); break;
-            } 
-        }
-    (oit->index)++;
-    }
-}
-
-bool ParseBinary(bool /* preVisit */, TIntermBinary* node, TIntermTraverser* it)
-{
-    TConstTraverser* oit = static_cast<TConstTraverser*>(it);
-    
-    TQualifier qualifier = node->getType().getQualifier();
-    
-    if (qualifier != EvqConst) {
-        char buf[200];
-        sprintf(buf, "'constructor' : assigning non-constant to %s", oit->type.getCompleteString().c_str());
-        oit->infoSink.info.message(EPrefixError, buf, node->getLine());
-        oit->error = true;
-        return false;  
-    }
-
-   oit->infoSink.info.message(EPrefixInternalError, "Binary Node found in constant constructor", node->getLine());
-    
-    return false;
-}
-
-bool ParseUnary(bool /* preVisit */, TIntermUnary* node, TIntermTraverser* it)
-{
-    TConstTraverser* oit = static_cast<TConstTraverser*>(it);
-
-    char buf[200];
-    sprintf(buf, "'constructor' : assigning non-constant to '%s'", oit->type.getCompleteString().c_str());
-    oit->infoSink.info.message(EPrefixError, buf, node->getLine());
-    oit->error = true;
-    return false;  
-}
-
-bool ParseAggregate(bool /* preVisit */, TIntermAggregate* node, TIntermTraverser* it)
-{
-    TConstTraverser* oit = static_cast<TConstTraverser*>(it);
-
-    if (!node->isConstructor() && node->getOp() != EOpComma) {
-        char buf[200];
-        sprintf(buf, "'constructor' : assigning non-constant to '%s'", oit->type.getCompleteString().c_str());
-        oit->infoSink.info.message(EPrefixError, buf, node->getLine());
-        oit->error = true;
-        return false;  
-    }
-
-    if (node->getSequence().size() == 0) {
-        oit->error = true;
-        return false;
-    }
-
-    bool flag = node->getSequence().size() == 1 && node->getSequence()[0]->getAsTyped()->getAsConstantUnion();
-    if (flag) 
-    {
-        oit->singleConstantParam = true; 
-        oit->constructorType = node->getOp();
-        if (node->getType().getBasicType() == EbtStruct)
-            oit->size = node->getType().getStructSize();
-        else
-            oit->size = node->getType().getInstanceSize();
-        if (node->getType().isMatrix()) {
-            oit->isMatrix = true;
-            oit->matrixSize = node->getType().getNominalSize();
-        }
-    }       
-
-    for (TIntermSequence::iterator p = node->getSequence().begin(); 
-                                   p != node->getSequence().end(); p++) {
-
-        if (node->getOp() == EOpComma)
-            oit->index = 0;           
-
-        (*p)->traverse(oit);
-    }   
-    if (flag) 
-    {
-        oit->singleConstantParam = false;   
-        oit->constructorType = EOpNull;
-        oit->size = 0;
-        oit->isMatrix = false;
-        oit->matrixSize = 0;
-    }
-    return false;
-}
-
-bool ParseSelection(bool /* preVisit */, TIntermSelection* node, TIntermTraverser* it)
-{
-    TConstTraverser* oit = static_cast<TConstTraverser*>(it);
-    oit->infoSink.info.message(EPrefixInternalError, "Selection Node found in constant constructor", node->getLine());
-    oit->error = true;
-    return false;
-}
-
-void ParseConstantUnion(TIntermConstantUnion* node, TIntermTraverser* it)
-{
-    TConstTraverser* oit = static_cast<TConstTraverser*>(it);
-    constUnion* leftUnionArray = oit->unionArray;
-    int instanceSize;
-    if (oit->type.getBasicType() == EbtStruct)
-        instanceSize = oit->type.getStructSize();
-    else
-        instanceSize = oit->type.getInstanceSize();
-
-    if (oit->index >= instanceSize)
-        return;
-
-    if (!oit->singleConstantParam) {
-        int size;
-        if (node->getType().getBasicType() == EbtStruct)
-            size = node->getType().getStructSize();
-        else
-            size = node->getType().getInstanceSize();
-    
-        constUnion *rightUnionArray = node->getUnionArrayPointer();
-        for (int i=0; i < size; i++) {
-            if (oit->index >= instanceSize)
-                return;
-            leftUnionArray[oit->index] = rightUnionArray[i];
-
-            (oit->index)++;
-        }
-    } else {
-        int size, totalSize, matrixSize;
-        bool isMatrix = false;
-        size = oit->size;
-        matrixSize = oit->matrixSize;
-        isMatrix = oit->isMatrix;
-        totalSize = oit->index + size ;
-        constUnion *rightUnionArray = node->getUnionArrayPointer();
-        if (!isMatrix) {
-            int count = 0;
-            for (int i = oit->index; i < totalSize; i++) {
-                if (i >= instanceSize)
-                    return;
-
-                leftUnionArray[i] = rightUnionArray[count];
-
-                (oit->index)++;
-                if (node->getType().getBasicType() == EbtStruct && node->getType().getStructSize() > 1 ||
-                    node->getType().getBasicType() != EbtStruct && node->getType().getInstanceSize() > 1)
-                    count++;                
-            }
-        } else {  // for matrix constructors
-            int count = 0;
-            int index = oit->index;
-            for (int i = index; i < totalSize; i++) {
-                if (i >= instanceSize)
-                    return;
-                if (index - i == 0 || (i - index) % (matrixSize + 1) == 0 )
-                    leftUnionArray[i] = rightUnionArray[count];
-                else 
-                    leftUnionArray[i].fConst = 0.0;
-
-                (oit->index)++;
-                if (node->getType().getBasicType() == EbtStruct && node->getType().getStructSize() > 1 ||
-                    node->getType().getBasicType() != EbtStruct && node->getType().getInstanceSize() > 1)
-                    count++;                
-            }
-        }
-    }
-}
-
-bool ParseLoop(bool /* preVisit */, TIntermLoop* node, TIntermTraverser* it)
-{
-    TConstTraverser* oit = static_cast<TConstTraverser*>(it);
-    oit->infoSink.info.message(EPrefixInternalError, "Loop Node found in constant constructor", node->getLine());
-    oit->error = true;
-    return false;
-}
-
-bool ParseBranch(bool /* previsit*/, TIntermBranch* node, TIntermTraverser* it)
-{
-    TConstTraverser* oit = static_cast<TConstTraverser*>(it);
-    oit->infoSink.info.message(EPrefixInternalError, "Branch Node found in constant constructor", node->getLine());
-    oit->error = true;
-    return false;
-}
-
-//
-// This function is the one to call externally to start the traversal.
-// Individual functions can be initialized to 0 to skip processing of that
-// type of node.  It's children will still be processed.
-//
-bool TIntermediate::parseConstTree(TSourceLoc line, TIntermNode* root, constUnion* unionArray, TOperator constructorType, TSymbolTable& symbolTable, TType t, bool singleConstantParam)
-{
-    if (root == 0)
-        return false;
-
-    TConstTraverser it(unionArray, singleConstantParam, constructorType, infoSink, symbolTable, t);
-    
-    it.visitAggregate = ParseAggregate;
-    it.visitBinary = ParseBinary;
-    it.visitConstantUnion = ParseConstantUnion;
-    it.visitSelection = ParseSelection;
-    it.visitSymbol = ParseSymbol;
-    it.visitUnary = ParseUnary;
-    it.visitLoop = ParseLoop;
-    it.visitBranch = ParseBranch;
-
-    root->traverse(&it);
-    if (it.error)
-        return true;
-    else
-        return false;
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.c
deleted file mode 100755
index b409c99bb..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.c
+++ /dev/null
@@ -1,768 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-
-/* */
-/* atom.c */
-/* */
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "slglobals.h"
-
-#undef malloc
-#undef realloc
-#undef free
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*//////////////////////////////////////// String table: ////////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-
-static const struct {
-    int val;
-    const char *str;
-} tokens[] = {
-    { CPP_AND_OP,         "&&" },
-    { CPP_AND_ASSIGN,     "&=" },
-    { CPP_SUB_ASSIGN,     "-=" },
-    { CPP_MOD_ASSIGN,     "%=" },
-    { CPP_ADD_ASSIGN,     "+=" },
-    { CPP_DIV_ASSIGN,     "/=" },
-    { CPP_MUL_ASSIGN,     "*=" },
-    { CPP_RIGHT_BRACKET,  ":>" },
-    { CPP_EQ_OP,          "==" },
-    { CPP_XOR_OP,         "^^" }, 
-    { CPP_XOR_ASSIGN,     "^=" }, 
-    { CPP_FLOATCONSTANT,  "<float-const>" },
-    { CPP_GE_OP,          ">=" },
-    { CPP_RIGHT_OP,       ">>" },
-    { CPP_RIGHT_ASSIGN,   ">>=" }, 
-    { CPP_IDENTIFIER,     "<ident>" },
-    { CPP_INTCONSTANT,    "<int-const>" },
-    { CPP_LE_OP,          "<=" },
-    { CPP_LEFT_OP,        "<<" },
-    { CPP_LEFT_ASSIGN,    "<<=" },
-    { CPP_LEFT_BRACKET,   "<:" },
-    { CPP_LEFT_BRACE,     "<%" }, 
-    { CPP_DEC_OP,         "--" },
-    { CPP_RIGHT_BRACE,    "%>" }, 
-    { CPP_NE_OP,          "!=" },
-    { CPP_OR_OP,          "||" },
-    { CPP_OR_ASSIGN,      "|=" }, 
-    { CPP_INC_OP,         "++" },
-    { CPP_STRCONSTANT,    "<string-const>" },
-    { CPP_TYPEIDENTIFIER, "<type-ident>" },
-};
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*//////////////////////////////////////// String table: ////////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-
-#define INIT_STRING_TABLE_SIZE 16384
-
-typedef struct StringTable_Rec {
-    char *strings;
-    int nextFree;
-    int size;
-} StringTable;
-
-/*
- * InitStringTable() - Initialize the string table.
- *
- */
-
-static int InitStringTable(StringTable *stable)
-{
-    stable->strings = (char *) malloc(INIT_STRING_TABLE_SIZE);
-    if (!stable->strings)
-        return 0;
-    /* Zero-th offset means "empty" so don't use it. */
-    stable->nextFree = 1;
-    stable->size = INIT_STRING_TABLE_SIZE;
-    return 1;
-} /* InitStringTable */
-
-/*
- * FreeStringTable() - Free the string table.
- *
- */
-
-static void FreeStringTable(StringTable *stable)
-{
-    if (stable->strings)
-        free(stable->strings);
-    stable->strings = NULL;
-    stable->nextFree = 0;
-    stable->size = 0;
-} /* FreeStringTable */
-
-/*
- * HashString() - Hash a string with the base hash function.
- *
- */
-
-static int HashString(const char *s)
-{
-    int hval = 0;
-
-    while (*s) {
-        hval = (hval*13507 + *s*197) ^ (hval >> 2);
-        s++;
-    }
-    return hval & 0x7fffffff;
-} /* HashString */
-
-/*
- * HashString2() - Hash a string with the incrimenting hash function.
- *
- */
-
-static int HashString2(const char *s)
-{
-    int hval = 0;
-
-    while (*s) {
-        hval = (hval*729 + *s*37) ^ (hval >> 1);
-        s++;
-    }
-    return hval;
-} /* HashString2 */
-
-/*
- * AddString() - Add a string to a string table.  Return it's offset.
- *
- */
-
-static int AddString(StringTable *stable, const char *s)
-{
-    int len, loc;
-    char *str;
-
-    len = (int) strlen(s);
-    if (stable->nextFree + len + 1 >= stable->size) {
-        assert(stable->size < 1000000);
-        str = (char *) malloc(stable->size*2);
-        memcpy(str, stable->strings, stable->size);
-        free(stable->strings);
-        stable->strings = str;
-    }
-    loc = stable->nextFree;
-    strcpy(&stable->strings[loc], s);
-    stable->nextFree += len + 1;
-    return loc;
-} /* AddString */
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*///////////////////////////////////////// Hash table: /////////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-
-#define INIT_HASH_TABLE_SIZE 2047
-#define HASH_TABLE_MAX_COLLISIONS 3
-
-typedef struct HashEntry_Rec {
-    int index;      /* String table offset of string representation */
-    int value;      /* Atom (symbol) value */
-} HashEntry;
-
-typedef struct HashTable_Rec {
-    HashEntry *entry;
-    int size;
-    int entries;
-    int counts[HASH_TABLE_MAX_COLLISIONS + 1];
-} HashTable;
-
-/*
- * InitHashTable() - Initialize the hash table.
- *
- */
-
-static int InitHashTable(HashTable *htable, int fsize)
-{
-    int ii;
-
-    htable->entry = (HashEntry *) malloc(sizeof(HashEntry)*fsize);
-    if (!htable->entry)
-        return 0;
-    htable->size = fsize;
-    for (ii = 0; ii < fsize; ii++) {
-        htable->entry[ii].index = 0;
-        htable->entry[ii].value = 0;
-    }
-    htable->entries = 0;
-    for (ii = 0; ii <= HASH_TABLE_MAX_COLLISIONS; ii++)
-        htable->counts[ii] = 0;
-    return 1;
-} /* InitHashTable */
-
-/*
- * FreeHashTable() - Free the hash table.
- *
- */
-
-static void FreeHashTable(HashTable *htable)
-{
-    if (htable->entry)
-        free(htable->entry);
-    htable->entry = NULL;
-    htable->size = 0;
-    htable->entries = 0;
-} /* FreeHashTable */
-
-/*
- * Empty() - See if a hash table entry is empty.
- *
- */
-
-static int Empty(HashTable *htable, int hashloc)
-{
-    assert(hashloc >= 0 && hashloc < htable->size);
-    if (htable->entry[hashloc].index == 0) {
-        return 1;
-    } else {
-        return 0;
-    }
-} /* Empty */
-
-/*
- * Match() - See if a hash table entry is matches a string.
- *
- */
-
-static int Match(HashTable *htable, StringTable *stable, const char *s, int hashloc)
-{
-    int strloc;
-
-    strloc = htable->entry[hashloc].index;
-    if (!strcmp(s, &stable->strings[strloc])) {
-        return 1;
-    } else {
-        return 0;
-    }
-} /* Match */
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*///////////////////////////////////////// Atom table: /////////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-
-#define INIT_ATOM_TABLE_SIZE 1024
-
-
-struct AtomTable_Rec {
-    StringTable stable; /* String table. */
-    HashTable htable;   /* Hashes string to atom number and token value.  Multiple strings can */
-                        /* have the same token value but each unique string is a unique atom. */
-    int *amap;          /* Maps atom value to offset in string table.  Atoms all map to unique */
-                        /* strings except for some undefined values in the lower, fixed part */
-                        /* of the atom table that map to "<undefined>".  The lowest 256 atoms */
-                        /* correspond to single character ASCII values except for alphanumeric */
-                        /* characters and '_', which can be other tokens.  Next come the */
-                        /* language tokens with their atom values equal to the token value. */
-                        /* Then come predefined atoms, followed by user specified identifiers. */
-    int *arev;          /* Reversed atom for symbol table use. */
-    int nextFree;
-    int size;
-};
-
-static AtomTable latable = { { 0 } };
-AtomTable *atable = &latable;
-
-static int AddAtomFixed(AtomTable *atable, const char *s, int atom);
-
-/*
- * GrowAtomTable() - Grow the atom table to at least "size" if it's smaller.
- *
- */
-
-static int GrowAtomTable(AtomTable *atable, int size)
-{
-    int *newmap, *newrev;
-
-    if (atable->size < size) {
-        if (atable->amap) {
-            newmap = realloc(atable->amap, sizeof(int)*size);
-            newrev = realloc(atable->arev, sizeof(int)*size);
-        } else {
-            newmap = malloc(sizeof(int)*size);
-            newrev = malloc(sizeof(int)*size);
-            atable->size = 0;
-        }
-        if (!newmap || !newrev) {
-            /* failed to grow -- error */
-            if (newmap)
-                atable->amap = newmap;
-            if (newrev)
-                atable->amap = newrev;
-            return -1;
-        }
-        memset(&newmap[atable->size], 0, (size - atable->size) * sizeof(int));
-        memset(&newrev[atable->size], 0, (size - atable->size) * sizeof(int));
-        atable->amap = newmap;
-        atable->arev = newrev;
-        atable->size = size;
-    }
-    return 0;
-} /* GrowAtomTable */
-
-/*
- * lReverse() - Reverse the bottom 20 bits of a 32 bit int.
- *
- */
-
-static int lReverse(int fval)
-{
-    unsigned int in = fval;
-    int result = 0, cnt = 0;
-
-    while(in) {
-        result <<= 1;
-        result |= in&1;
-        in >>= 1;
-        cnt++;
-    }
-
-    /* Don't use all 31 bits.  One million atoms is plenty and sometimes the */
-    /* upper bits are used for other things. */
-
-    if (cnt < 20)
-        result <<= 20 - cnt;
-    return result;
-} /* lReverse */
-
-/*
- * AllocateAtom() - Allocate a new atom.  Associated with the "undefined" value of -1.
- *
- */
-
-static int AllocateAtom(AtomTable *atable)
-{
-    if (atable->nextFree >= atable->size)
-        GrowAtomTable(atable, atable->nextFree*2);
-    atable->amap[atable->nextFree] = -1;
-    atable->arev[atable->nextFree] = lReverse(atable->nextFree);
-    atable->nextFree++;
-    return atable->nextFree - 1;
-} /* AllocateAtom */
-
-/*
- * SetAtomValue() - Allocate a new atom associated with "hashindex".
- *
- */
-
-static void SetAtomValue(AtomTable *atable, int atomnumber, int hashindex)
-{
-    atable->amap[atomnumber] = atable->htable.entry[hashindex].index;
-    atable->htable.entry[hashindex].value = atomnumber;
-} /* SetAtomValue */
-
-/*
- * FindHashLoc() - Find the hash location for this string.  Return -1 it hash table is full.
- *
- */
-
-static int FindHashLoc(AtomTable *atable, const char *s)
-{
-    int hashloc, hashdelta, count;
-    int FoundEmptySlot = 0;
-    int collision[HASH_TABLE_MAX_COLLISIONS + 1];
-
-    hashloc = HashString(s) % atable->htable.size;
-    if (!Empty(&atable->htable, hashloc)) {
-        if (Match(&atable->htable, &atable->stable, s, hashloc))
-            return hashloc;
-        collision[0] = hashloc;
-        hashdelta = HashString2(s);
-        count = 0;
-        while (count < HASH_TABLE_MAX_COLLISIONS) {
-            hashloc = ((hashloc + hashdelta) & 0x7fffffff) % atable->htable.size;
-            if (!Empty(&atable->htable, hashloc)) {
-                if (Match(&atable->htable, &atable->stable, s, hashloc)) {
-                    return hashloc;
-                }
-            } else {
-                FoundEmptySlot = 1;
-                break;
-            }
-            count++;
-            collision[count] = hashloc;
-        }
-
-        if (!FoundEmptySlot) {
-            if (cpp->options.DumpAtomTable) {
-                int ii;
-                char str[200];
-                sprintf(str, "*** Hash failed with more than %d collisions. Must increase hash table size. ***",
-                       HASH_TABLE_MAX_COLLISIONS);
-                CPPShInfoLogMsg(str);
-
-                sprintf(str, "*** New string \"%s\", hash=%04x, delta=%04x", s, collision[0], hashdelta);
-                CPPShInfoLogMsg(str);
-                for (ii = 0; ii <= HASH_TABLE_MAX_COLLISIONS; ii++) {
-                    sprintf(str, "*** Collides on try %d at hash entry %04x with \"%s\"",
-                           ii + 1, collision[ii], GetAtomString(atable, atable->htable.entry[collision[ii]].value));
-                    CPPShInfoLogMsg(str);
-                }
-            }
-            return -1;
-        } else {
-            atable->htable.counts[count]++;
-        }
-    }
-    return hashloc;
-} /* FindHashLoc */
-
-/*
- * IncreaseHashTableSize()
- *
- */
-
-static int IncreaseHashTableSize(AtomTable *atable)
-{
-    int ii, strloc, oldhashloc, value, size;
-    AtomTable oldtable;
-    char *s;
-
-    /* Save the old atom table and create a new one: */
-
-    oldtable = *atable;
-    size = oldtable.htable.size*2 + 1;
-    if (!InitAtomTable(atable, size))
-        return 0;
-
-    /* Add all the existing values to the new atom table preserving their atom values: */
-
-    for (ii = atable->nextFree; ii < oldtable.nextFree; ii++) {
-        strloc = oldtable.amap[ii];
-        s = &oldtable.stable.strings[strloc];
-        oldhashloc = FindHashLoc(&oldtable, s);
-        assert(oldhashloc >= 0);
-        value = oldtable.htable.entry[oldhashloc].value;
-        AddAtomFixed(atable, s, value);
-    }
-    FreeAtomTable(&oldtable);
-    return 1;
-} /* IncreaseHashTableSize */
-
-/*
- * LookUpAddStringHash() - Lookup a string in the hash table.  If it's not there, add it and
- *        initialize the atom value in the hash table to 0.  Return the hash table index.
- */
-
-static int LookUpAddStringHash(AtomTable *atable, const char *s)
-{
-    int hashloc, strloc;
-
-    while(1) {
-        hashloc = FindHashLoc(atable, s);
-        if (hashloc >= 0)
-            break;
-        IncreaseHashTableSize(atable);
-    }
-
-    if (Empty(&atable->htable, hashloc)) {
-        atable->htable.entries++;
-        strloc = AddString(&atable->stable, s);
-        atable->htable.entry[hashloc].index = strloc;
-        atable->htable.entry[hashloc].value = 0;
-    }
-    return hashloc;
-} /* LookUpAddStringHash */
-
-/*
- * LookUpAddString() - Lookup a string in the hash table.  If it's not there, add it and
- *        initialize the atom value in the hash table to the next atom number.
- *        Return the atom value of string.
- */
-
-int LookUpAddString(AtomTable *atable, const char *s)
-{
-    int hashindex, atom;
-
-    hashindex = LookUpAddStringHash(atable, s);
-    atom = atable->htable.entry[hashindex].value;
-    if (atom == 0) {
-        atom = AllocateAtom(atable);
-        SetAtomValue(atable, atom, hashindex);
-    }
-    return atom;
-} /* LookUpAddString */
-
-/*
- * GetAtomString()
- *
- */
-
-const  char *GetAtomString(AtomTable *atable, int atom)
-{
-    int soffset;
-
-    if (atom > 0 && atom < atable->nextFree) {
-        soffset = atable->amap[atom];
-        if (soffset > 0 && soffset < atable->stable.nextFree) {
-            return &atable->stable.strings[soffset];
-        } else {
-            return "<internal error: bad soffset>";
-        }
-    } else {
-        if (atom == 0) {
-            return "<null atom>";
-        } else {
-            if (atom == EOF) {
-                return "<EOF>";
-            } else {
-                return "<invalid atom>";
-            }
-        }
-    }
-} /* GetAtomString */
-
-/*
- * GetReversedAtom()
- *
- */
-
-int GetReversedAtom(AtomTable *atable, int atom)
-{
-    if (atom > 0 && atom < atable->nextFree) {
-        return atable->arev[atom];
-    } else {
-        return 0;
-    }
-} /* GetReversedAtom */
-
-/*
- * AddAtom() - Add a string to the atom, hash and string tables if it isn't already there.
- *         Return it's atom index.
- */
-
-int AddAtom(AtomTable *atable, const char *s)
-{
-    int atom;
-
-    atom = LookUpAddString(atable, s);
-    return atom;
-} /* AddAtom */
-
-/*
- * AddAtomFixed() - Add an atom to the hash and string tables if it isn't already there.
- *         Assign it the atom value of "atom".
- */
-
-static int AddAtomFixed(AtomTable *atable, const char *s, int atom)
-{
-    int hashindex, lsize;
-
-    hashindex = LookUpAddStringHash(atable, s);
-    if (atable->nextFree >= atable->size || atom >= atable->size) {
-        lsize = atable->size*2;
-        if (lsize <= atom)
-            lsize = atom + 1;
-        GrowAtomTable(atable, lsize);
-    }
-    atable->amap[atom] = atable->htable.entry[hashindex].index;
-    atable->htable.entry[hashindex].value = atom;
-    /*if (atom >= atable->nextFree) */
-    /*    atable->nextFree = atom + 1; */
-    while (atom >= atable->nextFree) {
-        atable->arev[atable->nextFree] = lReverse(atable->nextFree);
-        atable->nextFree++;
-    }
-    return atom;
-} /* AddAtomFixed */
-
-/*
- * InitAtomTable() - Initialize the atom table.
- *
- */
-
-int InitAtomTable(AtomTable *atable, int htsize)
-{
-    int ii;
-
-    htsize = htsize <= 0 ? INIT_HASH_TABLE_SIZE : htsize;
-    if (!InitStringTable(&atable->stable))
-        return 0;
-    if (!InitHashTable(&atable->htable, htsize))
-        return 0;
-
-    atable->nextFree = 0;
-    atable->amap = NULL;
-    atable->size = 0;
-    GrowAtomTable(atable, INIT_ATOM_TABLE_SIZE);
-    if (!atable->amap)
-        return 0;
-
-    /* Initialize lower part of atom table to "<undefined>" atom: */
-
-    AddAtomFixed(atable, "<undefined>", 0);
-    for (ii = 0; ii < FIRST_USER_TOKEN_SY; ii++)
-        atable->amap[ii] = atable->amap[0];
-
-    /* Add single character tokens to the atom table: */
-
-    {
-		const char *s = "~!%^&*()-+=|,.<>/?;:[]{}#";
-        char t[2];
-
-        t[1] = '\0';
-        while (*s) {
-            t[0] = *s;
-            AddAtomFixed(atable, t, s[0]);
-            s++;
-        }
-    }
-
-    /* Add multiple character scanner tokens : */
-
-    for (ii = 0; ii < sizeof(tokens)/sizeof(tokens[0]); ii++)
-        AddAtomFixed(atable, tokens[ii].str, tokens[ii].val);
-
-    /* Add error symbol if running in error mode: */
-
-    if (cpp->options.ErrorMode)
-        AddAtomFixed(atable, "error", ERROR_SY);
-
-    AddAtom(atable, "<*** end fixed atoms ***>");
-
-    return 1;
-} /* InitAtomTable */
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*//////////////////////////////// Debug Printing Functions: ////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-
-/*
- * PrintAtomTable()
- *
- */
-
-void PrintAtomTable(AtomTable *atable)
-{
-    int ii;
-    char str[200];
-
-    for (ii = 0; ii < atable->nextFree; ii++) {
-        sprintf(str, "%d: \"%s\"", ii, &atable->stable.strings[atable->amap[ii]]);
-        CPPDebugLogMsg(str);
-    }
-    sprintf(str, "Hash table: size=%d, entries=%d, collisions=",
-           atable->htable.size, atable->htable.entries);
-    CPPDebugLogMsg(str);
-    for (ii = 0; ii < HASH_TABLE_MAX_COLLISIONS; ii++) {
-        sprintf(str, " %d", atable->htable.counts[ii]);
-        CPPDebugLogMsg(str);
-    }
-
-} /* PrintAtomTable */
-
-
-/*
- * GetStringOfAtom()
- *
- */
-
-char* GetStringOfAtom(AtomTable *atable, int atom)
-{
-	 char* chr_str;
-	 chr_str=&atable->stable.strings[atable->amap[atom]];
-	 return chr_str;
-} /* GetStringOfAtom */
-
-/*
- * FreeAtomTable() - Free the atom table and associated memory
- *
- */
-
-void FreeAtomTable(AtomTable *atable)
-{
-    FreeStringTable(&atable->stable);
-    FreeHashTable(&atable->htable);
-    if (atable->amap)
-        free(atable->amap);
-    if (atable->arev)
-        free(atable->arev);
-    atable->amap = NULL;
-    atable->arev = NULL;
-    atable->nextFree = 0;
-    atable->size = 0;
-} /* FreeAtomTable */
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*/////////////////////////////////////// End of atom.c /////////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.h
deleted file mode 100755
index 4e509d6ba..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* atom.h */
-/* */
-
-#if !defined(__ATOM_H)
-#define __ATOM_H 1
-
-typedef struct AtomTable_Rec AtomTable;
-
-extern AtomTable *atable;
-
-int InitAtomTable(AtomTable *atable, int htsize);
-void FreeAtomTable(AtomTable *atable);
-int AddAtom(AtomTable *atable, const char *s);
-void PrintAtomTable(AtomTable *atable);
-int LookUpAddString(AtomTable *atable, const char *s);
-const char *GetAtomString(AtomTable *atable, int atom);
-int GetReversedAtom(AtomTable *atable, int atom);
-char* GetStringOfAtom(AtomTable *atable, int atom);
-#endif /* !defined(__ATOM_H) */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/compile.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/compile.h
deleted file mode 100755
index 24673461e..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/compile.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* compile.h */
-/* */
-
-#if !defined(__COMPILE_H)
-#define __COMPILE_H 1
-
-int InitCPPStruct(void);
-
-typedef struct Options_Rec{
-    const char *profileString;
-    int ErrorMode;
-    int Quiet;
-	
-    /* Debug The Compiler options: */
-    int DumpAtomTable;
-} Options;
-
-struct CPPStruct_Rec {
-    /* Public members */
-    SourceLoc *pLastSourceLoc;  /* Set at the start of each statement by the tree walkers */
-    Options options;            /* Compile options and parameters */
-
-    /* Private members */
-    SourceLoc lastSourceLoc;
-
-    /* Scanner data: */
-
-    SourceLoc *tokenLoc;        /* Source location of most recent token seen by the scanner */
-    int mostRecentToken;        /* Most recent token seen by the scanner */
-    InputSrc *currentInput;
-    int previous_token;
-    int notAVersionToken;      /* used to make sure that #version is the first token seen in the file, if present */
-    
-	void *pC;                   /* storing the parseContext of the compile object in cpp.   */
-     
-    /* Private members: */
-    SourceLoc ltokenLoc;
-	int ifdepth;                /*current #if-#else-#endif nesting in the cpp.c file (pre-processor)     */
-    int elsedepth[64];          /*Keep a track of #if depth..Max allowed is 64.    */
-    int elsetracker;            /*#if-#else and #endif constructs...Counter. */
-    const char *ErrMsg;
-    int CompileError;           /*Indicate compile error when #error, #else,#elif mismatch. */
-
-    /* */
-    /* Globals used to communicate between PaParseStrings() and yy_input()and  */
-    /* also across the files.(gen_glslang.cpp and scanner.c) */
-    /* */
-    int    PaWhichStr;            /* which string we're parsing */
-    int*   PaStrLen;              /* array of lengths of the PaArgv strings */
-    int    PaArgc;                /* count of strings in the array */
-    char** PaArgv;                /* our array of strings to parse     */
-    unsigned int tokensBeforeEOF : 1;
-};
-
-#endif /* !defined(__COMPILE_H) */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.c
deleted file mode 100755
index f8da59b38..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.c
+++ /dev/null
@@ -1,1037 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* cpp.c */
-/* */
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "slglobals.h"
-
-static int CPPif(yystypepp * yylvalpp);
-
-/* Don't use memory.c's replacements, as we clean up properly here */
-#undef malloc
-#undef free
-
-static int bindAtom = 0;
-static int constAtom = 0;
-static int defaultAtom = 0;
-static int defineAtom = 0;
-static int definedAtom = 0;
-static int elseAtom = 0;
-static int elifAtom = 0;
-static int endifAtom = 0;
-static int ifAtom = 0;
-static int ifdefAtom = 0;
-static int ifndefAtom = 0;
-static int includeAtom = 0;
-static int lineAtom = 0;
-static int pragmaAtom = 0;
-static int texunitAtom = 0;
-static int undefAtom = 0;
-static int errorAtom = 0;
-static int __LINE__Atom = 0;
-static int __FILE__Atom = 0;
-static int __VERSION__Atom = 0;
-static int versionAtom = 0;
-static int extensionAtom = 0;
-
-static Scope *macros = 0;
-#define MAX_MACRO_ARGS  64
-#define MAX_IF_NESTING  64
-
-static SourceLoc ifloc; /* outermost #if */
-
-int InitCPP(void)
-{
-    char        buffer[64], *t;
-    const char  *f;
-    /* Add various atoms needed by the CPP line scanner: */
-    bindAtom = LookUpAddString(atable, "bind");
-    constAtom = LookUpAddString(atable, "const");
-    defaultAtom = LookUpAddString(atable, "default");
-    defineAtom = LookUpAddString(atable, "define");
-    definedAtom = LookUpAddString(atable, "defined");
-    elifAtom = LookUpAddString(atable, "elif");
-    elseAtom = LookUpAddString(atable, "else");
-    endifAtom = LookUpAddString(atable, "endif");
-    ifAtom = LookUpAddString(atable, "if");
-    ifdefAtom = LookUpAddString(atable, "ifdef");
-    ifndefAtom = LookUpAddString(atable, "ifndef");
-    includeAtom = LookUpAddString(atable, "include");
-    lineAtom = LookUpAddString(atable, "line");
-    pragmaAtom = LookUpAddString(atable, "pragma");
-    texunitAtom = LookUpAddString(atable, "texunit");
-    undefAtom = LookUpAddString(atable, "undef");
-	errorAtom = LookUpAddString(atable, "error");
-    __LINE__Atom = LookUpAddString(atable, "__LINE__");
-    __FILE__Atom = LookUpAddString(atable, "__FILE__");
-	__VERSION__Atom = LookUpAddString(atable, "__VERSION__");
-    versionAtom = LookUpAddString(atable, "version");
-    extensionAtom = LookUpAddString(atable, "extension");
-    macros = NewScopeInPool(mem_CreatePool(0, 0));
-    strcpy(buffer, "PROFILE_");
-    t = buffer + strlen(buffer);
-    f = cpp->options.profileString;
-    while ((isalnum(*f) || *f == '_') && t < buffer + sizeof(buffer) - 1)
-        *t++ = toupper(*f++);
-    *t = 0;
-	return 1;
-} /* InitCPP */
-
-int FreeCPP(void)
-{
-    if (macros)
-    {
-        mem_FreePool(macros->pool);
-        macros = 0;
-    }
-
-    return 1;
-}
-
-int FinalCPP(void)
-{
-	if (cpp->ifdepth)
-		CPPErrorToInfoLog("#if mismatch");
-    return 1;
-}
-
-static int CPPdefine(yystypepp * yylvalpp)
-{
-    int token, name, args[MAX_MACRO_ARGS], argc;
-    const char *message;
-    MacroSymbol mac;
-    Symbol *symb;
-    SourceLoc dummyLoc;
-    memset(&mac, 0, sizeof(mac));
-    token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    if (token != CPP_IDENTIFIER) {
-        CPPErrorToInfoLog("#define");
-        return token;
-    }
-    name = yylvalpp->sc_ident;
-    token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    if (token == '(' && !yylvalpp->sc_int) {
-        /* gather arguments */
-        argc = 0;
-        do {
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            if (argc == 0 && token == ')') break;
-            if (token != CPP_IDENTIFIER) {
-				CPPErrorToInfoLog("#define");
-                return token;
-            }
-            if (argc < MAX_MACRO_ARGS)
-                args[argc++] = yylvalpp->sc_ident;
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-        } while (token == ',');
-        if (token != ')') {
-            CPPErrorToInfoLog("#define");
-            return token;
-        }
-        mac.argc = argc;
-        mac.args = mem_Alloc(macros->pool, argc * sizeof(int));
-        memcpy(mac.args, args, argc * sizeof(int));
-        token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-	}
-    mac.body = NewTokenStream(GetAtomString(atable, name));
-    while (token != '\n') {
-        while (token == '\\') {
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            if (token == '\n')
-                token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            else
-                RecordToken(mac.body, '\\', yylvalpp);
-        }
-        RecordToken(mac.body, token, yylvalpp);
-        token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    };
-
-    symb = LookUpSymbol(macros, name);
-    if (symb) {
-        if (!symb->details.mac.undef) {
-            /* already defined -- need to make sure they are identical */
-            if (symb->details.mac.argc != mac.argc) goto error;
-            for (argc=0; argc < mac.argc; argc++)
-                if (symb->details.mac.args[argc] != mac.args[argc])
-                    goto error;
-            RewindTokenStream(symb->details.mac.body);
-            RewindTokenStream(mac.body);
-            do {
-                int old_lval, old_token;
-                old_token = ReadToken(symb->details.mac.body, yylvalpp);
-                old_lval = yylvalpp->sc_int;
-                token = ReadToken(mac.body, yylvalpp);
-                if (token != old_token || yylvalpp->sc_int != old_lval) { 
-                error:
-                    StoreStr("Macro Redefined");
-                    StoreStr(GetStringOfAtom(atable,name));
-                    message=GetStrfromTStr();
-                    DecLineNumber();
-                    CPPShInfoLogMsg(message);
-                    IncLineNumber();
-                    ResetTString();
-                    break; }
-            } while (token > 0);
-        }
-        FreeMacro(&symb->details.mac);
-    } else {
-        dummyLoc.file = 0;
-        dummyLoc.line = 0;
-        symb = AddSymbol(&dummyLoc, macros, name, MACRO_S);
-    }
-    symb->details.mac = mac;
-    return '\n';
-} /* CPPdefine */
-
-static int CPPundef(yystypepp * yylvalpp)
-{
-    int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    Symbol *symb;
-	if(token == '\n'){
-		CPPErrorToInfoLog("#undef");
-	    return token;
-    }
-    if (token != CPP_IDENTIFIER)
-          goto error;
-    symb = LookUpSymbol(macros, yylvalpp->sc_ident);
-    if (symb) {
-        symb->details.mac.undef = 1;
-    }
-    token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    if (token != '\n') {
-    error:
-        CPPErrorToInfoLog("#undef");
-    }
-    return token;
-} /* CPPundef */
-
-/* CPPelse -- skip forward to appropriate spot.  This is actually used
-** to skip to and #endif after seeing an #else, AND to skip to a #else,
-** #elif, or #endif after a #if/#ifdef/#ifndef/#elif test was false
-*/
-
-static int CPPelse(int matchelse, yystypepp * yylvalpp)
-{
-    int atom,depth=0;
-    int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-	
-	while (token > 0) {
-        if (token != '#') {
-		while (token != '\n')
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-			continue;
-        }
-		if ((token = cpp->currentInput->scan(cpp->currentInput, yylvalpp)) != CPP_IDENTIFIER)
-			continue;
-        atom = yylvalpp->sc_ident;
-        if (atom == ifAtom || atom == ifdefAtom || atom == ifndefAtom){
-            depth++; cpp->ifdepth++; cpp->elsetracker++;
-		}
-		else if (atom == endifAtom) {
-            if(--depth<=0){
-		        cpp->elsedepth[cpp->elsetracker]=0;
-			    --cpp->elsetracker;
-                if (cpp->ifdepth) 
-                    --cpp->ifdepth;
-                break;
-            }             
-                --cpp->elsetracker;
-                --cpp->ifdepth;
-            }
-        else if (((int)(matchelse) != 0)&& depth==0) {
-			if (atom == elseAtom ) {
-                token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-                if (token != '\n') {
-                    CPPWarningToInfoLog("unexpected tokens following #else preprocessor directive - expected a newline");
-                    while (token != '\n')
-                        token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-                } 
-				break;
-			} 
-			else if (atom == elifAtom) {
-                /* we decrement cpp->ifdepth here, because CPPif will increment
-                 * it and we really want to leave it alone */
-				if (cpp->ifdepth){
-					--cpp->ifdepth;
-				    --cpp->elsetracker;
-				}
-                return CPPif(yylvalpp);
-            }
-		}
-        else if((atom==elseAtom) && (!ChkCorrectElseNesting())){
-            CPPErrorToInfoLog("#else after a #else");
-            cpp->CompileError=1;
-        }
-	};
-    return token;
-}
-
-enum eval_prec {
-    MIN_PREC,
-    COND, LOGOR, LOGAND, OR, XOR, AND, EQUAL, RELATION, SHIFT, ADD, MUL, UNARY,
-    MAX_PREC
-};
-
-static int op_logor(int a, int b) { return a || b; }
-static int op_logand(int a, int b) { return a && b; }
-static int op_or(int a, int b) { return a | b; }
-static int op_xor(int a, int b) { return a ^ b; }
-static int op_and(int a, int b) { return a & b; }
-static int op_eq(int a, int b) { return a == b; }
-static int op_ne(int a, int b) { return a != b; }
-static int op_ge(int a, int b) { return a >= b; }
-static int op_le(int a, int b) { return a <= b; }
-static int op_gt(int a, int b) { return a > b; }
-static int op_lt(int a, int b) { return a < b; }
-static int op_shl(int a, int b) { return a << b; }
-static int op_shr(int a, int b) { return a >> b; }
-static int op_add(int a, int b) { return a + b; }
-static int op_sub(int a, int b) { return a - b; }
-static int op_mul(int a, int b) { return a * b; }
-static int op_div(int a, int b) { return a / b; }
-static int op_mod(int a, int b) { return a % b; }
-static int op_pos(int a) { return a; }
-static int op_neg(int a) { return -a; }
-static int op_cmpl(int a) { return ~a; }
-static int op_not(int a) { return !a; }
-
-struct {
-    int token, prec, (*op)(int, int);
-} binop[] = {
-    { CPP_OR_OP, LOGOR, op_logor },
-    { CPP_AND_OP, LOGAND, op_logand },
-    { '|', OR, op_or },
-    { '^', XOR, op_xor },
-    { '&', AND, op_and },
-    { CPP_EQ_OP, EQUAL, op_eq },
-    { CPP_NE_OP, EQUAL, op_ne },
-    { '>', RELATION, op_gt },
-    { CPP_GE_OP, RELATION, op_ge },
-    { '<', RELATION, op_lt },
-    { CPP_LE_OP, RELATION, op_le },
-    { CPP_LEFT_OP, SHIFT, op_shl },
-    { CPP_RIGHT_OP, SHIFT, op_shr },
-    { '+', ADD, op_add },
-    { '-', ADD, op_sub },
-    { '*', MUL, op_mul },
-    { '/', MUL, op_div },
-    { '%', MUL, op_mod },
-};
-
-struct {
-    int token, (*op)(int);
-} unop[] = {
-    { '+', op_pos },
-    { '-', op_neg },
-    { '~', op_cmpl },
-    { '!', op_not },
-};
-
-#define ALEN(A) (sizeof(A)/sizeof(A[0]))
-
-static int eval(int token, int prec, int *res, int *err, yystypepp * yylvalpp)
-{
-    int         i, val;
-    Symbol      *s;
-    if (token == CPP_IDENTIFIER) {
-        if (yylvalpp->sc_ident == definedAtom) {
-            int needclose = 0;
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            if (token == '(') {
-                needclose = 1;
-                token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            }
-            if (token != CPP_IDENTIFIER)
-                goto error;
-            *res = (s = LookUpSymbol(macros, yylvalpp->sc_ident))
-                        ? !s->details.mac.undef : 0;
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            if (needclose) {
-                if (token != ')')
-                    goto error;
-                token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            }
-		} else if (MacroExpand(yylvalpp->sc_ident, yylvalpp)) {
-			token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            return eval(token, prec, res, err, yylvalpp);
-        } else {
-            goto error;
-        }
-	} else if (token == CPP_INTCONSTANT) {
-        *res = yylvalpp->sc_int;
-        token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    } else if (token == '(') {
-        token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-        token = eval(token, MIN_PREC, res, err, yylvalpp);
-        if (!*err) {
-            if (token != ')')
-                goto error;
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-        }
-    } else {
-        for (i = ALEN(unop) - 1; i >= 0; i--) {
-            if (unop[i].token == token)
-                break;
-        }
-        if (i >= 0) {
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-            token = eval(token, UNARY, res, err, yylvalpp);
-            *res = unop[i].op(*res);
-        } else {
-            goto error;
-        }
-    }
-    while (!*err) {
-        if (token == ')' || token == '\n') break;
-        for (i = ALEN(binop) - 1; i >= 0; i--) {
-            if (binop[i].token == token)
-                break;
-        }
-        if (i < 0 || binop[i].prec <= prec)
-            break;
-        val = *res;
-        token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-        token = eval(token, binop[i].prec, res, err, yylvalpp);
-        *res = binop[i].op(val, *res);
-    }
-    return token;
-error:
-    CPPErrorToInfoLog("incorrect preprocessor directive");
-    *err = 1;
-    *res = 0;
-    return token;
-} /* eval */
-
-static int CPPif(yystypepp * yylvalpp) {
-    int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    int res = 0, err = 0;
-	cpp->elsetracker++;
-    if (!cpp->ifdepth++)
-        ifloc = *cpp->tokenLoc;
-	if(cpp->ifdepth >MAX_IF_NESTING){
-        CPPErrorToInfoLog("max #if nesting depth exceeded");
-		return 0;
-	}
-	token = eval(token, MIN_PREC, &res, &err, yylvalpp);
-    if (token != '\n') {
-        CPPWarningToInfoLog("unexpected tokens following the preprocessor directive - expected a newline");
-        while (token != '\n')
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    } 
-    if (!res && !err) {
-        token = CPPelse(1, yylvalpp);
-    }
-
-    return token;
-} /* CPPif */
-
-static int CPPifdef(int defined, yystypepp * yylvalpp)
-{
-    int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    int name = yylvalpp->sc_ident;
-	if(++cpp->ifdepth >MAX_IF_NESTING){
-	    CPPErrorToInfoLog("max #if nesting depth exceeded");
-		return 0;
-	}
-	cpp->elsetracker++;
-    if (token != CPP_IDENTIFIER) {
-            defined ? CPPErrorToInfoLog("ifdef"):CPPErrorToInfoLog("ifndef");
-    } else {
-        Symbol *s = LookUpSymbol(macros, name);
-        token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-        if (token != '\n') {
-            CPPWarningToInfoLog("unexpected tokens following #ifdef preprocessor directive - expected a newline");
-            while (token != '\n')
-                token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-        }
-        if (((s && !s->details.mac.undef) ? 1 : 0) != defined)
-            token = CPPelse(1, yylvalpp);
-    }
-    return token;
-} /* CPPifdef */
-
-static int CPPline(yystypepp * yylvalpp) 
-{
-    int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-	if(token=='\n'){
-		DecLineNumber();
-        CPPErrorToInfoLog("#line");
-        IncLineNumber();
-		return token;
-	}
-	else if (token == CPP_INTCONSTANT) {
-		yylvalpp->sc_int=atoi(yylvalpp->symbol_name);
-		SetLineNumber(yylvalpp->sc_int);
-        token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-        
-		if (token == CPP_INTCONSTANT) {
-            yylvalpp->sc_int=atoi(yylvalpp->symbol_name);
-			SetStringNumber(yylvalpp->sc_int);
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-			if(token!='\n')
-				CPPErrorToInfoLog("#line");
-        }
-		else if (token == '\n'){
-			return token;
-		}
-		else{
-            CPPErrorToInfoLog("#line");
-		}
-	}
-	else{
-          CPPErrorToInfoLog("#line");
-	}
-    return token;
-}
-
-static int CPPerror(yystypepp * yylvalpp) {
-
-	int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    const char *message;
-	
-    while (token != '\n') {
-		if (token == CPP_FLOATCONSTANT || token == CPP_INTCONSTANT){
-            StoreStr(yylvalpp->symbol_name);
-		}else if(token == CPP_IDENTIFIER || token == CPP_STRCONSTANT){
-			StoreStr(GetStringOfAtom(atable,yylvalpp->sc_ident));
-		}else {
-		    StoreStr(GetStringOfAtom(atable,token));
-		}
-		token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-	}
-	DecLineNumber();
-	/*store this msg into the shader's information log..set the Compile Error flag!!!! */
-	message=GetStrfromTStr();
-    CPPShInfoLogMsg(message);
-    ResetTString();
-    cpp->CompileError=1;
-    IncLineNumber();
-    return '\n';
-}/*CPPerror */
-
-static int CPPpragma(yystypepp * yylvalpp)
-{
-	char SrcStrName[2];
-	char** allTokens;
-	int tokenCount = 0;
-	int maxTokenCount = 10;
-	const char* SrcStr;
-	int i;
-
-	int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-	
-	if (token=='\n') {
-		DecLineNumber();
-        CPPErrorToInfoLog("#pragma");
-        IncLineNumber();
-	    return token;
-	}
-	
-	allTokens = (char**)malloc(sizeof(char*) * maxTokenCount);	
-
-	while (token != '\n') {
-		if (tokenCount >= maxTokenCount) {
-			maxTokenCount *= 2;
-			allTokens = (char**)realloc((char**)allTokens, sizeof(char*) * maxTokenCount);
-		}
-		switch (token) {
-		case CPP_IDENTIFIER:
-    SrcStr = GetAtomString(atable, yylvalpp->sc_ident);
-			allTokens[tokenCount] = (char*)malloc(strlen(SrcStr) + 1);
-			strcpy(allTokens[tokenCount++], SrcStr);
-			break;
-		case CPP_INTCONSTANT:
-			SrcStr = yylvalpp->symbol_name;
-			allTokens[tokenCount] = (char*)malloc(strlen(SrcStr) + 1);
-			strcpy(allTokens[tokenCount++], SrcStr);
-			break;
-		case CPP_FLOATCONSTANT:
-			SrcStr = yylvalpp->symbol_name;
-			allTokens[tokenCount] = (char*)malloc(strlen(SrcStr) + 1);
-			strcpy(allTokens[tokenCount++], SrcStr);
-			break;
-		case -1:
-			/* EOF */
-            CPPShInfoLogMsg("#pragma directive must end with a newline");			
-			return token;
-		default:
-			SrcStrName[0] = token;
-			SrcStrName[1] = '\0';
-			allTokens[tokenCount] = (char*)malloc(2);
-			strcpy(allTokens[tokenCount++], SrcStrName);
-		}
-    token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-	}
-
-	cpp->currentInput->ungetch(cpp->currentInput, token, yylvalpp);
-	HandlePragma(allTokens, tokenCount);
-		  token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-	
-	for (i = 0; i < tokenCount; ++i) {
-		free (allTokens[i]);
-	}
-	free (allTokens);	
-
-	return token;
-} /* CPPpragma */
-
-#define GL2_VERSION_NUMBER 110
-
-static int CPPversion(yystypepp * yylvalpp)
-{
-
-    int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-
-    if (cpp->notAVersionToken == 1)
-        CPPShInfoLogMsg("#version must occur before any other statement in the program");
-
-    if(token=='\n'){
-		DecLineNumber();
-        CPPErrorToInfoLog("#version");
-        IncLineNumber();
-		return token;
-	}
-    if (token != CPP_INTCONSTANT)
-        CPPErrorToInfoLog("#version");
-	
-    yylvalpp->sc_int=atoi(yylvalpp->symbol_name);
-	/*SetVersionNumber(yylvalpp->sc_int); */
-    
-    if (yylvalpp->sc_int != GL2_VERSION_NUMBER)
-        CPPShInfoLogMsg("Version number not supported by GL2");
-
-    token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    
-	if (token == '\n'){
-		return token;
-	}
-	else{
-        CPPErrorToInfoLog("#version");
-	}
-    return token;
-} /* CPPversion */
-
-static int CPPextension(yystypepp * yylvalpp)
-{
-
-    int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    char extensionName[80];
-
-    if(token=='\n'){
-		DecLineNumber();
-        CPPShInfoLogMsg("extension name not specified");
-        IncLineNumber();
-		return token;
-	}
-
-    if (token != CPP_IDENTIFIER)
-        CPPErrorToInfoLog("#extension");
-    
-    strcpy(extensionName, GetAtomString(atable, yylvalpp->sc_ident));
-	    
-    token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    if (token != ':') {
-        CPPShInfoLogMsg("':' missing after extension name");
-        return token;
-    }
-    
-    token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    if (token != CPP_IDENTIFIER) {
-        CPPShInfoLogMsg("behavior for extension not specified");
-        return token;
-    }
-
-    updateExtensionBehavior(extensionName, GetAtomString(atable, yylvalpp->sc_ident));
-
-    token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-	if (token == '\n'){
-		return token;
-	}
-	else{
-        CPPErrorToInfoLog("#extension");
-	}
-    return token;
-} /* CPPextension */
-
-int readCPPline(yystypepp * yylvalpp)
-{
-    int token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-    const char *message;
-    int isVersion = 0;
-
-    if (token == CPP_IDENTIFIER) {
-        if (yylvalpp->sc_ident == defineAtom) {
-             token = CPPdefine(yylvalpp);
-        } else if (yylvalpp->sc_ident == elseAtom) {
-			 if(ChkCorrectElseNesting()){
-                 if (!cpp->ifdepth ){
-                     CPPErrorToInfoLog("#else mismatch");
-                     cpp->CompileError=1;
-                 }
-                 token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-                 if (token != '\n') {
-                     CPPWarningToInfoLog("unexpected tokens following #else preprocessor directive - expected a newline");
-                     while (token != '\n')
-                         token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-                 }
-			     token = CPPelse(0, yylvalpp);
-             }else{
-                 CPPErrorToInfoLog("#else after a #else");
-                 cpp->ifdepth=0;
-                 cpp->notAVersionToken = 1;
-                 return 0;
-             }
-		} else if (yylvalpp->sc_ident == elifAtom) {
-            if (!cpp->ifdepth){
-                 CPPErrorToInfoLog("#elif mismatch");
-                 cpp->CompileError=1;
-            } 
-            /* this token is really a dont care, but we still need to eat the tokens */
-            token = cpp->currentInput->scan(cpp->currentInput, yylvalpp); 
-            while (token != '\n')
-                token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-			 token = CPPelse(0, yylvalpp);
-        } else if (yylvalpp->sc_ident == endifAtom) {
-			 cpp->elsedepth[cpp->elsetracker]=0;
-		     --cpp->elsetracker;
-             if (!cpp->ifdepth){
-                 CPPErrorToInfoLog("#endif mismatch");
-                 cpp->CompileError=1;
-             }
-             else
-			  	 --cpp->ifdepth;
-	    } else if (yylvalpp->sc_ident == ifAtom) {
-             token = CPPif(yylvalpp);
-        } else if (yylvalpp->sc_ident == ifdefAtom) {
-             token = CPPifdef(1, yylvalpp);
-        } else if (yylvalpp->sc_ident == ifndefAtom) {
-             token = CPPifdef(0, yylvalpp);
-        } else if (yylvalpp->sc_ident == lineAtom) {
-             token = CPPline(yylvalpp);
-        } else if (yylvalpp->sc_ident == pragmaAtom) {
-             token = CPPpragma(yylvalpp);
-        } else if (yylvalpp->sc_ident == undefAtom) {
-             token = CPPundef(yylvalpp);
-        } else if (yylvalpp->sc_ident == errorAtom) {
-             token = CPPerror(yylvalpp);
-        } else if (yylvalpp->sc_ident == versionAtom) {
-            token = CPPversion(yylvalpp);
-            isVersion = 1;
-        } else if (yylvalpp->sc_ident == extensionAtom) {
-            token = CPPextension(yylvalpp);
-        } else {
-            StoreStr("Invalid Directive");
-            StoreStr(GetStringOfAtom(atable,yylvalpp->sc_ident));
-            message=GetStrfromTStr();
-            CPPShInfoLogMsg(message);
-            ResetTString();
-        }
-    }
-    while (token != '\n' && token != 0 && token != EOF) {
-		token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-	}
-        
-    cpp->notAVersionToken = !isVersion;
-
-    return token;
-} /* readCPPline */
-
-void FreeMacro(MacroSymbol *s) {
-    DeleteTokenStream(s->body);
-}
-
-static int eof_scan(InputSrc *in, yystypepp * yylvalpp) { return -1; }
-static void noop(InputSrc *in, int ch, yystypepp * yylvalpp) { }
-
-static void PushEofSrc() {
-    InputSrc *in = malloc(sizeof(InputSrc));
-    memset(in, 0, sizeof(InputSrc));
-    in->scan = eof_scan;
-    in->getch = eof_scan;
-    in->ungetch = noop;
-    in->prev = cpp->currentInput;
-    cpp->currentInput = in;
-}
-
-static void PopEofSrc() {
-    if (cpp->currentInput->scan == eof_scan) {
-        InputSrc *in = cpp->currentInput;
-        cpp->currentInput = in->prev;
-        free(in);
-    }
-}
-
-static TokenStream *PrescanMacroArg(TokenStream *a, yystypepp * yylvalpp) {
-    int token;
-    TokenStream *n;
-    RewindTokenStream(a);
-    do {
-        token = ReadToken(a, yylvalpp);
-        if (token == CPP_IDENTIFIER && LookUpSymbol(macros, yylvalpp->sc_ident))
-            break;
-    } while (token > 0);
-    if (token <= 0) return a;
-    n = NewTokenStream("macro arg");
-    PushEofSrc();
-    ReadFromTokenStream(a, 0, 0);
-    while ((token = cpp->currentInput->scan(cpp->currentInput, yylvalpp)) > 0) {
-        if (token == CPP_IDENTIFIER && MacroExpand(yylvalpp->sc_ident, yylvalpp))
-            continue;
-        RecordToken(n, token, yylvalpp);
-    }
-    PopEofSrc();
-    DeleteTokenStream(a);
-    return n;
-} /* PrescanMacroArg */
-
-typedef struct MacroInputSrc {
-    InputSrc    base;
-    MacroSymbol *mac;
-    TokenStream **args;
-} MacroInputSrc;
-
-/* macro_scan ---
-** return the next token for a macro expanion, handling macro args 
-*/
-static int macro_scan(MacroInputSrc *in, yystypepp * yylvalpp) {
-    int i;
-    int token = ReadToken(in->mac->body, yylvalpp);
-    if (token == CPP_IDENTIFIER) {
-        for (i = in->mac->argc-1; i>=0; i--)
-            if (in->mac->args[i] == yylvalpp->sc_ident) break;
-        if (i >= 0) {
-            ReadFromTokenStream(in->args[i], yylvalpp->sc_ident, 0);
-            return cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-        }
-    }
-    if (token > 0) return token;
-    in->mac->busy = 0;
-    cpp->currentInput = in->base.prev;
-    if (in->args) {
-        for (i=in->mac->argc-1; i>=0; i--)
-            DeleteTokenStream(in->args[i]);
-        free(in->args);
-    }
-    free(in);
-    return cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-} /* macro_scan */
-
-/* MacroExpand
-** check an identifier (atom) to see if it a macro that should be expanded.
-** If it is, push an InputSrc that will produce the appropriate expansion
-** and return TRUE.  If not, return FALSE.
-*/
-
-int MacroExpand(int atom, yystypepp * yylvalpp)
-{
-    Symbol              *sym = LookUpSymbol(macros, atom);
-    MacroInputSrc       *in;
-    int i,j, token, depth=0;
-    const char *message;
-	if (atom == __LINE__Atom) {
-        yylvalpp->sc_int = GetLineNumber();
-        sprintf(yylvalpp->symbol_name,"%d",yylvalpp->sc_int);
-        UngetToken(CPP_INTCONSTANT, yylvalpp);
-        return 1;
-    }
-    if (atom == __FILE__Atom) {
-        yylvalpp->sc_int = GetStringNumber();
-        sprintf(yylvalpp->symbol_name,"%d",yylvalpp->sc_int);
-        UngetToken(CPP_INTCONSTANT, yylvalpp);
-        return 1;
-    }
-	if (atom == __VERSION__Atom) {
-        strcpy(yylvalpp->symbol_name,"100");
-        yylvalpp->sc_int = atoi(yylvalpp->symbol_name);
-        UngetToken(CPP_INTCONSTANT, yylvalpp);
-        return 1;
-    }
-    if (!sym || sym->details.mac.undef) return 0;
-    if (sym->details.mac.busy) return 0;        /* no recursive expansions */
-    in = malloc(sizeof(*in));
-    memset(in, 0, sizeof(*in));
-    in->base.scan = (void *)macro_scan;
-    in->base.line = cpp->currentInput->line;
-    in->base.name = cpp->currentInput->name;
-    in->mac = &sym->details.mac;
-    if (sym->details.mac.args) {
-        token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-		if (token != '(') {
-            UngetToken(token, yylvalpp);
-            yylvalpp->sc_ident = atom;
-            return 0;
-        }
-        in->args = malloc(in->mac->argc * sizeof(TokenStream *));
-        for (i=0; i<in->mac->argc; i++)
-            in->args[i] = NewTokenStream("macro arg");
-		i=0;j=0;
-        do{
-            depth = 0;
-			while(1) {
-                token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-                if (token <= 0) {
-                    StoreStr("EOF in Macro ");
-                    StoreStr(GetStringOfAtom(atable,atom));
-                    message=GetStrfromTStr();
-                    CPPShInfoLogMsg(message);
-                    ResetTString();
-                    return 1;
-                }
-                if((in->mac->argc==0) && (token!=')')) break;
-                if (depth == 0 && (token == ',' || token == ')')) break;
-                if (token == '(') depth++;
-                if (token == ')') depth--;
-                RecordToken(in->args[i], token, yylvalpp);
-                j=1;
-			}
-            if (token == ')') {
-                if((in->mac->argc==1) &&j==0)
-                    break;
-                i++;
-                break;
-            }
-            i++;
-		}while(i < in->mac->argc);
-
-        if (i < in->mac->argc) {
-            StoreStr("Too few args in Macro ");
-            StoreStr(GetStringOfAtom(atable,atom));
-            message=GetStrfromTStr();
-            CPPShInfoLogMsg(message);
-            ResetTString();
-        } else if (token != ')') {
-            depth=0;
-			while (token >= 0 && (depth > 0 || token != ')')) {
-                if (token == ')') depth--;
-                token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-                if (token == '(') depth++;
-            }
-			
-            if (token <= 0) {
-                StoreStr("EOF in Macro ");
-                StoreStr(GetStringOfAtom(atable,atom));
-                message=GetStrfromTStr();
-                CPPShInfoLogMsg(message);
-                ResetTString();
-                return 1;
-            }
-            StoreStr("Too many args in Macro ");
-            StoreStr(GetStringOfAtom(atable,atom));
-            message=GetStrfromTStr();
-            CPPShInfoLogMsg(message);
-            ResetTString();
-		}
-		for (i=0; i<in->mac->argc; i++) {
-            in->args[i] = PrescanMacroArg(in->args[i], yylvalpp);
-        }
-    }
-#if 0
-    printf("  <%s:%d>found macro %s\n", GetAtomString(atable, loc.file),
-           loc.line, GetAtomString(atable, atom));
-    for (i=0; i<in->mac->argc; i++) {
-        printf("\targ %s = '", GetAtomString(atable, in->mac->args[i]));
-        DumpTokenStream(stdout, in->args[i]);
-        printf("'\n");
-    }
-#endif
-	/*retain the input source*/
-    in->base.prev = cpp->currentInput;
-    sym->details.mac.busy = 1;
-    RewindTokenStream(sym->details.mac.body);
-    cpp->currentInput = &in->base;
-    return 1;
-} /* MacroExpand */
-
-int ChkCorrectElseNesting(void)
-{
-    if(cpp->elsedepth[cpp->elsetracker]==0){
-	  cpp->elsedepth[cpp->elsetracker]=1;
-      return 1;          
-    }
-    return 0;
-}
-
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.h
deleted file mode 100755
index 03449a17a..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* cpp.h */
-/* */
-
-#if !defined(__CPP_H)
-#define __CPP_H 1
-
-#include "parser.h"
-#include "tokens.h"
-
-int InitCPP(void);
-int FinalCPP(void);
-int  readCPPline(yystypepp * yylvalpp);
-int MacroExpand(int atom, yystypepp * yylvalpp);
-int ChkCorrectElseNesting(void);
-
-typedef struct MacroSymbol {
-    int argc;
-    int *args;
-    TokenStream *body;
-    unsigned busy:1;
-    unsigned undef:1;
-} MacroSymbol;
-
-void FreeMacro(MacroSymbol *);
-int PredefineMacro(char *);
-
-void  CPPDebugLogMsg(const char *msg);       /* Prints information into debug log */
-void  CPPShInfoLogMsg(const char*);         /* Store cpp Err Msg into Sh.Info.Log */
-void  CPPWarningToInfoLog(const char *msg); /* Prints warning messages into info log */
-void  HandlePragma(const char**, int numTokens);  /* #pragma directive container. */
-void  ResetTString(void);                   /* #error Message as TString. */
-void  CPPErrorToInfoLog(char*);             /* Stick all cpp errors into Sh.Info.log   . */
-void  StoreStr(char*);                      /* Store the TString in Parse Context. */
-void  SetLineNumber(int);                   /* Set line number.   */
-void  SetStringNumber(int);                 /* Set string number.     */
-int   GetLineNumber(void);                  /* Get the current String Number.  */
-int   GetStringNumber(void);                /* Get the current String Number.  */
-const char* GetStrfromTStr(void);           /* Convert TString to String.   */
-void  updateExtensionBehavior(const char* extName, const char* behavior);
-int   FreeCPP(void);
-
-#endif /* !(defined(__CPP_H) */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp_comment_fix.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp_comment_fix.c
deleted file mode 100644
index 0c3073590..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp_comment_fix.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* converts c++ to c comments */
-/* usage: ./cpp_comment_fix source */
-
-#include <stdio.h>
-
-int main (int argc, char *argv[])
-{
-	FILE *f;
-	int c;
-	char *buf = NULL;
-	int size = 0, i = 0;
-	
-	f = fopen (argv[1], "r");
-	while ((c = fgetc (f)) != EOF)
-	{
-		buf = (void *) realloc (buf, size + 1);
-		buf[size] = c;
-		size++;
-	}
-	fclose (f);
-	
-	f = fopen (argv[1], "w");
-
-	while (i < size)
-	{
-		if (buf[i] == '/')
-		{
-			if (buf[i+1] == '/')
-			{
-				fprintf (f, "/*");
-				i+=2;
-				while (buf[i] != '\n' && buf[i] != '\r' && i < size)
-					fprintf (f, "%c", buf[i++]);
-				fprintf (f, " */\n");
-				if (i < size && buf[i] == '\n')
-					i++;
-				else if (i < size && buf[i] == '\r')
-					i+=2;
-			}
-			else
-			{
-				fprintf (f, "/");
-				i++;
-
-				if (buf[i] == '*')
-				{
-					fprintf (f, "*");
-					i++;
-
-					for (;;)
-					{
-						if (buf[i] == '*' && buf[i+1] == '/')
-						{
-							fprintf (f, "*/");
-							i+=2;
-							break;
-						}
-						else
-						{
-							fprintf (f, "%c", buf[i]);
-							i++;
-						}
-					}
-				}
-			}
-		}
-		else
-		{
-			fprintf (f, "%c", buf[i]);
-			i++;
-		}
-	}
-	fclose (f);
-	return 0;
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cppstruct.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cppstruct.c
deleted file mode 100755
index c55b3f7c7..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cppstruct.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* cppstruct.c */
-/* */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "slglobals.h"
-
-CPPStruct  *cpp      = NULL;
-static int  refCount = 0;
-
-int InitPreprocessor(void);
-int ResetPreprocessor(void);
-int FreeCPPStruct(void);
-int FinalizePreprocessor(void);
-
-/*
- * InitCPPStruct() - Initilaize the CPP structure.
- *
- */
-
-int InitCPPStruct(void)
-{
-    int len;
-    char *p;
-
-    cpp = (CPPStruct *) malloc(sizeof(CPPStruct));
-    if (cpp == NULL)
-        return 0;
-
-    refCount++;
-
-    /* Initialize public members: */
-    cpp->pLastSourceLoc = &cpp->lastSourceLoc;
-    
-	p = (char *) &cpp->options;
-    len = sizeof(cpp->options);
-    while (--len >= 0)
-        p[len] = 0;
-     
-    ResetPreprocessor();
-    return 1;
-} /* InitCPPStruct */
-
-int ResetPreprocessor(void)
-{
-    /* Initialize private members: */
-
-    cpp->lastSourceLoc.file = 0;
-    cpp->lastSourceLoc.line = 0;
-	cpp->pC=0;
-    cpp->CompileError=0; 
-	cpp->ifdepth=0;
-    for(cpp->elsetracker=0; cpp->elsetracker<64; cpp->elsetracker++)
-		cpp->elsedepth[cpp->elsetracker]=0; 
-	cpp->elsetracker=0;
-    cpp->tokensBeforeEOF = 0;
-    return 1;
-}
-
-/*Intializing the Preprocessor. */
-
-int InitPreprocessor(void)
-{
-   #  define CPP_STUFF true
-        #  ifdef CPP_STUFF
-            FreeCPPStruct();
-            InitCPPStruct();
-            cpp->options.Quiet = 1;
-            cpp->options.profileString = "generic";
-            if (!InitAtomTable(atable, 0))
-                return 1;
-            if (!InitScanner(cpp))
-	            return 1;
-       #  endif
-  return 0; 
-}
-
-/*FreeCPPStruct() - Free the CPP structure. */
-
-int FreeCPPStruct(void)
-{
-    if (refCount)
-    {
-       free(cpp);
-       refCount--;
-    }
-    
-    return 1;
-}
-
-/*Finalizing the Preprocessor. */
-
-int FinalizePreprocessor(void)
-{
-   #  define CPP_STUFF true
-        #  ifdef CPP_STUFF
-            FreeAtomTable(atable);
-            FreeCPPStruct();
-            FreeScanner();
-       #  endif
-  return 0; 
-}
-
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*//////////////////////////////////// End of cppstruct.c ////////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.c
deleted file mode 100755
index ed0f4fb4b..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __STDC99__
-#include <stdint.h>
-#elif defined (_WIN64)
-typedef unsigned __int64 uintptr_t;
-#else 
-typedef unsigned int uintptr_t;
-#endif
-
-#include "memory.h"
-
-/* default alignment and chunksize, if called with 0 arguments */
-#define CHUNKSIZE       (64*1024)
-#define ALIGN           8
-
-/* we need to call the `real' malloc and free, not our replacements */
-#undef malloc
-#undef free
-
-struct chunk {
-    struct chunk        *next;
-};
-
-struct cleanup {
-    struct cleanup      *next;
-    void                (*fn)(void *);
-    void                *arg;
-};
-
-struct MemoryPool_rec {
-    struct chunk        *next;
-    uintptr_t           free, end;
-    size_t              chunksize;
-    uintptr_t           alignmask;
-    struct cleanup      *cleanup;
-};
-
-MemoryPool *mem_CreatePool(size_t chunksize, unsigned int align)
-{
-    MemoryPool  *pool;
-
-    if (align == 0) align = ALIGN;
-    if (chunksize == 0) chunksize = CHUNKSIZE;
-    if (align & (align-1)) return 0;
-    if (chunksize < sizeof(MemoryPool)) return 0;
-    if (chunksize & (align-1)) return 0;
-    if (!(pool = malloc(chunksize))) return 0;
-    pool->next = 0;
-    pool->chunksize = chunksize;
-    pool->alignmask = (uintptr_t)(align)-1;  
-    pool->free = ((uintptr_t)(pool + 1) + pool->alignmask) & ~pool->alignmask;
-    pool->end = (uintptr_t)pool + chunksize;
-    pool->cleanup = 0;
-    return pool;
-}
-
-void mem_FreePool(MemoryPool *pool)
-{
-    struct cleanup      *cleanup;
-    struct chunk        *p, *next;
-
-    for (cleanup = pool->cleanup; cleanup; cleanup = cleanup->next) {
-        cleanup->fn(cleanup->arg);
-    }
-    for (p = (struct chunk *)pool; p; p = next) {
-        next = p->next;
-        free(p);
-    }
-}
-
-void *mem_Alloc(MemoryPool *pool, size_t size)
-{
-    struct chunk *ch;
-    void *rv = (void *)pool->free;
-    size = (size + pool->alignmask) & ~pool->alignmask;
-    if (size <= 0) size = pool->alignmask;
-    pool->free += size;
-    if (pool->free > pool->end || pool->free < (uintptr_t)rv) {
-        size_t minreq = (size + sizeof(struct chunk) + pool->alignmask)
-                      & ~pool->alignmask;
-        pool->free = (uintptr_t)rv;
-        if (minreq >= pool->chunksize) {
-            /* request size is too big for the chunksize, so allocate it as */
-            /* a single chunk of the right size */
-            ch = malloc(minreq);
-            if (!ch) return 0;
-        } else {
-            ch = malloc(pool->chunksize);
-            if (!ch) return 0;
-            pool->free = (uintptr_t)ch + minreq;
-            pool->end = (uintptr_t)ch + pool->chunksize;
-        }
-        ch->next = pool->next;
-        pool->next = ch;
-        rv = (void *)(((uintptr_t)(ch+1) + pool->alignmask) & ~pool->alignmask);
-    }
-    return rv;
-}
-
-int mem_AddCleanup(MemoryPool *pool, void (*fn)(void *), void *arg) {
-    struct cleanup *cleanup;
-
-    pool->free = (pool->free + sizeof(void *) - 1) & ~(sizeof(void *)-1);
-    cleanup = mem_Alloc(pool, sizeof(struct cleanup));
-    if (!cleanup) return -1;
-    cleanup->next = pool->cleanup;
-    cleanup->fn = fn;
-    cleanup->arg = arg;
-    pool->cleanup = cleanup;
-    return 0;
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.h
deleted file mode 100755
index 89a57e24c..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-#ifndef __MEMORY_H
-#define __MEMORY_H
-
-typedef struct MemoryPool_rec MemoryPool;
-
-extern MemoryPool *mem_CreatePool(size_t chunksize, unsigned align);
-extern void mem_FreePool(MemoryPool *);
-extern void *mem_Alloc(MemoryPool *p, size_t size);
-extern void *mem_Realloc(MemoryPool *p, void *old, size_t oldsize, size_t newsize);
-extern int mem_AddCleanup(MemoryPool *p, void (*fn)(void *), void *arg);
-
-#endif /* __MEMORY_H */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/parser.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/parser.h
deleted file mode 100755
index 5f70bdd1a..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/parser.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-
-#ifndef BISON_PARSER_H
-# define BISON_PARSER_H
-
-#ifndef yystypepp
-typedef struct {
-    int    sc_int;
-    float  sc_fval;
-    int    sc_ident;
-	char   symbol_name[MAX_SYMBOL_NAME_LEN+1];
-} yystypepp;
-
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-# define	CPP_AND_OP	        257
-# define	CPP_SUB_ASSIGN	    259
-# define	CPP_MOD_ASSIGN	    260
-# define	CPP_ADD_ASSIGN	261
-# define	CPP_DIV_ASSIGN	262
-# define	CPP_MUL_ASSIGN	263
-# define	CPP_EQ_OP	        264
-# define    CPP_XOR_OP         265 
-# define	ERROR_SY	    266
-# define	CPP_FLOATCONSTANT	267
-# define	CPP_GE_OP	        268
-# define	CPP_RIGHT_OP        269
-# define	CPP_IDENTIFIER	    270
-# define	CPP_INTCONSTANT	    271
-# define	CPP_LE_OP	        272
-# define	CPP_LEFT_OP	        273
-# define	CPP_DEC_OP	274
-# define	CPP_NE_OP	        275
-# define	CPP_OR_OP	        276
-# define	CPP_INC_OP	    277
-# define	CPP_STRCONSTANT	    278
-# define	CPP_TYPEIDENTIFIER	279
-
-# define	FIRST_USER_TOKEN_SY	289
-
-# define	CPP_RIGHT_ASSIGN	    280
-# define	CPP_LEFT_ASSIGN	    281
-# define	CPP_AND_ASSIGN	282
-# define	CPP_OR_ASSIGN  	283
-# define	CPP_XOR_ASSIGN	284
-# define	CPP_LEFT_BRACKET	285
-# define	CPP_RIGHT_BRACKET	286
-# define	CPP_LEFT_BRACE	287
-# define	CPP_RIGHT_BRACE	288
-
-#endif /* not BISON_PARSER_H */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/preprocess.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/preprocess.h
deleted file mode 100755
index 63996d669..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/preprocess.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-
-# include "slglobals.h"
-extern CPPStruct *cpp;
-int InitCPPStruct(void);
-int InitScanner(CPPStruct *cpp);
-int InitAtomTable(AtomTable *atable, int htsize);
-int ScanFromString(char *s);
-char* GetStringOfAtom(AtomTable *atable, int atom);
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.c
deleted file mode 100755
index d80e37b8e..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.c
+++ /dev/null
@@ -1,789 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* scanner.c */
-/* */
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if 0
-    #include <ieeefp.h>
-    #else
-    #define isinff(x) (((*(long *)&(x) & 0x7f800000L)==0x7f800000L) && \
-                       ((*(long *)&(x) & 0x007fffffL)==0000000000L))
-#endif
-
-#include "slglobals.h"
-
-
-typedef struct StringInputSrc {
-    InputSrc base;
-    char *p;
-} StringInputSrc;
-
-static int eof_scan(InputSrc *is, yystypepp * yylvalpp)
-{
-    return EOF;
-} /* eof_scan */
-
-static void noop(InputSrc *in, int ch, yystypepp * yylvalpp) {}
-
-static InputSrc eof_inputsrc = { 0, &eof_scan, &eof_scan, &noop };
-
-static int byte_scan(InputSrc *, yystypepp * yylvalpp);
-
-#define EOL_SY '\n'
-
-#if defined(_WIN32)
-    #define DBG_BREAKPOINT() __asm int 3
-    #elif defined(_M_AMD64)
-    #define DBG_BREAKPOINT() assert(!"Dbg_Breakpoint");
-    #else
-    #define DBG_BREAKPOINT()
-    #endif
-
-    #if defined(_WIN32) && !defined(_M_AMD64)
-    __int64 RDTSC ( void ) {
-
-        __int64 v;
-    
-        __asm __emit 0x0f
-        __asm __emit 0x31
-        __asm mov dword ptr v, eax
-        __asm mov dword ptr v+4, edx
-    
-        return v;
-    }
-#endif
-
-
-int InitScanner(CPPStruct *cpp)
-{
-    /* Add various atoms needed by the CPP line scanner: */
-    if (!InitCPP())
-        return 0;
-
-    cpp->mostRecentToken = 0;
-    cpp->tokenLoc = &cpp->ltokenLoc;
-
-    cpp->ltokenLoc.file = 0;
-    cpp->ltokenLoc.line = 0;
-
-    cpp->currentInput = &eof_inputsrc;
-    cpp->previous_token = '\n';
-    cpp->notAVersionToken = 0;
-
-    return 1;
-} /* InitScanner */
-
-int FreeScanner(void)
-{
-    return (FreeCPP());
-}
-
-/*
- * str_getch()
- * takes care of reading from multiple strings.
- * returns the next-char from the input stream.
- * returns EOF when the complete shader is parsed.
- */
-static int str_getch(StringInputSrc *in)
-{
-	for(;;){
-	   if (*in->p){
-	      if (*in->p == '\n') {
-             in->base.line++;
-             IncLineNumber();
-          }
-          return *in->p++;
-	   }
-	   if(++(cpp->PaWhichStr) < cpp->PaArgc){
-		  free(in);
-		  SetStringNumber(cpp->PaWhichStr);
-    	  SetLineNumber(1);
-		  ScanFromString(cpp->PaArgv[cpp->PaWhichStr]);
-		  in=(StringInputSrc*)cpp->currentInput;
-	      continue;             
-	   }
-	   else{
-	      cpp->currentInput = in->base.prev;
-	      cpp->PaWhichStr=0;
-          free(in);
-          return EOF;
-       }  
-	}
-} /* str_getch */
-
-static void str_ungetch(StringInputSrc *in, int ch, yystypepp *type) {
-    if (in->p[-1] == ch)in->p--;
-	else {
-		*(in->p)='\0'; /*this would take care of shifting to the previous string. */
-	    cpp->PaWhichStr--;
-	}  
-	if (ch == '\n') {
-        in->base.line--;
-        DecLineNumber();
-    }
-} /* str_ungetch */
-
-int ScanFromString(char *s)
-{
-    
-	StringInputSrc *in = malloc(sizeof(StringInputSrc));
-    memset(in, 0, sizeof(StringInputSrc));
-	in->p = s;
-    in->base.line = 1;
-    in->base.scan = byte_scan;
-    in->base.getch = (int (*)(InputSrc *, yystypepp *))str_getch;
-    in->base.ungetch = (void (*)(InputSrc *, int, yystypepp *))str_ungetch;
-    in->base.prev = cpp->currentInput;
-    cpp->currentInput = &in->base;
-
-    return 1;
-} /* ScanFromString; */
-
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*///////////////////////////////// Floating point constants: ///////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*
- * lBuildFloatValue() - Quick and dirty conversion to floating point.  Since all
- *         we need is single precision this should be quite precise.
- */
-
-static float lBuildFloatValue(const char *str, int len, int exp)
-{
-    double val, expval, ten;
-    int ii, llen, absexp;
-    float rv;
-
-    val = 0.0;
-    llen = len;
-    for (ii = 0; ii < len; ii++)
-        val = val*10.0 + (str[ii] - '0');
-    if (exp != 0) {
-        absexp = exp > 0 ? exp : -exp;
-        expval = 1.0f;
-        ten = 10.0;
-        while (absexp) {
-            if (absexp & 1)
-                expval *= ten;
-            ten *= ten;
-            absexp >>= 1;
-        }
-        if (exp >= 0) {
-            val *= expval;
-        } else {
-            val /= expval;
-        }
-    }
-    rv = (float)val;
-    if (isinff(rv)) {
-		CPPErrorToInfoLog(" ERROR___FP_CONST_OVERFLOW");
-    }
-    return rv;
-} /* lBuildFloatValue */
-
-
-/*
- * lFloatConst() - Scan a floating point constant.  Assumes that the scanner
- *         has seen at least one digit, followed by either a decimal '.' or the
- *         letter 'e'.
- */
-
-static int lFloatConst(char *str, int len, int ch, yystypepp * yylvalpp)
-{
-    int HasDecimal, declen, exp, ExpSign;
-    int str_len;
-    float lval;
-    
-    HasDecimal = 0;
-    declen = 0;
-    exp = 0;
-	
-    str_len=len;
-    if (ch == '.') {
-		str[len++]=ch;
-        HasDecimal = 1;
-        ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-        while (ch >= '0' && ch <= '9') {
-            if (len < MAX_SYMBOL_NAME_LEN) {
-                declen++;
-                if (len > 0 || ch != '0') {
-                    str[len] = ch;
-                    len++;str_len++;
-                }
-                ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            } else {
-                CPPErrorToInfoLog("ERROR___FP_CONST_TOO_LONG");
-                len = 1,str_len=1;
-            }
-        }
-    }
-
-    /* Exponent: */
-
-    if (ch == 'e' || ch == 'E') {
-        ExpSign = 1;
-		str[len++]=ch;
-        ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-        if (ch == '+') {
-            str[len++]=ch;  
-			ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-        } else if (ch == '-') {
-            ExpSign = -1;
-			str[len++]=ch;
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-        }
-        if (ch >= '0' && ch <= '9') {
-            while (ch >= '0' && ch <= '9') {
-                exp = exp*10 + ch - '0';
-				str[len++]=ch;
-                ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            }
-        } else {
-            CPPErrorToInfoLog("ERROR___ERROR_IN_EXPONENT");
-        }
-        exp *= ExpSign;
-    }
-      
-    if (len == 0) {
-        lval = 0.0f;
-		strcpy(str,"0.0");
-    } else {
-        str[len]='\0';      
-        lval = lBuildFloatValue(str, str_len, exp - declen);
-    }
-    /* Suffix: */
-    
-    yylvalpp->sc_fval = lval;
-    strcpy(yylvalpp->symbol_name,str);
-    cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);            
-    return CPP_FLOATCONSTANT;
-} /* lFloatConst */
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*/////////////////////////////////////// Normal Scanner ////////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-    
-static int byte_scan(InputSrc *in, yystypepp * yylvalpp)
-{
-    char symbol_name[MAX_SYMBOL_NAME_LEN + 1];
-    char string_val[MAX_STRING_LEN + 1];
-    int AlreadyComplained;
-    int len, ch, ii, ival = 0;
-
-    for (;;) {
-        yylvalpp->sc_int = 0;
-        ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-		
-        while (ch == ' ' || ch == '\t' || ch == '\r') {
-            yylvalpp->sc_int = 1;
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-        }
-		
-        cpp->ltokenLoc.file = cpp->currentInput->name;
-        cpp->ltokenLoc.line = cpp->currentInput->line;
-        len = 0;
-        switch (ch) {
-        default:
-			return ch; /* Single character token */
-        case EOF:
-            return -1;
-		case 'A': case 'B': case 'C': case 'D': case 'E':
-        case 'F': case 'G': case 'H': case 'I': case 'J':
-        case 'K': case 'L': case 'M': case 'N': case 'O':
-        case 'P': case 'Q': case 'R': case 'S': case 'T':
-        case 'U': case 'V': case 'W': case 'X': case 'Y':
-        case 'Z': case '_':
-        case 'a': case 'b': case 'c': case 'd': case 'e':
-        case 'f': case 'g': case 'h': case 'i': case 'j':
-        case 'k': case 'l': case 'm': case 'n': case 'o':
-        case 'p': case 'q': case 'r': case 's': case 't':
-        case 'u': case 'v': case 'w': case 'x': case 'y':
-        case 'z':            
-            do {
-                if (len < MAX_SYMBOL_NAME_LEN) {
-                    symbol_name[len] = ch;
-                    len++;
-                    ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                } else {
-                    ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                }
-            } while ((ch >= 'a' && ch <= 'z') ||
-                     (ch >= 'A' && ch <= 'Z') ||
-                     (ch >= '0' && ch <= '9') ||
-                     ch == '_');
-            if (len >= MAX_SYMBOL_NAME_LEN)
-                len = MAX_SYMBOL_NAME_LEN - 1;
-            symbol_name[len] = '\0';
-            cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-            yylvalpp->sc_ident = LookUpAddString(atable, symbol_name);
-            return CPP_IDENTIFIER;
-            break;
-        case '0':
-            yylvalpp->symbol_name[len++] = ch;
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == 'x' || ch == 'X') {
-				yylvalpp->symbol_name[len++] = ch;
-                ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                if ((ch >= '0' && ch <= '9') ||
-                    (ch >= 'A' && ch <= 'F') ||
-                    (ch >= 'a' && ch <= 'f'))
-                {
-                    AlreadyComplained = 0;
-                    ival = 0;
-                    do {
-						yylvalpp->symbol_name[len++] = ch;
-                        if (ival <= 0x0fffffff) {
-                            if (ch >= '0' && ch <= '9') {
-                                ii = ch - '0';
-                            } else if (ch >= 'A' && ch <= 'F') {
-                                ii = ch - 'A' + 10;
-                            } else {
-                                ii = ch - 'a' + 10;
-                            }
-                            ival = (ival << 4) | ii;
-                        } else {
-                            if (!AlreadyComplained)
-                                CPPErrorToInfoLog("ERROR___HEX_CONST_OVERFLOW");
-                            AlreadyComplained = 1;
-                        }
-                        ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                    } while ((ch >= '0' && ch <= '9') ||
-                             (ch >= 'A' && ch <= 'F') ||
-                             (ch >= 'a' && ch <= 'f'));
-                } else {
-                    CPPErrorToInfoLog("ERROR___ERROR_IN_HEX_CONSTANT");
-                }
-                yylvalpp->symbol_name[len] = '\0';
-				cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-				yylvalpp->sc_int = ival;
-                return CPP_INTCONSTANT;
-            } else if (ch >= '0' && ch <= '7') { /* octal integer constants */
-                AlreadyComplained = 0;
-                ival = 0;
-                do {
-                    yylvalpp->symbol_name[len++] = ch;
-                    if (ival <= 0x1fffffff) {
-                        ii = ch - '0';
-                        ival = (ival << 3) | ii;
-                    } else {
-                        if (!AlreadyComplained)
-                           CPPErrorToInfoLog("ERROR___OCT_CONST_OVERFLOW");
-                        AlreadyComplained = 1;
-                    }
-                    ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                } while (ch >= '0' && ch <= '7');
-                if (ch == '.' || ch == 'e' || ch == 'f' || ch == 'h' || ch == 'x'|| ch == 'E') 
-                     return lFloatConst(yylvalpp->symbol_name, len, ch, yylvalpp);
-                yylvalpp->symbol_name[len] = '\0';
-				cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-				yylvalpp->sc_int = ival;
-                return CPP_INTCONSTANT;
-            } else {
-				cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-				ch = '0';
-            }
-            /* Fall through... */
-        case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-            do {
-                if (len < MAX_SYMBOL_NAME_LEN) {
-                    if (len > 0 || ch != '0') {
-                        yylvalpp->symbol_name[len] = ch;
-                   len++;
-                    }
-                    ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                }
-            } while (ch >= '0' && ch <= '9');
-            if (ch == '.' || ch == 'e' || ch == 'f' || ch == 'h' || ch == 'x'|| ch == 'E') {
-                return lFloatConst(yylvalpp->symbol_name, len, ch, yylvalpp);
-            } else {
-                yylvalpp->symbol_name[len] = '\0';
-				cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                ival = 0;
-                AlreadyComplained = 0;
-                for (ii = 0; ii < len; ii++) {
-                    ch = yylvalpp->symbol_name[ii] - '0';
-                    if ((ival > 214748364) || (ival == 214748364 && ch >= 8)) {
-                        if (!AlreadyComplained)
-                           CPPErrorToInfoLog("ERROR___INTEGER_CONST_OVERFLOW");
-                        AlreadyComplained = 1;
-                    }
-                    ival = ival*10 + ch;
-                }
-                yylvalpp->sc_int = ival;
-                if(ival==0)
-                   strcpy(yylvalpp->symbol_name,"0");
-                return CPP_INTCONSTANT;
-            }
-            break;
-        case '-':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '-') {
-                return CPP_DEC_OP;
-            } else if (ch == '=') {
-                return CPP_SUB_ASSIGN;
-            } else {
-                cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                return '-';
-            }
-        case '+':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '+') {
-                return CPP_INC_OP;
-            } else if (ch == '=') {
-                return CPP_ADD_ASSIGN;
-            } else {
-                cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                return '+';
-            }
-        case '*':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '=') {
-                return CPP_MUL_ASSIGN;
-            } else {
-                cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                return '*';
-            }
-        case '%':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '=') {
-                return CPP_MOD_ASSIGN;
-            } else if (ch == '>'){
-                return CPP_RIGHT_BRACE;
-            } else {
-                cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                return '%';
-            }
-        case ':':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '>') {
-                return CPP_RIGHT_BRACKET;
-            } else {
-                cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                return ':';
-            }
-        case '^':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '^') {
-                return CPP_XOR_OP;
-            } else {
-                if (ch == '=')
-                    return CPP_XOR_ASSIGN;
-                else{
-                  cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                  return '^';
-                }
-            }
-        
-        case '=':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '=') {
-                return CPP_EQ_OP;
-            } else {
-                cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                return '=';
-            }
-        case '!':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '=') {
-                return CPP_NE_OP;
-            } else {
-                cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                return '!';
-            }
-        case '|':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '|') {
-                return CPP_OR_OP;
-            } else {
-                if (ch == '=')
-                    return CPP_OR_ASSIGN;
-                else{
-                  cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                  return '|';
-                }
-            }
-        case '&':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '&') {
-                return CPP_AND_OP;
-            } else {
-                if (ch == '=')
-                    return CPP_AND_ASSIGN;
-                else{
-                  cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                  return '&';
-                }
-            }
-        case '<':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '<') {
-                ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                if(ch == '=')
-                    return CPP_LEFT_ASSIGN;
-                else{
-                    cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                    return CPP_LEFT_OP;
-                }
-            } else {
-                if (ch == '=') {
-                    return CPP_LE_OP;
-                } else {
-                    if (ch == '%')
-                        return CPP_LEFT_BRACE;
-                    else if (ch == ':')
-                        return CPP_LEFT_BRACKET;
-                    else{
-                        cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                        return '<';
-                    }
-                }
-            }
-        case '>':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '>') {
-                ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                if(ch == '=')
-                    return CPP_RIGHT_ASSIGN;
-                else{
-                    cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                    return CPP_RIGHT_OP;
-                }
-            } else {
-                if (ch == '=') {
-                    return CPP_GE_OP;
-                } else {
-                    cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                    return '>';
-                }
-            }
-        case '.':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch >= '0' && ch <= '9') {
-                cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                return lFloatConst(yylvalpp->symbol_name, 0, '.', yylvalpp);
-            } else {
-                if (ch == '.') {
-                    return -1; /* Special EOF hack */
-                } else {
-                    cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                    return '.';
-                }
-            }
-        case '/':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            if (ch == '/') {
-                do {
-                    ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                } while (ch != '\n' && ch != EOF);
-                if (ch == EOF)
-                    return -1;
-                return '\n';
-            } else if (ch == '*') {
-                int nlcount = 0;
-                ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                do {
-                    while (ch != '*') {
-                        if (ch == '\n') nlcount++;
-                        if (ch == EOF) {
-                            CPPErrorToInfoLog("ERROR___EOF_IN_COMMENT");
-                            return -1;
-                        }
-                        ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                    }
-                    ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                    if (ch == EOF) {
-                        CPPErrorToInfoLog("ERROR___EOF_IN_COMMENT");
-                        return -1;
-                    }
-                } while (ch != '/');
-                if (nlcount) {
-                    return '\n';
-                }
-                /* Go try it again... */
-            } else if (ch == '=') {
-                return CPP_DIV_ASSIGN;
-            } else {
-                cpp->currentInput->ungetch(cpp->currentInput, ch, yylvalpp);
-                return '/';
-            }
-            break;
-        case '"':
-            ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-            while (ch != '"' && ch != '\n' && ch != EOF) {
-                if (ch == '\\') {
-                    ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                    if (ch == '\n' || ch == EOF) {
-                        break;
-                    }
-                }
-                if (len < MAX_STRING_LEN) {
-                    string_val[len] = ch;
-                    len++;
-                    ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
-                }
-            };
-            string_val[len] = '\0';
-            if (ch == '"') {
-                yylvalpp->sc_ident = LookUpAddString(atable, string_val);
-                return CPP_STRCONSTANT;
-            } else {
-                CPPErrorToInfoLog("ERROR___CPP_EOL_IN_STRING");
-                return ERROR_SY;
-            }
-        }
-    }
-} /* byte_scan */
-
-int yylex_CPP(char* buf, int maxSize)
-{    
-	yystypepp yylvalpp;
-    int token = '\n';
-
-    for(;;) {
-		
-        char* tokenString = 0;
-        token = cpp->currentInput->scan(cpp->currentInput, &yylvalpp);
-		if(check_EOF(token))
-		   return 0;
-		if (token == '#' && (cpp->previous_token == '\n'||cpp->previous_token==0)) {
-			token = readCPPline(&yylvalpp);
-            if(check_EOF(token))
-                return 0;
-			continue;
-		}
-        cpp->previous_token = token;
-        /* expand macros */
-        if (token == CPP_IDENTIFIER && MacroExpand(yylvalpp.sc_ident, &yylvalpp)) {
-            cpp->notAVersionToken = 1;
-            continue;
-        }
-        
-        if (token == '\n')
-            continue;
-  
-        if (token == CPP_IDENTIFIER) {
-            cpp->notAVersionToken = 1;
-            tokenString = GetStringOfAtom(atable,yylvalpp.sc_ident);
-        } else if (token == CPP_FLOATCONSTANT||token == CPP_INTCONSTANT){ 
-            cpp->notAVersionToken = 1;
-            tokenString = yylvalpp.symbol_name;
-		} else {
-            cpp->notAVersionToken = 1;
-            tokenString = GetStringOfAtom(atable,token);
-	    }
-		 
-        if (tokenString) {
-            if ((signed)strlen(tokenString) >= maxSize) {
-                cpp->tokensBeforeEOF = 1;
-                return maxSize;
-            } else  if (strlen(tokenString) > 0) {
-			    strcpy(buf, tokenString);
-                cpp->tokensBeforeEOF = 1;
-                return (int)strlen(tokenString);
-            }
-
-            return 0;
-        }
-    }
-
-    return 0;
-} /* yylex */
-
-/*Checks if the token just read is EOF or not. */
-int check_EOF(int token)
-{
-   if(token==-1){
-       if(cpp->ifdepth >0){
-		CPPErrorToInfoLog("#endif missing!! Compilation stopped");
-        cpp->CompileError=1;
-       }
-      return 1;
-   }
-   return 0;
-}
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*///////////////////////////////////// End of scanner.c ////////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.h
deleted file mode 100755
index 15472b5bf..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* scanner.h */
-/* */
-
-#if !defined(__SCANNER_H)
-#define __SCANNER_H 1
-
-#define MAX_SYMBOL_NAME_LEN 128
-#define MAX_STRING_LEN 512
-
-#include "parser.h"
-
-/* Not really atom table stuff but needed first... */
-
-typedef struct SourceLoc_Rec {
-    unsigned short file, line;
-} SourceLoc;
-
-int yyparse (void);
-
-int yylex_CPP(char* buf, int maxSize);
-
-typedef struct InputSrc {
-    struct InputSrc	*prev;
-    int			(*scan)(struct InputSrc *, yystypepp *);
-    int			(*getch)(struct InputSrc *, yystypepp *);
-    void		(*ungetch)(struct InputSrc *, int, yystypepp *);
-    int			name;  /* atom */
-    int			line;
-} InputSrc;
-
-int InitScanner(CPPStruct *cpp);   /* Intialise the cpp scanner.  */
-int ScanFromString(char *);      /* Start scanning the input from the string mentioned. */
-int check_EOF(int);              /* check if we hit a EOF abruptly  */
-void CPPErrorToInfoLog(char *);   /* sticking the msg,line into the Shader's.Info.log */
-void SetLineNumber(int);
-void SetStringNumber(int);
-void IncLineNumber(void);
-void DecLineNumber(void);
-int FreeScanner(void);                 /* Free the cpp scanner */
-#endif /* !(defined(__SCANNER_H) */
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/slglobals.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/slglobals.h
deleted file mode 100755
index 667ada6a2..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/slglobals.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* slglobals.h */
-/* */
-
-#if !defined(__SLGLOBALS_H)
-#define __SLGLOBALS_H 1
-
-typedef struct CPPStruct_Rec CPPStruct;
-
-extern CPPStruct *cpp;
-
-#undef  CPPC_DEBUG_THE_COMPILER
-#if defined(_DEBUG)
-#define CPPC_DEBUG_THE_COMPILER 1
-#endif
-
-#undef  CPPC_ENABLE_TOOLS
-#define CPPC_ENABLE_TOOLS 1
-
-#include "memory.h"
-#include "atom.h"
-#include "scanner.h"
-#include "cpp.h"
-#include "tokens.h"
-#include "symbols.h"
-#include "compile.h"
-#if !defined(NO_PARSER)
-#include "parser.h"
-#endif
-
-#if !defined(NULL)
-#define NULL 0
-#endif
-
-#endif /* !(defined(__SLGLOBALS_H) */
-
-
-    
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.c
deleted file mode 100755
index e807fe343..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* symbols.c */
-/* */
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "slglobals.h"
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*///////////////////////////////// Symbol Table Variables: /////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-
-Scope *ScopeList = NULL;
-Scope *CurrentScope = NULL;
-Scope *GlobalScope = NULL;
-
-static void unlinkScope(void *_scope) {
-    Scope *scope = _scope;
-
-    if (scope->next)
-        scope->next->prev = scope->prev;
-    if (scope->prev)
-        scope->prev->next = scope->next;
-    else
-        ScopeList = scope->next;
-}
-
-/*
- * NewScope()
- *
- */
-Scope *NewScopeInPool(MemoryPool *pool)
-{
-    Scope *lScope;
-
-    lScope = mem_Alloc(pool, sizeof(Scope));
-    lScope->pool = pool;
-    lScope->parent = NULL;
-    lScope->funScope = NULL;
-    lScope->symbols = NULL;
-    
-    lScope->level = 0;
-
-    lScope->programs = NULL;
-    if ((lScope->next = ScopeList))
-        ScopeList->prev = lScope;
-    lScope->prev = 0;
-    ScopeList = lScope;
-    mem_AddCleanup(pool, unlinkScope, lScope);
-    return lScope;
-} /* NewScope */
-
-/*
- * PushScope()
- *
- */
-
-void PushScope(Scope *fScope)
-{
-    Scope *lScope;
-
-    if (CurrentScope) {
-        fScope->level = CurrentScope->level + 1;
-        if (fScope->level == 1) {
-            if (!GlobalScope) {
-                /* HACK - CTD -- if GlobalScope==NULL and level==1, we're
-                 * defining a function in the superglobal scope.  Things
-                 * will break if we leave the level as 1, so we arbitrarily
-                 * set it to 2 */
-                fScope->level = 2;
-            }
-        }
-        if (fScope->level >= 2) {
-            lScope = fScope;
-            while (lScope->level > 2)
-                lScope = lScope->next;
-            fScope->funScope = lScope;
-        }
-    } else {
-        fScope->level = 0;
-    }
-    fScope->parent = CurrentScope;
-    CurrentScope = fScope;
-} /* PushScope */
-
-/*
- * PopScope()
- *
- */
-
-Scope *PopScope(void)
-{
-    Scope *lScope;
-
-    lScope = CurrentScope;
-    if (CurrentScope)
-        CurrentScope = CurrentScope->parent;
-    return lScope;
-} /* PopScope */
-
-/*
- * NewSymbol() - Allocate a new symbol node;
- *
- */
-
-Symbol *NewSymbol(SourceLoc *loc, Scope *fScope, int name, symbolkind kind)
-{
-    Symbol *lSymb;
-    char *pch;
-    int ii;
-
-    lSymb = (Symbol *) mem_Alloc(fScope->pool, sizeof(Symbol));
-    lSymb->left = NULL;
-    lSymb->right = NULL;
-    lSymb->next = NULL;
-    lSymb->name = name;
-    lSymb->loc = *loc;
-    lSymb->kind = kind;
-    
-    /* Clear union area: */
-
-    pch = (char *) &lSymb->details;
-    for (ii = 0; ii < sizeof(lSymb->details); ii++)
-        *pch++ = 0;
-    return lSymb;
-} /* NewSymbol */
-
-/*
- * lAddToTree() - Using a binary tree is not a good idea for basic atom values because they
- *         are generated in order.  We'll fix this later (by reversing the bit pattern).
- */
-
-static void lAddToTree(Symbol **fSymbols, Symbol *fSymb)
-{
-    Symbol *lSymb;
-    int lrev, frev;
-
-    lSymb = *fSymbols;
-    if (lSymb) {
-        frev = GetReversedAtom(atable, fSymb->name);
-        while (lSymb) {
-            lrev = GetReversedAtom(atable, lSymb->name);
-            if (lrev == frev) {
-                CPPErrorToInfoLog("GetAtomString(atable, fSymb->name)");
-                break;
-            } else {
-                if (lrev > frev) {
-                    if (lSymb->left) {
-                        lSymb = lSymb->left;
-                    } else {
-                        lSymb->left = fSymb;
-                        break;
-                    }
-                } else {
-                    if (lSymb->right) {
-                        lSymb = lSymb->right;
-                    } else {
-                        lSymb->right = fSymb;
-                        break;
-                    }
-                }
-            }
-        }
-    } else {
-        *fSymbols = fSymb;
-    }
-} /* lAddToTree */
-
-
-/*
- * AddSymbol() - Add a variable, type, or function name to a scope.
- *
- */
-
-Symbol *AddSymbol(SourceLoc *loc, Scope *fScope, int atom, symbolkind kind)
-{
-    Symbol *lSymb;
-
-    if (!fScope)
-        fScope = CurrentScope;
-    lSymb = NewSymbol(loc, fScope, atom, kind);
-    lAddToTree(&fScope->symbols, lSymb);
-    return lSymb;
-} /* AddSymbol */
-
-
-/*********************************************************************************************/
-/************************************ Symbol Semantic Functions ******************************/
-/*********************************************************************************************/
-
-/*
- * LookUpLocalSymbol()
- *
- */
-
-Symbol *LookUpLocalSymbol(Scope *fScope, int atom)
-{
-    Symbol *lSymb;
-    int rname, ratom;
-
-    ratom = GetReversedAtom(atable, atom);
-    if (!fScope)
-        fScope = CurrentScope;
-    lSymb = fScope->symbols;
-    while (lSymb) {
-        rname = GetReversedAtom(atable, lSymb->name);
-        if (rname == ratom) {
-            return lSymb;
-        } else {
-            if (rname > ratom) {
-                lSymb = lSymb->left;
-            } else {
-                lSymb = lSymb->right;
-            }
-        }
-    }
-    return NULL;
-} /* LookUpLocalSymbol */
-
-/*
- * LookUpSymbol()
- *
- */
-
-Symbol *LookUpSymbol(Scope *fScope, int atom)
-{
-    Symbol *lSymb;
-
-    if (!fScope)
-        fScope = CurrentScope;
-    while (fScope) {
-        lSymb = LookUpLocalSymbol(fScope, atom);
-        if (lSymb)
-            return lSymb;
-        fScope = fScope->parent;
-    }
-    return NULL;
-} /* LookUpSymbol */
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.h
deleted file mode 100755
index 65cba9d6c..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* symbols.h */
-/* */
-
-#if !defined(__SYMBOLS_H)
-#define __SYMBOLS_H 1
-
-#include "memory.h"
-
-typedef enum symbolkind {
-   MACRO_S
-} symbolkind;
-
-/* Typedefs for things defined here in "symbols.h": */
-
-typedef struct Scope_Rec Scope;
-typedef struct Symbol_Rec Symbol;
-
-typedef struct SymbolList_Rec {
-    struct SymbolList_Rec *next;
-    Symbol *symb;
-} SymbolList;
-
-struct Scope_Rec {
-    Scope *next, *prev;     /* doubly-linked list of all scopes */
-    Scope *parent;
-    Scope *funScope;        /* Points to base scope of enclosing function */
-    MemoryPool *pool;       /* pool used for allocation in this scope */
-    Symbol *symbols;
-    
-	int level;              /* 0 = super globals, 1 = globals, etc. */
-
-    /* Only used at global scope (level 1): */
-    SymbolList *programs;   /* List of programs for this compilation. */
-};
-
-
-/* Symbol table is a simple binary tree. */
-
-#include "cpp.h"        /* to get MacroSymbol def */
-
-struct Symbol_Rec {
-    Symbol *left, *right;
-    Symbol *next;
-    int name;       /* Name atom */
-    SourceLoc loc;
-    symbolkind kind;
-    union {
-        MacroSymbol mac;
-    } details;
-};
-
-extern Scope *CurrentScope;
-extern Scope *GlobalScope;
-extern Scope *ScopeList;
-
-Scope *NewScopeInPool(MemoryPool *);
-#define NewScope()      NewScopeInPool(CurrentScope->pool)
-void PushScope(Scope *fScope);
-Scope *PopScope(void);
-Symbol *NewSymbol(SourceLoc *loc, Scope *fScope, int name, symbolkind kind);
-Symbol *AddSymbol(SourceLoc *loc, Scope *fScope, int atom, symbolkind kind);
-Symbol *LookUpLocalSymbol(Scope *fScope, int atom);
-Symbol *LookUpSymbol(Scope *fScope, int atom);
-void CPPErrorToInfoLog(char *);
-
-
-#endif /* !defined(__SYMBOLS_H) */
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.c
deleted file mode 100755
index 815277db5..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* tokens.c */
-/* */
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "slglobals.h"
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*////////////////////// Preprocessor and Token Recorder and Playback: //////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-
-/*
- * idstr()
- * Copy a string to a malloc'ed block and convert it into something suitable
- * for an ID
- *
- */
-
-static char *idstr(const char *fstr)
-{
-    size_t len;
-    char *str, *t;
-    const char *f;
-
-    len = strlen(fstr);
-    str = (char *) malloc(len + 1);
-    for (f=fstr, t=str; *f; f++) {
-        if (isalnum(*f)) *t++ = *f;
-        else if (*f == '.' || *f == '/') *t++ = '_';
-    }
-    *t = 0;
-    return str;
-} /* idstr */
-
-
-/*
- * lNewBlock()
- *
- */
-
-static TokenBlock *lNewBlock(TokenStream *fTok)
-{
-    TokenBlock *lBlock;
-
-    lBlock = (TokenBlock *) malloc(sizeof(TokenBlock) + 256);
-    lBlock->count = 0;
-    lBlock->current = 0;
-    lBlock->data = (unsigned char *) lBlock + sizeof(TokenBlock);
-    lBlock->max = 256;
-    lBlock->next = NULL;
-    if (fTok->head) {
-        fTok->current->next = lBlock;
-    } else {
-        fTok->head = lBlock;
-    }
-    fTok->current = lBlock;
-    return lBlock;
-} /* lNewBlock */
-
-/*
- * lAddByte()
- *
- */
-
-static void lAddByte(TokenStream *fTok, unsigned char fVal)
-{
-    TokenBlock *lBlock;
-    lBlock = fTok->current;
-    if (lBlock->count >= lBlock->max)
-        lBlock = lNewBlock(fTok);
-    lBlock->data[lBlock->count++] = fVal;
-} /* lAddByte */
-
-
-
-/*
- * lReadByte() - Get the next byte from a stream.
- *
- */
-
-static int lReadByte(TokenStream *pTok)
-{
-    TokenBlock *lBlock;
-    int lval = -1;
-
-    lBlock = pTok->current;
-    if (lBlock) {
-        if (lBlock->current >= lBlock->count) {
-            lBlock = lBlock->next;
-            if (lBlock)
-                lBlock->current = 0;
-            pTok->current = lBlock;
-        }
-        if (lBlock)
-            lval = lBlock->data[lBlock->current++];
-    }
-    return lval;
-} /* lReadByte */
-
-/*///////////////////////////////////// Global Functions:////////////////////////////////////// */
-
-/*
- * NewTokenStream()
- *
- */
-
-TokenStream *NewTokenStream(const char *name)
-{
-    TokenStream *pTok;
-
-    pTok = (TokenStream *) malloc(sizeof(TokenStream));
-    pTok->next = NULL;
-    pTok->name = idstr(name);
-    pTok->head = NULL;
-    pTok->current = NULL;
-    lNewBlock(pTok);
-    return pTok;
-} /* NewTokenStream */
-
-/*
- * DeleteTokenStream()
- *
- */
-
-void DeleteTokenStream(TokenStream *pTok)
-{
-    TokenBlock *pBlock, *nBlock;
-
-    if (pTok) {
-        pBlock = pTok->head;
-        while (pBlock) {
-            nBlock = pBlock->next;
-            free(pBlock);
-            pBlock = nBlock;
-        }
-        if (pTok->name)
-            free(pTok->name);
-        free(pTok);
-    }
-} /* DeleteTokenStream */
-
-/*
- * RecordToken() - Add a token to the end of a list for later playback or printout.
- *
- */
-
-void RecordToken(TokenStream *pTok, int token, yystypepp * yylvalpp)
-{
-    const char *s;
-    unsigned char *str=NULL;
-
-    if (token > 256)
-        lAddByte(pTok, (unsigned char)((token & 0x7f) + 0x80));
-    else
-        lAddByte(pTok, (unsigned char)(token & 0x7f));
-    switch (token) {
-    case CPP_IDENTIFIER:
-    case CPP_TYPEIDENTIFIER:
-    case CPP_STRCONSTANT:
-        s = GetAtomString(atable, yylvalpp->sc_ident);
-        while (*s)
-            lAddByte(pTok, (unsigned char) *s++);
-        lAddByte(pTok, 0);
-        break;
-    case CPP_FLOATCONSTANT:
-    case CPP_INTCONSTANT:
-         str=yylvalpp->symbol_name;
-         while (*str){
-            lAddByte(pTok,(unsigned char) *str);
-            *str++;
-         }
-         lAddByte(pTok, 0);
-         break;
-    case '(':
-        lAddByte(pTok, (unsigned char)(yylvalpp->sc_int ? 1 : 0));
-    default:
-        break;
-    }
-} /* RecordToken */
-
-/*
- * RewindTokenStream() - Reset a token stream in preperation for reading.
- *
- */
-
-void RewindTokenStream(TokenStream *pTok)
-{
-    if (pTok->head) {
-        pTok->current = pTok->head;
-        pTok->current->current = 0;
-    }
-} /* RewindTokenStream */
-
-/*
- * ReadToken() - Read the next token from a stream.
- *
- */
-
-int ReadToken(TokenStream *pTok, yystypepp * yylvalpp)
-{
-    char symbol_name[MAX_SYMBOL_NAME_LEN + 1];
-    char string_val[MAX_STRING_LEN + 1];
-    int ltoken, len;
-    char ch;
-
-    ltoken = lReadByte(pTok);
-    if (ltoken >= 0) {
-        if (ltoken > 127)
-            ltoken += 128;
-        switch (ltoken) {
-        case CPP_IDENTIFIER:
-        case CPP_TYPEIDENTIFIER:
-            len = 0;
-            ch = lReadByte(pTok);
-            while ((ch >= 'a' && ch <= 'z') ||
-                     (ch >= 'A' && ch <= 'Z') ||
-                     (ch >= '0' && ch <= '9') ||
-                     ch == '_')
-            {
-                if (len < MAX_SYMBOL_NAME_LEN) {
-                    symbol_name[len] = ch;
-                    len++;
-                    ch = lReadByte(pTok);
-                }
-            }
-            symbol_name[len] = '\0';
-            assert(ch == '\0');
-            yylvalpp->sc_ident = LookUpAddString(atable, symbol_name);
-            return CPP_IDENTIFIER;
-            break;
-        case CPP_STRCONSTANT:
-            len = 0;
-            while ((ch = lReadByte(pTok)) != 0)
-                if (len < MAX_STRING_LEN)
-                    string_val[len++] = ch;
-            string_val[len] = 0;
-            yylvalpp->sc_ident = LookUpAddString(atable, string_val);
-            break;
-        case CPP_FLOATCONSTANT:
-            len = 0;
-            ch = lReadByte(pTok);
-            while ((ch >= '0' && ch <= '9')||(ch=='e'||ch=='E'||ch=='.')||(ch=='+'||ch=='-'))
-            {
-                if (len < MAX_SYMBOL_NAME_LEN) {
-                    symbol_name[len] = ch;
-                    len++;
-                    ch = lReadByte(pTok);
-                }
-            }
-            symbol_name[len] = '\0';
-            assert(ch == '\0');
-            strcpy(yylvalpp->symbol_name,symbol_name);
-            yylvalpp->sc_fval=(float)atof(yylvalpp->symbol_name);
-            break;
-        case CPP_INTCONSTANT:
-            len = 0;
-            ch = lReadByte(pTok);
-            while ((ch >= '0' && ch <= '9'))
-            {
-                if (len < MAX_SYMBOL_NAME_LEN) {
-                    symbol_name[len] = ch;
-                    len++;
-                    ch = lReadByte(pTok);
-                }
-            }
-            symbol_name[len] = '\0';
-            assert(ch == '\0');
-            strcpy(yylvalpp->symbol_name,symbol_name);
-            yylvalpp->sc_int=atoi(yylvalpp->symbol_name);
-            break;
-        case '(':
-            yylvalpp->sc_int = lReadByte(pTok);
-            break;
-        }
-        return ltoken;
-    }
-    return EOF_SY;
-} /* ReadToken */
-
-typedef struct TokenInputSrc {
-    InputSrc            base;
-    TokenStream         *tokens;
-    int                 (*final)(CPPStruct *);
-} TokenInputSrc;
-
-static int scan_token(TokenInputSrc *in, yystypepp * yylvalpp)
-{
-    int token = ReadToken(in->tokens, yylvalpp);
-    int (*final)(CPPStruct *);
-    cpp->tokenLoc->file = cpp->currentInput->name;
-    cpp->tokenLoc->line = cpp->currentInput->line;
-    if (token == '\n') {
-        in->base.line++;
-        return token;
-    }
-    if (token > 0) return token;
-    cpp->currentInput = in->base.prev;
-    final = in->final;
-    free(in);
-    if (final && !final(cpp)) return -1;
-    return cpp->currentInput->scan(cpp->currentInput, yylvalpp);
-}
-
-int ReadFromTokenStream(TokenStream *ts, int name, int (*final)(CPPStruct *))
-{
-    TokenInputSrc *in = malloc(sizeof(TokenInputSrc));
-    memset(in, 0, sizeof(TokenInputSrc));
-    in->base.name = name;
-    in->base.prev = cpp->currentInput;
-    in->base.scan = (int (*)(InputSrc *, yystypepp *))scan_token;
-    in->base.line = 1;
-    in->tokens = ts;
-    in->final = final;
-    RewindTokenStream(ts);
-    cpp->currentInput = &in->base;
-    return 1;
-}
-
-typedef struct UngotToken {
-    InputSrc    base;
-    int         token;
-    yystypepp     lval;
-} UngotToken;
-
-static int reget_token(UngotToken *t, yystypepp * yylvalpp)
-{
-    int token = t->token;
-    *yylvalpp = t->lval;
-    cpp->currentInput = t->base.prev;
-    free(t);
-    return token;
-}
-
-void UngetToken(int token, yystypepp * yylvalpp) {
-    UngotToken *t = malloc(sizeof(UngotToken));
-    memset(t, 0, sizeof(UngotToken));
-    t->token = token;
-    t->lval = *yylvalpp;
-    t->base.scan = (void *)reget_token;
-    t->base.prev = cpp->currentInput;
-    t->base.name = cpp->currentInput->name;
-    t->base.line = cpp->currentInput->line;
-    cpp->currentInput = &t->base;
-}
-
-
-void DumpTokenStream(FILE *fp, TokenStream *s, yystypepp * yylvalpp) {
-    int token;
-    char str[100];
-
-    if (fp == 0) fp = stdout;
-    RewindTokenStream(s);
-    while ((token = ReadToken(s, yylvalpp)) > 0) {
-        switch (token) {
-        case CPP_IDENTIFIER:
-        case CPP_TYPEIDENTIFIER:
-            sprintf(str, "%s ", GetAtomString(atable, yylvalpp->sc_ident));
-            break;
-        case CPP_STRCONSTANT:
-            sprintf(str, "\"%s\"", GetAtomString(atable, yylvalpp->sc_ident));
-            break;
-        case CPP_FLOATCONSTANT:
-            /*printf("%g9.6 ", yylvalpp->sc_fval); */
-            break;
-        case CPP_INTCONSTANT:
-            /*printf("%d ", yylvalpp->sc_int); */
-            break;
-        default:
-            if (token >= 127)
-                sprintf(str, "%s ", GetAtomString(atable, token));
-            else
-                sprintf(str, "%c", token);
-            break;
-        }
-        CPPDebugLogMsg(str);
-    }
-}
-
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
-/*///////////////////////////////////// End of tokens.c /////////////////////////////////////// */
-/*///////////////////////////////////////////////////////////////////////////////////////////// */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.h
deleted file mode 100755
index 0a25bf7c8..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* */
-/*Copyright (C) 2002-2005  3Dlabs Inc. Ltd. */
-/*All rights reserved. */
-/* */
-/*Redistribution and use in source and binary forms, with or without */
-/*modification, are permitted provided that the following conditions */
-/*are met: */
-/* */
-/*    Redistributions of source code must retain the above copyright */
-/*    notice, this list of conditions and the following disclaimer. */
-/* */
-/*    Redistributions in binary form must reproduce the above */
-/*    copyright notice, this list of conditions and the following */
-/*    disclaimer in the documentation and/or other materials provided */
-/*    with the distribution. */
-/* */
-/*    Neither the name of 3Dlabs Inc. Ltd. nor the names of its */
-/*    contributors may be used to endorse or promote products derived */
-/*    from this software without specific prior written permission. */
-/* */
-/*THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/*"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/*LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/*FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE */
-/*COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
-/*INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, */
-/*BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; */
-/*LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER */
-/*CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT */
-/*LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
-/*ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
-/*POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/****************************************************************************\
-Copyright (c) 2002, NVIDIA Corporation.
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in
-consideration of your agreement to the following terms, and your use,
-installation, modification or redistribution of this NVIDIA software
-constitutes acceptance of these terms.  If you do not agree with these
-terms, please do not use, install, modify or redistribute this NVIDIA
-software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, NVIDIA grants you a personal, non-exclusive
-license, under NVIDIA's copyrights in this original NVIDIA software (the
-"NVIDIA Software"), to use, reproduce, modify and redistribute the
-NVIDIA Software, with or without modifications, in source and/or binary
-forms; provided that if you redistribute the NVIDIA Software, you must
-retain the copyright notice of NVIDIA, this notice and the following
-text and disclaimers in all such redistributions of the NVIDIA Software.
-Neither the name, trademarks, service marks nor logos of NVIDIA
-Corporation may be used to endorse or promote products derived from the
-NVIDIA Software without specific prior written permission from NVIDIA.
-Except as expressly stated in this notice, no other rights or licenses
-express or implied, are granted by NVIDIA herein, including but not
-limited to any patent rights that may be infringed by your derivative
-works or by other works in which the NVIDIA Software may be
-incorporated. No hardware is licensed hereunder. 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
-PRODUCTS.
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
-OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
-NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
-TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-\****************************************************************************/
-/* */
-/* tokens.h */
-/* */
-
-#if !defined(__TOKENS_H)
-#define __TOKENS_H 1
-
-#include "parser.h"
-
-#define EOF_SY (-1)
-
-typedef struct TokenBlock_Rec TokenBlock;
-
-typedef struct TokenStream_Rec {
-    struct TokenStream_Rec *next;
-    char *name;
-    TokenBlock *head;
-    TokenBlock *current;
-} TokenStream;
-
-struct TokenBlock_Rec {
-    TokenBlock *next;
-    int current;
-    int count;
-    int max;
-    unsigned char *data;
-};
-
-extern TokenStream stdlib_cpp_stream;
-
-
-TokenStream *NewTokenStream(const char *name);
-void DeleteTokenStream(TokenStream *pTok); 
-void RecordToken(TokenStream *pTok, int token, yystypepp * yylvalpp);
-void RewindTokenStream(TokenStream *pTok);
-int ReadToken(TokenStream *pTok, yystypepp * yylvalpp);
-int ReadFromTokenStream(TokenStream *pTok, int name, int (*final)(CPPStruct *));
-void UngetToken(int, yystypepp * yylvalpp);
-
-#if defined(CPPC_ENABLE_TOOLS)
-
-void DumpTokenStream(FILE *, TokenStream *, yystypepp * yylvalpp);
-
-#endif /* defined(CPPC_ENABLE_TOOLS) */
-
-#endif /* !defined(__TOKENS_H) */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/unistd.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/unistd.h
deleted file mode 100755
index efadd63fd..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/unistd.h
+++ /dev/null
@@ -1 +0,0 @@
-// This is a NULL file and is meant to be empty
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.cpp
deleted file mode 100755
index 2e6f8c69b..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#define SH_EXPORTING
-#include "Initialisation.h"
-#include "Include/InitializeGlobals.h"
-#include "Include/InitializeParseContext.h"
-#include "Public/ShaderLang.h"
-
-OS_TLSIndex GlobalProcessFlag   = OS_INVALID_TLS_INDEX;
-
-bool InitProcess()
-{
-    if (GlobalProcessFlag != OS_INVALID_TLS_INDEX) {
-        //
-        // Function is re-entrant.
-        //
-        return true;
-    }
-
-    GlobalProcessFlag = OS_AllocTLSIndex();
-
-    if (GlobalProcessFlag == OS_INVALID_TLS_INDEX) {
-        assert (0 && "InitProcess(): Failed to allocate TLS area for init flag");
-        return false;
-    }
-
-    if (!InitializePoolIndex()) {
-        assert (0 && "InitProcess(): Failed to initalize global pool");
-        return false;
-    }
-
-    if (!InitializeParseContextIndex()) {
-        assert (0 && "InitProcess(): Failed to initalize parse context");
-        return false;
-    }
-
-    InitThread();
-    return true;
-}
-
-
-bool InitThread()
-{
-    //
-    // This function is re-entrant
-    //
-    if (GlobalProcessFlag == OS_INVALID_TLS_INDEX) {
-        assert(0 && "InitThread(): Process hasn't been initalised.");
-        return false;
-    }
-
-    if (OS_GetTLSValue(GlobalProcessFlag) != 0) {
-        return true;
-    }
-
-    InitializeGlobalPools();
-
-    if(!InitializeGlobalParseContext()) 
-        return false;
-
-    if(!OS_SetTLSValue(GlobalProcessFlag, (void *)1)) {
-        assert(0 && "InitThread(): Unable to set init flag.");
-        return false;
-    }
-
-    return true;
-}
-
-
-bool DetachThread()
-{
-    bool retFlag = true;
-
-    if (GlobalProcessFlag == OS_INVALID_TLS_INDEX) {
-        assert(0 && "DetachThread(): Process hasn't been initalised.");
-        return false;
-    }
-
-    //
-    // Function is re-entrant and this thread may not have been initalised.
-    //
-    if (OS_GetTLSValue(GlobalProcessFlag) != 0)
-    {
-        if(!OS_SetTLSValue(GlobalProcessFlag, (void *)0)) {
-            assert(0 && "DetachThread(): Unable to clear init flag.");
-            retFlag = false;
-        }
-
-        FreeGlobalPools();
-
-        if (!FreeParseContext())
-            retFlag = false;
-    }
-
-    return retFlag;
-}
-
-bool DetachProcess()
-{
-    bool retFlag = true;
-
-    if (GlobalProcessFlag == OS_INVALID_TLS_INDEX)
-        return true;
-    
-    ShFinalize();
-
-    retFlag = DetachThread();
-
-    FreePoolIndex();
-
-    if(!FreeParseContextIndex())
-        retFlag = false;
-
-    OS_FreeTLSIndex(GlobalProcessFlag);
-    GlobalProcessFlag = OS_INVALID_TLS_INDEX;
-
-    return retFlag;
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.h
deleted file mode 100755
index 1cfd97eeb..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-#ifndef __INITIALISATION_H
-#define __INITIALISATION_H
-
-
-#include "osinclude.h"
-
-
-bool InitProcess();
-bool InitThread();
-bool DetachThread();
-bool DetachProcess();
-
-#endif // __INITIALISATION_H
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/osinclude.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/osinclude.h
deleted file mode 100755
index 8b20b961c..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/osinclude.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef __OSINCLUDE_H
-#define __OSINCLUDE_H
-
-//
-// This file contains any Linux specific functions.
-//
-
-/* WORKAROUND: linux builds seem not to define "linux" */
-/*#if !(defined(linux))
-#error Trying to include a Linux specific file in a non-Linux build.
-#endif*/
-
-#include <pthread.h>
-#include <semaphore.h>
-#include <assert.h>
-#include <errno.h>
-#include "Include/InitializeGlobals.h"
-#include "Include/PoolAlloc.h"
-
-#define _vsnprintf vsnprintf
-
-void DetachThreadLinux(void *);
-
-//
-// Thread Local Storage Operations
-//
-typedef unsigned int OS_TLSIndex;
-#define OS_INVALID_TLS_INDEX 0xFFFFFFFF
-
-OS_TLSIndex OS_AllocTLSIndex();
-bool        OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);
-bool        OS_FreeTLSIndex(OS_TLSIndex nIndex); 
-
-
-inline void * OS_GetTLSValue(OS_TLSIndex nIndex)
-{
-    //
-    // This function should return 0 if nIndex is invalid.
-    //
-    assert(nIndex != OS_INVALID_TLS_INDEX);
-    return (pthread_getspecific(nIndex)); 
-}
-
-#endif // __OSINCLUDE_H
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/ossource.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/ossource.cpp
deleted file mode 100755
index 4bcd66a31..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/ossource.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-//
-// This file contains the Linux specific functions
-//
-#include "osinclude.h"
-#include "Initialisation.h"
-
-/*#if !(defined(linux))
-#error Trying to build a Linux specific file in a non-Linux build.
-#endif*/
-
-//
-// Thread cleanup
-//
-
-//
-// Wrapper for Linux call to DetachThread.  This is required as pthread_cleanup_push() expects 
-// the cleanup routine to return void.
-// 
-void DetachThreadLinux(void *)
-{
-    DetachThread();
-}
-
-
-//
-// Registers cleanup handler, sets cancel type and state, and excecutes the thread specific
-// cleanup handler.  This function will be called in the Standalone.cpp for regression 
-// testing.  When OpenGL applications are run with the driver code, Linux OS does the 
-// thread cleanup.
-// 
-void OS_CleanupThreadData(void)
-{
-    int old_cancel_state, old_cancel_type;
-    void *cleanupArg = NULL;
-
-    //
-    // Set thread cancel state and push cleanup handler.
-    //
-    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancel_state);
-    pthread_cleanup_push(DetachThreadLinux, (void *) cleanupArg);
-
-    //
-    // Put the thread in deferred cancellation mode.
-    //
-    pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &old_cancel_type);
-
-    //
-    // Pop cleanup handler and execute it prior to unregistering the cleanup handler.
-    //
-    pthread_cleanup_pop(1);
-
-    //
-    // Restore the thread's previous cancellation mode.
-    //
-    pthread_setcanceltype(old_cancel_state, NULL);
-}
-
-
-//
-// Thread Local Storage Operations
-//
-OS_TLSIndex OS_AllocTLSIndex()
-{
-    pthread_key_t pPoolIndex;
-
-    //
-    // Create global pool key.
-    //
-    if ((pthread_key_create(&pPoolIndex, NULL)) != 0) {
-        assert(0 && "OS_AllocTLSIndex(): Unable to allocate Thread Local Storage");
-        return false;
-    }
-    else
-        return pPoolIndex;
-}
-
-
-bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue)
-{
-    if (nIndex == OS_INVALID_TLS_INDEX) {
-        assert(0 && "OS_SetTLSValue(): Invalid TLS Index");
-        return false;
-    }
-
-    if (pthread_setspecific(nIndex, lpvValue) == 0)
-        return true;
-    else
-        return false;
-}
-
-
-bool OS_FreeTLSIndex(OS_TLSIndex nIndex)
-{
-    if (nIndex == OS_INVALID_TLS_INDEX) {
-        assert(0 && "OS_SetTLSValue(): Invalid TLS Index");
-        return false;
-    }
-
-    //
-    // Delete the global pool key.
-    //
-    if (pthread_key_delete(nIndex) == 0)
-        return true;
-    else
-        return false;
-}
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/osinclude.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/osinclude.h
deleted file mode 100755
index 97a9e9f3d..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/osinclude.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef __OSINCLUDE_H
-#define __OSINCLUDE_H
-
-//
-// This file contains contains the window's specific datatypes and
-// declares any windows specific functions.
-//
-
-#if !(defined(_WIN32) || defined(_WIN64))
-#error Trying to include a windows specific file in a non windows build.
-#endif
-
-#define STRICT
-#define VC_EXTRALEAN 1
-#include <windows.h>
-#include <assert.h>
-
-//
-// Thread Local Storage Operations
-//
-typedef DWORD OS_TLSIndex;
-#define OS_INVALID_TLS_INDEX (TLS_OUT_OF_INDEXES)
-
-OS_TLSIndex OS_AllocTLSIndex();
-bool        OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);
-bool        OS_FreeTLSIndex(OS_TLSIndex nIndex);
-
-inline void* OS_GetTLSValue(OS_TLSIndex nIndex) 
-{
-	assert(nIndex != OS_INVALID_TLS_INDEX);
-	return TlsGetValue(nIndex);
-}
-
-#endif // __OSINCLUDE_H
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/ossource.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/ossource.cpp
deleted file mode 100755
index 35d086614..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/ossource.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "Initialisation.h"
-
-//
-// This file contains contains the window's specific functions
-//
-
-#if !(defined(_WIN32) || defined(_WIN64))
-#error Trying to build a windows specific file in a non windows build.
-#endif
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    switch (fdwReason)
-    {
-        case DLL_PROCESS_ATTACH:
-            if (!InitProcess())
-                return false;
-            break;
-        case DLL_THREAD_ATTACH:
-            if (!InitThread())
-                return false;
-            break;
-
-        case DLL_THREAD_DETACH:
-
-            if (!DetachThread())
-                return false;
-            break;
-
-        case DLL_PROCESS_DETACH:
-
-            DetachProcess();
-            break;
-
-        default:
-            assert(0 && "DllMain(): Reason for calling DLL Main is unknown");
-            return false;
-    }
-
-    return true;
-}
-
-//
-// Thread Local Storage Operations
-//
-OS_TLSIndex OS_AllocTLSIndex()
-{
-    DWORD dwIndex = TlsAlloc();
-    if (dwIndex == TLS_OUT_OF_INDEXES) {
-        assert(0 && "OS_AllocTLSIndex(): Unable to allocate Thread Local Storage");
-        return (OS_INVALID_TLS_INDEX);
-    }
-
-    return dwIndex;
-}
-
-
-bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue)
-{
-    if (nIndex == OS_INVALID_TLS_INDEX)
-    {
-        assert(0 && "OS_SetTLSValue(): Invalid TLS Index");
-        return false;
-    }
-
-    if (TlsSetValue(nIndex, lpvValue))
-        return true;
-    else
-        return false;
-}
-
-
-bool OS_FreeTLSIndex(OS_TLSIndex nIndex)
-{
-    if (nIndex == OS_INVALID_TLS_INDEX) {
-        assert(0 && "OS_SetTLSValue(): Invalid TLS Index");
-        return false;
-    }
-
-    if (TlsFree(nIndex))
-        return true;
-    else
-        return false;
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLang.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLang.h
deleted file mode 100755
index 34b1688e8..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLang.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef _COMPILER_INTERFACE_INCLUDED_
-#define _COMPILER_INTERFACE_INCLUDED_
-
-#include "../Include/ResourceLimits.h"
-
-#ifdef _WIN32
-#define C_DECL __cdecl
-/*#ifdef SH_EXPORTING
-    #define SH_IMPORT_EXPORT __declspec(dllexport)
-#else
-    #define SH_IMPORT_EXPORT __declspec(dllimport)
-#endif*/
-/* disable DLL linking */
-#define SH_IMPORT_EXPORT
-#else
-#define SH_IMPORT_EXPORT
-#define __fastcall
-#define C_DECL
-#endif
-
-/*
-// This is the platform independent interface between an OGL driver
-// and the shading language compiler/linker.
-*/
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-/*
-// Driver must call this first, once, before doing any other
-// compiler/linker operations.
-*/
-SH_IMPORT_EXPORT int ShInitialize();
-/*
-// Driver should call this at shutdown.
-*/
-SH_IMPORT_EXPORT int __fastcall ShFinalize();
-
-/*
-// Types of languages the compiler can consume.
-*/
-typedef enum {
-	EShLangVertex,
-	EShLangFragment,
-	EShLangPack,
-    EShLangUnpack,
-    EShLangCount
-} EShLanguage;
-
-/*
-// Types of output the linker will create.
-*/
-typedef enum {
-    EShExVertexFragment,
-    EShExPackFragment,
-    EShExUnpackFragment,
-    EShExFragment
-} EShExecutable;
-
-/*
-// Optimization level for the compiler.
-*/
-typedef enum {
-    EShOptNoGeneration,
-    EShOptNone,
-    EShOptSimple,       /* Optimizations that can be done quickly */
-    EShOptFull          /* Optimizations that will take more time */
-} EShOptimizationLevel;
-
-/*
-// Build a table for bindings.  This can be used for locating
-// attributes, uniforms, globals, etc., as needed.
-*/
-typedef struct {
-    char* name;
-    int binding;
-} ShBinding;
-
-typedef struct {
-    int numBindings;
-    ShBinding* bindings;  /* array of bindings */
-} ShBindingTable;
-
-/*
-// ShHandle held by but opaque to the driver.  It is allocated,
-// managed, and de-allocated by the compiler/linker. It's contents 
-// are defined by and used by the compiler and linker.  For example,
-// symbol table information and object code passed from the compiler 
-// to the linker can be stored where ShHandle points.
-//
-// If handle creation fails, 0 will be returned.
-*/
-typedef void* ShHandle;
-
-/*
-// Driver calls these to create and destroy compiler/linker
-// objects.
-*/
-SH_IMPORT_EXPORT ShHandle ShConstructCompiler(const EShLanguage, int debugOptions);  /* one per shader */
-SH_IMPORT_EXPORT ShHandle ShConstructLinker(const EShExecutable, int debugOptions);  /* one per shader pair */
-SH_IMPORT_EXPORT ShHandle ShConstructUniformMap();                 /* one per uniform namespace (currently entire program object) */
-SH_IMPORT_EXPORT void ShDestruct(ShHandle);
-
-/*
-// The return value of ShCompile is boolean, indicating
-// success or failure.
-//
-// The info-log should be written by ShCompile into 
-// ShHandle, so it can answer future queries.
-*/
-SH_IMPORT_EXPORT int ShCompile(
-    const ShHandle,
-    const char* const shaderStrings[],
-    const int numStrings,
-    const EShOptimizationLevel,
-    const TBuiltInResource *resources,
-    int debugOptions
-    );
-
-
-/*
-// Similar to ShCompile, but accepts an opaque handle to an
-// intermediate language structure.
-*/
-SH_IMPORT_EXPORT int ShCompileIntermediate(
-    ShHandle compiler,
-    ShHandle intermediate,
-    const EShOptimizationLevel,
-    int debuggable           /* boolean */
-    );
-
-SH_IMPORT_EXPORT int ShLink(
-    const ShHandle,               /* linker object */
-    const ShHandle h[],           /* compiler objects to link together */
-    const int numHandles,
-    ShHandle uniformMap,          /* updated with new uniforms */
-    short int** uniformsAccessed,  /* returned with indexes of uniforms accessed */
-    int* numUniformsAccessed); 	
-
-/*
-// ShSetEncrpytionMethod is a place-holder for specifying
-// how source code is encrypted.
-*/
-SH_IMPORT_EXPORT void ShSetEncryptionMethod(ShHandle);
-
-/*
-// All the following return 0 if the information is not
-// available in the object passed down, or the object is bad.
-*/
-SH_IMPORT_EXPORT const char* ShGetInfoLog(const ShHandle);
-SH_IMPORT_EXPORT const void* ShGetExecutable(const ShHandle);
-SH_IMPORT_EXPORT int ShSetVirtualAttributeBindings(const ShHandle, const ShBindingTable*);   /* to detect user aliasing */
-SH_IMPORT_EXPORT int ShSetFixedAttributeBindings(const ShHandle, const ShBindingTable*);     /* to force any physical mappings */
-SH_IMPORT_EXPORT int ShGetPhysicalAttributeBindings(const ShHandle, const ShBindingTable**); /* for all attributes */
-/*
-// Tell the linker to never assign a vertex attribute to this list of physical attributes
-*/
-SH_IMPORT_EXPORT int ShExcludeAttributes(const ShHandle, int *attributes, int count);
-
-/*
-// Returns the location ID of the named uniform.
-// Returns -1 if error.
-*/
-SH_IMPORT_EXPORT int ShGetUniformLocation(const ShHandle uniformMap, const char* name);
-
-enum TDebugOptions {
-	EDebugOpNone               = 0x000,
-	EDebugOpIntermediate       = 0x001,
-	EDebugOpAssembly           = 0x002,
-    EDebugOpObjectCode         = 0x004,
-	EDebugOpLinkMaps           = 0x008
-};
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* _COMPILER_INTERFACE_INCLUDED_ */
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLangExt.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLangExt.h
deleted file mode 100755
index e44b5f99a..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLangExt.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//Copyright (C) 2002-2004  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-#ifndef _SHADERLANG_EXTENSION_INCLUDED_
-#define _SHADERLANG_EXTENSION_INCLUDED_
-
-#include "ShaderLang.h"
-
-//
-// This is the platform independent interface between an OGL driver
-// and the shading language compiler/linker.
-//
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-SH_IMPORT_EXPORT int ShLinkExt(
-    const ShHandle,               // linker object
-    const ShHandle h[],           // compiler objects to link together
-    const int numHandles);
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif // _SHADERLANG_EXTENSION_INCLUDED_
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/descrip.mms b/nx-X11/extras/Mesa/src/mesa/shader/slang/descrip.mms
deleted file mode 100644
index 6f2b90296..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/descrip.mms
+++ /dev/null
@@ -1,52 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 1 June 2005
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define swrast [--.swrast]
-	define array_cache [--.array_cache]
-
-.include [----]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi],[-.slang],[-.grammar],[-]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
-
-SOURCES = \
-	slang_compile.c,slang_preprocess.c
-
-OBJECTS = \
-	slang_compile.obj,slang_preprocess.obj,slang_utility.obj,\
-	slang_execute.obj,slang_assemble.obj,slang_assemble_conditional.obj,\
-	slang_assemble_constructor.obj,slang_assemble_typeinfo.obj,\
-	slang_storage.obj,slang_assemble_assignment.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-slang_compile.obj : slang_compile.c
-slang_preprocess.obj : slang_preprocess.c
-slang_utility.obj : slang_utility.c
-slang_execute.obj : slang_execute.c
-slang_assemble.obj : slang_assemble.c
-slang_assemble_conditional.obj : slang_assemble_conditional.c
-slang_assemble_constructor.obj : slang_assemble_constructor.c
-slang_assemble_typeinfo.obj : slang_assemble_typeinfo.c
-slang_storage.obj : slang_storage.c
-slang_assemble_assignment.obj : slang_assemble_assignment.c
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_bin.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_bin.c
deleted file mode 100755
index 4bd211442..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_bin.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "../../grammar/grammar_crt.h"
-#include "../../grammar/grammar_crt.c"
-#include <stdio.h>
-
-static const char *slang_shader_syn =
-#include "slang_shader_syn.h"
-;
-
-static void gc_to_bin (grammar id, const char *in, const char *out)
-{
-	FILE *f;
-	byte *source, *prod;
-	unsigned int size, i, line = 0;
-
-	f = fopen (in, "r");
-	if (f == NULL)
-		return;
-	fseek (f, 0, SEEK_END);
-	size = ftell (f);
-	fseek (f, 0, SEEK_SET);
-	source = (byte *) grammar_alloc_malloc (size + 1);
-	source[fread (source, 1, size, f)] = '\0';
-	fclose (f);
-
-	if (!grammar_fast_check (id, source, &prod, &size, 65536))
-	{
-		grammar_alloc_free (source);
-		return;
-	}
-
-	f = fopen (out, "w");
-	for (i = 0; i < size; i++)
-	{
-		unsigned int a;
-		if (prod[i] < 10)
-			a = 1;
-		else if (prod[i] < 100)
-			a = 2;
-		else
-			a = 3;
-		if (i < size - 1)
-			a++;
-		if (line + a > 100)
-		{
-			fprintf (f, "\n");
-			line = 0;
-		}
-		line += a;
-		fprintf (f, "%d", prod[i]);
-		if (i < size - 1)
-			fprintf (f, ",");
-	}
-	fclose (f);
-	grammar_alloc_free (prod);
-}
-
-int main ()
-{
-	grammar id;
-
-	id = grammar_load_from_text ((const byte *) slang_shader_syn);
-	if (id == 0)
-		return 1;
-
-	grammar_set_reg8 (id, (const byte *) "parsing_builtin", 1);
-
-	grammar_set_reg8 (id, (const byte *) "shader_type", 1);
-	gc_to_bin (id, "slang_core.gc", "slang_core_gc_bin.h");
-	gc_to_bin (id, "slang_common_builtin.gc", "slang_common_builtin_gc_bin.h");
-	gc_to_bin (id, "slang_fragment_builtin.gc", "slang_fragment_builtin_gc_bin.h");
-
-	grammar_set_reg8 (id, (const byte *) "shader_type", 2);
-	gc_to_bin (id, "slang_vertex_builtin.gc", "slang_vertex_builtin_gc_bin.h");
-
-	grammar_destroy (id);
-
-	return 0;
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_string.py b/nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_string.py
deleted file mode 100644
index a9d399fc1..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_string.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-
-# Mesa 3-D graphics library
-# Version:  6.3
-# 
-# Copyright (C) 2005  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# author: Michal Krol
-
-# converts slang source file into a C header containing one big string
-# comments and trailing whitespaces are stripped
-# C style comments are not supported, only C++ style ones are
-# empty lines are kept to maintain line numbers correlation
-# escape characters are not handled except for newlines
-
-# example:
-# -- source file
-# // some comment
-# 
-# attribute vec4 myPosition;	// my vertex data
-# -- output file
-# "\n"
-# "\n"
-# "attribute vec4 myPosition;\n"
-
-# usage: gc_to_string.py filename.gc > filename_gc.h
-
-import sys
-
-f = open (sys.argv[1], 'r')
-s = f.readline ()
-while s != '':
-	s = s[0:s.find ('//')].rstrip ()
-	# output empty lines, too, so line numbers can be tracked
-	print '\"' + s + '\\n\"'
-	s = f.readline ()
-f.close ()
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin.gc b/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin.gc
deleted file mode 100755
index 0b3ed0e88..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin.gc
+++ /dev/null
@@ -1,1410 +0,0 @@
-
-// 
-// TODO:
-// - implement sin, asin, acos, atan, pow, log2, floor, ceil,
-// - implement texture1D, texture2D, texture3D, textureCube,
-// - implement shadow1D, shadow2D,
-// - implement noise1, noise2, noise3, noise4,
-// 
-
-// 
-// From Shader Spec, ver. 1.10, rev. 59
-// 
-// The following built-in constants are provided to vertex and fragment shaders.
-// 
-
-// 
-// Implementation dependent constants. The example values below
-// are the minimum values allowed for these maximums.
-// 
-
-const int gl_MaxLights = 8;                             // GL 1.0
-const int gl_MaxClipPlanes = 6;                         // GL 1.0
-const int gl_MaxTextureUnits = 2;                       // GL 1.3
-const int gl_MaxTextureCoords = 2;                      // ARB_fragment_program
-const int gl_MaxVertexAttribs = 16;                     // ARB_vertex_shader
-const int gl_MaxVertexUniformComponents = 512;          // ARB_vertex_shader
-const int gl_MaxVaryingFloats = 32;                     // ARB_vertex_shader
-const int gl_MaxVertexTextureImageUnits = 0;            // ARB_vertex_shader
-const int gl_MaxCombinedTextureImageUnits = 2;          // ARB_vertex_shader
-const int gl_MaxTextureImageUnits = 2;                  // ARB_fragment_shader
-const int gl_MaxFragmentUniformComponents = 64;         // ARB_fragment_shader
-const int gl_MaxDrawBuffers = 1;                        // proposed ARB_draw_buffers
-
-// 
-// As an aid to accessing OpenGL processing state, the following uniform variables are built into
-// the OpenGL Shading Language. All page numbers and notations are references to the 1.4
-// specification.
-// 
-
-// 
-// Matrix state. p. 31, 32, 37, 39, 40.
-// 
-
-uniform mat4 gl_ModelViewMatrix;
-uniform mat4 gl_ProjectionMatrix;
-uniform mat4 gl_ModelViewProjectionMatrix;
-uniform mat4 gl_TextureMatrix[gl_MaxTextureCoords];
-
-//
-// Derived matrix state that provides inverse and transposed versions
-// of the matrices above. Poorly conditioned matrices may result
-// in unpredictable values in their inverse forms.
-//
-uniform mat3 gl_NormalMatrix; // transpose of the inverse of the
-                              // upper leftmost 3x3 of gl_ModelViewMatrix
-
-uniform mat4 gl_ModelViewMatrixInverse;
-uniform mat4 gl_ProjectionMatrixInverse;
-uniform mat4 gl_ModelViewProjectionMatrixInverse;
-uniform mat4 gl_TextureMatrixInverse[gl_MaxTextureCoords];
-
-uniform mat4 gl_ModelViewMatrixTranspose;
-uniform mat4 gl_ProjectionMatrixTranspose;
-uniform mat4 gl_ModelViewProjectionMatrixTranspose;
-uniform mat4 gl_TextureMatrixTranspose[gl_MaxTextureCoords];
-
-uniform mat4 gl_ModelViewMatrixInverseTranspose;
-uniform mat4 gl_ProjectionMatrixInverseTranspose;
-uniform mat4 gl_ModelViewProjectionMatrixInverseTranspose;
-uniform mat4 gl_TextureMatrixInverseTranspose[gl_MaxTextureCoords];
-
-// 
-// Normal scaling p. 39.
-// 
-
-uniform float gl_NormalScale;
-
-// 
-// Depth range in window coordinates, p. 33
-// 
-
-struct gl_DepthRangeParameters {
-    float near;                                         // n
-    float far;                                          // f
-    float diff;                                         // f - n
-};
-
-uniform gl_DepthRangeParameters gl_DepthRange;
-
-// 
-// Clip planes p. 42.
-// 
-
-uniform vec4 gl_ClipPlane[gl_MaxClipPlanes];
-
-// 
-// Point Size, p. 66, 67.
-// 
-
-struct gl_PointParameters {
-    float size;
-    float sizeMin;
-    float sizeMax;
-    float fadeThresholdSize;
-    float distanceConstantAttenuation;
-    float distanceLinearAttenuation;
-    float distanceQuadraticAttenuation;
-};
-
-uniform gl_PointParameters gl_Point;
-
-// 
-// Material State p. 50, 55.
-// 
-
-struct gl_MaterialParameters {
-    vec4 emission;                                      // Ecm
-    vec4 ambient;                                       // Acm
-    vec4 diffuse;                                       // Dcm
-    vec4 specular;                                      // Scm
-    float shininess;                                    // Srm
-};
-
-uniform gl_MaterialParameters gl_FrontMaterial;
-uniform gl_MaterialParameters gl_BackMaterial;
-
-// 
-// Light State p 50, 53, 55.
-// 
-
-struct gl_LightSourceParameters {
-    vec4 ambient;                                       // Acli
-    vec4 diffuse;                                       // Dcli
-    vec4 specular;                                      // Scli
-    vec4 position;                                      // Ppli
-    vec4 halfVector;                                    // Derived: Hi
-    vec3 spotDirection;                                 // Sdli
-    float spotExponent;                                 // Srli
-    float spotCutoff;                                   // Crli
-                                                        // (range: [0.0,90.0], 180.0)
-    float spotCosCutoff;                                // Derived: cos(Crli)
-                                                        // (range: [1.0,0.0],-1.0)
-    float constantAttenuation;                          // K0
-    float linearAttenuation;                            // K1
-    float quadraticAttenuation;                         // K2
-};
-
-uniform gl_LightSourceParameters gl_LightSource[gl_MaxLights];
-
-struct gl_LightModelParameters {
-    vec4 ambient;                                       // Acs
-};
-
-uniform gl_LightModelParameters gl_LightModel;
-
-// 
-// Derived state from products of light and material.
-// 
-
-struct gl_LightModelProducts {
-    vec4 sceneColor;                                    // Derived. Ecm + Acm * Acs
-};
-
-uniform gl_LightModelProducts gl_FrontLightModelProduct;
-uniform gl_LightModelProducts gl_BackLightModelProduct;
-
-struct gl_LightProducts {
-    vec4 ambient;                                       // Acm * Acli
-    vec4 diffuse;                                       // Dcm * Dcli
-    vec4 specular;                                      // Scm * Scli
-};
-
-uniform gl_LightProducts gl_FrontLightProduct[gl_MaxLights];
-uniform gl_LightProducts gl_BackLightProduct[gl_MaxLights];
-
-// 
-// Texture Environment and Generation, p. 152, p. 40-42.
-// 
-
-uniform vec4 gl_TextureEnvColor[gl_MaxTextureImageUnits];
-uniform vec4 gl_EyePlaneS[gl_MaxTextureCoords];
-uniform vec4 gl_EyePlaneT[gl_MaxTextureCoords];
-uniform vec4 gl_EyePlaneR[gl_MaxTextureCoords];
-uniform vec4 gl_EyePlaneQ[gl_MaxTextureCoords];
-uniform vec4 gl_ObjectPlaneS[gl_MaxTextureCoords];
-uniform vec4 gl_ObjectPlaneT[gl_MaxTextureCoords];
-uniform vec4 gl_ObjectPlaneR[gl_MaxTextureCoords];
-uniform vec4 gl_ObjectPlaneQ[gl_MaxTextureCoords];
-
-// 
-// Fog p. 161
-// 
-
-struct gl_FogParameters {
-    vec4 color;
-    float density;
-    float start;
-    float end;
-    float scale;    // Derived:    1.0 / (end - start)
-};
-
-uniform gl_FogParameters gl_Fog;
-
-// 
-// The OpenGL Shading Language defines an assortment of built-in convenience functions for scalar
-// and vector operations. Many of these built-in functions can be used in more than one type
-// of shader, but some are intended to provide a direct mapping to hardware and so are available
-// only for a specific type of shader.
-// 
-// The built-in functions basically fall into three categories:
-// 
-// * They expose some necessary hardware functionality in a convenient way such as accessing
-//   a texture map. There is no way in the language for these functions to be emulated by a shader.
-// 
-// * They represent a trivial operation (clamp, mix, etc.) that is very simple for the user
-//   to write, but they are very common and may have direct hardware support. It is a very hard
-//   problem for the compiler to map expressions to complex assembler instructions.
-// 
-// * They represent an operation graphics hardware is likely to accelerate at some point. The
-//   trigonometry functions fall into this category.
-// 
-// Many of the functions are similar to the same named ones in common C libraries, but they support
-// vector input as well as the more traditional scalar input.
-// 
-// Applications should be encouraged to use the built-in functions rather than do the equivalent
-// computations in their own shader code since the built-in functions are assumed to be optimal
-// (e.g., perhaps supported directly in hardware).
-// 
-// User code can replace built-in functions with their own if they choose, by simply re-declaring
-// and defining the same name and argument list.
-// 
-
-// 
-// 8.1 Angle and Trigonometry Functions
-// 
-// Function parameters specified as angle are assumed to be in units of radians. In no case will
-// any of these functions result in a divide by zero error. If the divisor of a ratio is 0, then
-// results will be undefined.
-// 
-// These all operate component-wise. The description is per component.
-// 
-
-// 
-// Converts degrees to radians and returns the result, i.e., result = PI*deg/180.
-// 
-
-float radians (float deg) {
-    return 3.141593 * deg / 180.0;
-}
-vec2 radians (vec2 deg) {
-    return vec2 (radians (deg.x), radians (deg.y));
-}
-vec3 radians (vec3 deg) {
-    return vec3 (radians (deg.x), radians (deg.y), radians (deg.z));
-}
-vec4 radians (vec4 deg) {
-    return vec4 (radians (deg.x), radians (deg.y), radians (deg.z), radians (deg.w));
-}
-
-// 
-// Converts radians to degrees and returns the result, i.e., result = 180*rad/PI.
-// 
-
-float degrees (float rad) {
-    return 180.0 * rad / 3.141593;
-}
-vec2 degrees (vec2 rad) {
-    return vec2 (degrees (rad.x), degrees (rad.y));
-}
-vec3 degrees (vec3 rad) {
-    return vec3 (degrees (rad.x), degrees (rad.y), degrees (rad.z));
-}
-vec4 degrees (vec4 rad) {
-    return vec4 (degrees (rad.x), degrees (rad.y), degrees (rad.z), degrees (rad.w));
-}
-
-// 
-// The standard trigonometric sine function.
-// 
-// XXX
-float sin (float angle) {
-    return 0.0;
-}
-vec2 sin (vec2 angle) {
-    return vec2 (sin (angle.x), sin (angle.y));
-}
-vec3 sin (vec3 angle) {
-    return vec3 (sin (angle.x), sin (angle.y), sin (angle.z));
-}
-vec4 sin (vec4 angle) {
-    return vec4 (sin (angle.x), sin (angle.y), sin (angle.z), sin (angle.w));
-}
-
-// 
-// The standard trigonometric cosine function.
-// 
-
-float cos (float angle) {
-    return sin (angle + 1.5708);
-}
-vec2 cos (vec2 angle) {
-    return vec2 (cos (angle.x), cos (angle.y));
-}
-vec3 cos (vec3 angle) {
-    return vec3 (cos (angle.x), cos (angle.y), cos (angle.z));
-}
-vec4 cos (vec4 angle) {
-    return vec4 (cos (angle.x), cos (angle.y), cos (angle.z), cos (angle.w));
-}
-
-// 
-// The standard trigonometric tangent.
-// 
-
-float tan (float angle) {
-    return sin (angle) / cos (angle);
-}
-vec2 tan (vec2 angle) {
-    return vec2 (tan (angle.x), tan (angle.y));
-}
-vec3 tan (vec3 angle) {
-    return vec3 (tan (angle.x), tan (angle.y), tan (angle.z));
-}
-vec4 tan (vec4 angle) {
-    return vec4 (tan (angle.x), tan (angle.y), tan (angle.z), tan (angle.w));
-}
-
-// 
-// Arc sine. Returns an angle whose sine is x. The range of values returned by this function is
-// [–PI/2, PI/2]. Results are undefined if |x| > 1.
-// 
-// XXX
-float asin (float x) {
-    return 0.0;
-}
-vec2 asin (vec2 x) {
-    return vec2 (asin (x.x), asin (x.y));
-}
-vec3 asin (vec3 x) {
-    return vec3 (asin (x.x), asin (x.y), asin (x.z));
-}
-vec4 asin (vec4 x) {
-    return vec4 (asin (x.x), asin (x.y), asin (x.z), asin (x.w));
-}
-
-// 
-// Arc cosine. Returns an angle whose cosine is x. The range of values returned by this function is
-// [0, PI]. Results are undefined if |x| > 1.
-// 
-// XXX
-float acos (float x) {
-    return 0.0;
-}
-vec2 acos (vec2 x) {
-    return vec2 (acos (x.x), acos (x.y));
-}
-vec3 acos (vec3 x) {
-    return vec3 (acos (x.x), acos (x.y), acos (x.z));
-}
-vec4 acos (vec4 x) {
-    return vec4 (acos (x.x), acos (x.y), acos (x.z), acos (x.w));
-}
-
-// 
-// Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine
-// what quadrant the angle is in. The range of values returned by this function is [–PI, PI].
-// Results are undefined if x and y are both 0.
-// 
-// XXX
-float atan (float x, float y) {
-    return 0.0;
-}
-vec2 atan (vec2 x, vec2 y) {
-    return vec2 (atan (x.x, y.x), atan (x.y, y.y));
-}
-vec3 atan (vec3 x, vec3 y) {
-    return vec3 (atan (x.x, y.x), atan (x.y, y.y), atan (x.z, y.z));
-}
-vec4 atan (vec4 x, vec4 y) {
-    return vec4 (atan (x.x, y.x), atan (x.y, y.y), atan (x.z, y.z), atan (x.w, y.w));
-}
-
-// 
-// Arc tangent. Returns an angle whose tangent is y_over_x. The range of values returned by this
-// function is [–PI/2, PI/2].
-// 
-// XXX
-float atan (float y_over_x) {
-    return 0.0;
-}
-vec2 atan (vec2 y_over_x) {
-    return vec2 (atan (y_over_x.x), atan (y_over_x.y));
-}
-vec3 atan (vec3 y_over_x) {
-    return vec3 (atan (y_over_x.x), atan (y_over_x.y), atan (y_over_x.z));
-}
-vec4 atan (vec4 y_over_x) {
-    return vec4 (atan (y_over_x.x), atan (y_over_x.y), atan (y_over_x.z), atan (y_over_x.w));
-}
-
-// 
-// 8.2 Exponential Functions
-// 
-// These all operate component-wise. The description is per component.
-// 
-
-// 
-// Returns x raised to the y power, i.e., x^y.
-// Results are undefined if x < 0.
-// Results are undefined if x = 0 and y <= 0.
-// 
-// XXX
-float pow (float x, float y) {
-    return 0.0;
-}
-vec2 pow (vec2 x, vec2 y) {
-    return vec2 (pow (x.x, y.x), pow (x.y, y.y));
-}
-vec3 pow (vec3 x, vec3 y) {
-    return vec3 (pow (x.x, y.x), pow (x.y, y.y), pow (x.z, y.z));
-}
-vec4 pow (vec4 x, vec4 y) {
-    return vec4 (pow (x.x, y.x), pow (x.y, y.y), pow (x.z, y.z), pow (x.w, y.w));
-}
-
-// 
-// Returns the natural exponentiation of x, i.e., e^x.
-// 
-
-float exp (float x) {
-    return pow (2.71828183, x);
-}
-vec2 exp (vec2 x) {
-    return vec2 (exp (x.x), exp (x.y));
-}
-vec3 exp (vec3 x) {
-    return vec3 (exp (x.x), exp (x.y), exp (x.z));
-}
-vec4 exp (vec4 x) {
-    return vec4 (exp (x.x), exp (x.y), exp (x.z), exp (x.w));
-}
-
-// 
-// Returns the natural logarithm of x, i.e., returns the value y which satisfies the equation
-// x = e^y.
-// Results are undefined if x <= 0.
-// 
-
-float log (float x) {
-    return log2 (x) / log2 (2.71828183);
-}
-vec2 log (vec2 x) {
-    return vec2 (log (x.x), log (x.y));
-}
-vec3 log (vec3 x) {
-    return vec3 (log (x.x), log (x.y), log (x.z));
-}
-vec4 log (vec4 x) {
-    return vec4 (log (x.x), log (x.y), log (x.z), log (x.w));
-}
-
-// 
-// Returns 2 raised to the x power, i.e., 2^x
-// 
-
-float exp2 (float x) {
-    return pow (2.0, x);
-}
-vec2 exp2 (vec2 x) {
-    return vec2 (exp2 (x.x), exp2 (x.y));
-}
-vec3 exp2 (vec3 x) {
-    return vec3 (exp2 (x.x), exp2 (x.y), exp2 (x.z));
-}
-vec4 exp2 (vec4 x) {
-    return vec4 (exp2 (x.x), exp2 (x.y), exp2 (x.z), exp2 (x.w));
-}
-
-// 
-// Returns the base 2 logarithm of x, i.e., returns the value y which satisfies the equation
-// x = 2^y.
-// Results are undefined if x <= 0.
-// 
-// XXX
-float log2 (float x) {
-    return 0.0;
-}
-vec2 log2 (vec2 x) {
-    return vec2 (log2 (x.x), log2 (x.y));
-}
-vec3 log2 (vec3 x) {
-    return vec3 (log2 (x.x), log2 (x.y), log2 (x.z));
-}
-vec4 log2 (vec4 x) {
-    return vec4 (log2 (x.x), log2 (x.y), log2 (x.z), log2 (x.w));
-}
-
-// 
-// Returns the positive square root of x.
-// Results are undefined if x < 0.
-// 
-
-float sqrt (float x) {
-    return pow (x, 0.5);
-}
-vec2 sqrt (vec2 x) {
-    return vec2 (sqrt (x.x), sqrt (x.y));
-}
-vec3 sqrt (vec3 x) {
-    return vec3 (sqrt (x.x), sqrt (x.y), sqrt (x.z));
-}
-vec4 sqrt (vec4 x) {
-    return vec4 (sqrt (x.x), sqrt (x.y), sqrt (x.z), sqrt (x.w));
-}
-
-// 
-// Returns the reciprocal of the positive square root of x.
-// Results are undefined if x <= 0.
-// 
-
-float inversesqrt (float x) {
-    return 1.0 / sqrt (x);
-}
-vec2 inversesqrt (vec2 x) {
-    return vec2 (inversesqrt (x.x), inversesqrt (x.y));
-}
-vec3 inversesqrt (vec3 x) {
-    return vec3 (inversesqrt (x.x), inversesqrt (x.y), inversesqrt (x.z));
-}
-vec4 inversesqrt (vec4 x) {
-    return vec4 (inversesqrt (x.x), inversesqrt (x.y), inversesqrt (x.z), inversesqrt (x.w));
-}
-
-// 
-// 8.3 Common Functions
-// 
-// These all operate component-wise. The description is per component.
-// 
-
-// 
-// Returns x if x >= 0, otherwise it returns –x
-// 
-
-float abs (float x) {
-    return x >= 0.0 ? x : -x;
-}
-vec2 abs (vec2 x) {
-    return vec2 (abs (x.x), abs (x.y));
-}
-vec3 abs (vec3 x) {
-    return vec3 (abs (x.x), abs (x.y), abs (x.z));
-}
-vec4 abs (vec4 x) {
-    return vec4 (abs (x.x), abs (x.y), abs (x.z), abs (x.w));
-}
-
-// 
-// Returns 1.0 if x > 0, 0.0 if x = 0, or –1.0 if x < 0
-// 
-
-float sign (float x) {
-    return x > 0.0 ? 1.0 : x < 0.0 ? -1.0 : 0.0;
-}
-vec2 sign (vec2 x) {
-    return vec2 (sign (x.x), sign (x.y));
-}
-vec3 sign (vec3 x) {
-    return vec3 (sign (x.x), sign (x.y), sign (x.z));
-}
-vec4 sign (vec4 x) {
-    return vec4 (sign (x.x), sign (x.y), sign (x.z), sign (x.w));
-}
-
-// 
-// Returns a value equal to the nearest integer that is less than or equal to x
-// 
-// XXX
-float floor (float x) {
-    return 0.0;
-}
-vec2 floor (vec2 x) {
-    return vec2 (floor (x.x), floor (x.y));
-}
-vec3 floor (vec3 x) {
-    return vec3 (floor (x.x), floor (x.y), floor (x.z));
-}
-vec4 floor (vec4 x) {
-    return vec4 (floor (x.x), floor (x.y), floor (x.z), floor (x.w));
-}
-
-// 
-// Returns a value equal to the nearest integer that is greater than or equal to x
-// 
-// XXX
-float ceil (float x) {
-    return 0.0;
-}
-vec2 ceil (vec2 x) {
-    return vec2 (ceil (x.x), ceil (x.y));
-}
-vec3 ceil (vec3 x) {
-    return vec3 (ceil (x.x), ceil (x.y), ceil (x.z));
-}
-vec4 ceil (vec4 x) {
-    return vec4 (ceil (x.x), ceil (x.y), ceil (x.z), ceil (x.w));
-}
-
-// 
-// Returns x – floor (x)
-// 
-
-float fract (float x) {
-    return x - floor (x);
-}
-vec2 fract (vec2 x) {
-    return vec2 (fract (x.x), fract (x.y));
-}
-vec3 fract (vec3 x) {
-    return vec3 (fract (x.x), fract (x.y), fract (x.z));
-}
-vec4 fract (vec4 x) {
-    return vec4 (fract (x.x), fract (x.y), fract (x.z), fract (x.w));
-}
-
-// 
-// Modulus. Returns x – y * floor (x/y)
-// 
-
-float mod (float x, float y) {
-    return x - y * floor (x / y);
-}
-vec2 mod (vec2 x, float y) {
-    return vec2 (mod (x.x, y), mod (x.y, y));
-}
-vec3 mod (vec3 x, float y) {
-    return vec3 (mod (x.x, y), mod (x.y, y), mod (x.z, y));
-}
-vec4 mod (vec4 x, float y) {
-    return vec4 (mod (x.x, y), mod (x.y, y), mod (x.z, y), mod (x.w, y));
-}
-vec2 mod (vec2 x, vec2 y) {
-    return vec2 (mod (x.x, y.x), mod (x.y, y.y));
-}
-vec3 mod (vec3 x, vec3 y) {
-    return vec3 (mod (x.x, y.x), mod (x.y, y.y), mod (x.z, y.z));
-}
-vec4 mod (vec4 x, vec4 y) {
-    return vec4 (mod (x.x, y.x), mod (x.y, y.y), mod (x.z, y.z), mod (x.w, y.w));
-}
-
-// 
-// Returns y if y < x, otherwise it returns x
-// 
-
-float min (float x, float y) {
-    return y < x ? y : x;
-}
-vec2 min (vec2 x, float y) {
-    return vec2 (min (x.x, y), min (x.y, y));
-}
-vec3 min (vec3 x, float y) {
-    return vec3 (min (x.x, y), min (x.y, y), min (x.z, y));
-}
-vec4 min (vec4 x, float y) {
-    return vec4 (min (x.x, y), min (x.y, y), min (x.z, y), min (x.w, y));
-}
-vec2 min (vec2 x, vec2 y) {
-    return vec2 (min (x.x, y.x), min (x.y, y.y));
-}
-vec3 min (vec3 x, vec3 y) {
-    return vec3 (min (x.x, y.x), min (x.y, y.y), min (x.z, y.z));
-}
-vec4 min (vec4 x, vec4 y) {
-    return vec4 (min (x.x, y.x), min (x.y, y.y), min (x.z, y.z), min (x.w, y.w));
-}
-
-// 
-// Returns y if x < y, otherwise it returns x
-// 
-
-float max (float x, float y) {
-    return min (y, x);
-}
-vec2 max (vec2 x, float y) {
-    return vec2 (max (x.x, y), max (x.y, y));
-}
-vec3 max (vec3 x, float y) {
-    return vec3 (max (x.x, y), max (x.y, y), max (x.z, y));
-}
-vec4 max (vec4 x, float y) {
-    return vec4 (max (x.x, y), max (x.y, y), max (x.z, y), max (x.w, y));
-}
-vec2 max (vec2 x, vec2 y) {
-    return vec2 (max (x.x, y.x), max (x.y, y.y));
-}
-vec3 max (vec3 x, vec3 y) {
-    return vec3 (max (x.x, y.x), max (x.y, y.y), max (x.z, y.z));
-}
-vec4 max (vec4 x, vec4 y) {
-    return vec4 (max (x.x, y.x), max (x.y, y.y), max (x.z, y.z), max (x.w, y.w));
-}
-
-// 
-// Returns min (max (x, minVal), maxVal)
-// 
-// Note that colors and depths written by fragment shaders will be clamped by the implementation
-// after the fragment shader runs.
-// 
-
-float clamp (float x, float minVal, float maxVal) {
-    return min (max (x, minVal), maxVal);
-}
-vec2 clamp (vec2 x, float minVal, float maxVal) {
-    return vec2 (clamp (x.x, minVal, maxVal), clamp (x.y, minVal, maxVal));
-}
-vec3 clamp (vec3 x, float minVal, float maxVal) {
-    return vec3 (clamp (x.x, minVal, maxVal), clamp (x.y, minVal, maxVal),
-        clamp (x.z, minVal, maxVal));
-}
-vec4 clamp (vec4 x, float minVal, float maxVal) {
-    return vec4 (clamp (x.x, minVal, maxVal), clamp (x.y, minVal, maxVal),
-        clamp (x.z, minVal, maxVal), clamp (x.w, minVal, maxVal));
-}
-vec2 clamp (vec2 x, vec2 minVal, vec2 maxVal) {
-    return vec2 (clamp (x.x, minVal.x, maxVal.x), clamp (x.y, minVal.y, maxVal.y));
-}
-vec3 clamp (vec3 x, vec3 minVal, vec3 maxVal) {
-    return vec3 (clamp (x.x, minVal.x, maxVal.x), clamp (x.y, minVal.y, maxVal.y),
-        clamp (x.z, minVal.z, maxVal.z));
-}
-vec4 clamp (vec4 x, vec4 minVal, vec4 maxVal) {
-    return vec4 (clamp (x.x, minVal.x, maxVal.y), clamp (x.y, minVal.y, maxVal.y),
-        clamp (x.z, minVal.z, maxVal.z), clamp (x.w, minVal.w, maxVal.w));
-}
-
-// 
-// Returns x * (1 – a) + y * a, i.e., the linear blend of x and y
-// 
-
-float mix (float x, float y, float a) {
-    return x * (1.0 - a) + y * a;
-}
-vec2 mix (vec2 x, vec2 y, float a) {
-    return vec2 (mix (x.x, y.x, a), mix (x.y, y.y, a));
-}
-vec3 mix (vec3 x, vec3 y, float a) {
-    return vec3 (mix (x.x, y.x, a), mix (x.y, y.y, a), mix (x.z, y.z, a));
-}
-vec4 mix (vec4 x, vec4 y, float a) {
-    return vec4 (mix (x.x, y.x, a), mix (x.y, y.y, a), mix (x.z, y.z, a), mix (x.w, y.w, a));
-}
-vec2 mix (vec2 x, vec2 y, vec2 a) {
-    return vec2 (mix (x.x, y.x, a.x), mix (x.y, y.y, a.y));
-}
-vec3 mix (vec3 x, vec3 y, vec3 a) {
-    return vec3 (mix (x.x, y.x, a.x), mix (x.y, y.y, a.y), mix (x.z, y.z, a.z));
-}
-vec4 mix (vec4 x, vec4 y, vec4 a) {
-    return vec4 (mix (x.x, y.x, a.x), mix (x.y, y.y, a.y), mix (x.z, y.z, a.z),
-        mix (x.w, y.w, a.w));
-}
-
-// 
-// Returns 0.0 if x < edge, otherwise it returns 1.0
-// 
-
-float step (float edge, float x) {
-    return x < edge ? 0.0 : 1.0;
-}
-vec2 step (float edge, vec2 x) {
-    return vec2 (step (edge, x.x), step (edge, x.y));
-}
-vec3 step (float edge, vec3 x) {
-    return vec3 (step (edge, x.x), step (edge, x.y), step (edge, x.z));
-}
-vec4 step (float edge, vec4 x) {
-    return vec4 (step (edge, x.x), step (edge, x.y), step (edge, x.z), step (edge, x.w));
-}
-vec2 step (vec2 edge, vec2 x) {
-    return vec2 (step (edge.x, x.x), step (edge.y, x.y));
-}
-vec3 step (vec3 edge, vec3 x) {
-    return vec3 (step (edge.x, x.x), step (edge.y, x.y), step (edge.z, x.z));
-}
-vec4 step (vec4 edge, vec4 x) {
-    return vec4 (step (edge.x, x.x), step (edge.y, x.y), step (edge.z, x.z), step (edge.w, x.w));
-}
-
-// 
-// Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and performs smooth Hermite interpolation
-// between 0 and 1 when edge0 < x < edge1. This is useful in cases where you would want a threshold
-// function with a smooth transition. This is equivalent to:
-// <type> t;
-// t = clamp ((x – edge0) / (edge1 – edge0), 0, 1);
-// return t * t * (3 – 2 * t);
-// 
-
-float smoothstep (float edge0, float edge1, float x) {
-    const float t = clamp ((x - edge0) / (edge1 - edge0), 0.0, 1.0);
-    return t * t * (3.0 - 2.0 * t);
-}
-vec2 smoothstep (float edge0, float edge1, vec2 x) {
-    return vec2 (smoothstep (edge0, edge1, x.x), smoothstep (edge0, edge1, x.y));
-}
-vec3 smoothstep (float edge0, float edge1, vec3 x) {
-    return vec3 (smoothstep (edge0, edge1, x.x), smoothstep (edge0, edge1, x.y),
-        smoothstep (edge0, edge1, x.z));
-}
-vec4 smoothstep (float edge0, float edge1, vec4 x) {
-    return vec4 (smoothstep (edge0, edge1, x.x), smoothstep (edge0, edge1, x.y),
-        smoothstep (edge0, edge1, x.z), smoothstep (edge0, edge1, x.w));
-}
-vec2 smoothstep (vec2 edge0, vec2 edge1, vec2 x) {
-    return vec2 (smoothstep (edge0.x, edge1.x, x.x), smoothstep (edge0.y, edge1.y, x.y));
-}
-vec3 smoothstep (vec3 edge0, vec3 edge1, vec3 x) {
-    return vec3 (smoothstep (edge0.x, edge1.x, x.x), smoothstep (edge0.y, edge1.y, x.y),
-        smoothstep (edge0.z, edge1.z, x.z));
-}
-vec4 smoothstep (vec4 edge0, vec4 edge1, vec4 x) {
-    return vec4 (smoothstep (edge0.x, edge1.x, x.x), smoothstep (edge0.y, edge1.y, x.y),
-        smoothstep (edge0.z, edge1.z, x.z), smoothstep (edge0.w, edge1.w, x.w));
-}
-
-// 
-// 8.4 Geometric Functions
-// 
-// These operate on vectors as vectors, not component-wise.
-// 
-
-// 
-// Returns the dot product of x and y, i.e., result = x[0] * y[0] + x[1] * y[1] + ...
-// 
-
-float dot (float x, float y) {
-    return x * y;
-}
-float dot (vec2 x, vec2 y) {
-    return dot (x.x, y.x) + dot (x.y, y.y);
-}
-float dot (vec3 x, vec3 y) {
-    return dot (x.x, y.x) + dot (x.y, y.y) + dot (x.z, y.z);
-}
-float dot (vec4 x, vec4 y) {
-    return dot (x.x, y.x) + dot (x.y, y.y) + dot (x.z, y.z) + dot (x.w, y.w);
-}
-
-// 
-// Returns the length of vector x, i.e., sqrt (x[0] * x[0] + x[1] * x[1] + ...)
-// 
-
-float length (float x) {
-    return sqrt (dot (x, x));
-}
-float length (vec2 x) {
-    return sqrt (dot (x, x));
-}
-float length (vec3 x) {
-    return sqrt (dot (x, x));
-}
-float length (vec4 x) {
-    return sqrt (dot (x, x));
-}
-
-// 
-// Returns the distance between p0 and p1, i.e. length (p0 – p1)
-// 
-
-float distance (float x, float y) {
-    return length (x - y);
-}
-float distance (vec2 x, vec2 y) {
-    return length (x - y);
-}
-float distance (vec3 x, vec3 y) {
-    return length (x - y);
-}
-float distance (vec4 x, vec4 y) {
-    return length (x - y);
-}
-
-// 
-// Returns the cross product of x and y, i.e.
-// result.0 = x[1] * y[2] - y[1] * x[2]
-// result.1 = x[2] * y[0] - y[2] * x[0]
-// result.2 = x[0] * y[1] - y[0] * x[1]
-// 
-
-vec3 cross (vec3 x, vec3 y) {
-    return vec3 (x.y * y.z - y.y * x.z, x.z * y.x - y.z * x.x, x.x * y.y - y.x * x.y);
-}
-
-// 
-// Returns a vector in the same direction as x but with a length of 1.
-// 
-
-float normalize (float x) {
-    return 1.0;
-}
-vec2 normalize (vec2 x) {
-    return x / length (x);
-}
-vec3 normalize (vec3 x) {
-    return x / length (x);
-}
-vec4 normalize (vec4 x) {
-    return x / length (x);
-}
-
-// 
-// If dot (Nref, I) < 0 return N otherwise return –N
-// 
-
-float faceforward (float N, float I, float Nref) {
-    return dot (Nref, I) < 0.0 ? N : -N;
-}
-vec2 faceforward (vec2 N, vec2 I, vec2 Nref) {
-    return dot (Nref, I) < 0.0 ? N : -N;
-}
-vec3 faceforward (vec3 N, vec3 I, vec3 Nref) {
-    return dot (Nref, I) < 0.0 ? N : -N;
-}
-vec4 faceforward (vec4 N, vec4 I, vec4 Nref) {
-    return dot (Nref, I) < 0.0 ? N : -N;
-}
-
-// 
-// For the incident vector I and surface orientation N, returns the reflection direction:
-// result = I - 2 * dot (N, I) * N
-// N must already be normalized in order to achieve the desired result.
-//
-
-float reflect (float I, float N) {
-    return I - 2.0 * dot (N, I) * N;
-}
-vec2 reflect (vec2 I, vec2 N) {
-    return I - 2.0 * dot (N, I) * N;
-}
-vec3 reflect (vec3 I, vec3 N) {
-    return I - 2.0 * dot (N, I) * N;
-}
-vec4 reflect (vec4 I, vec4 N) {
-    return I - 2.0 * dot (N, I) * N;
-}
-
-//
-// For the incident vector I and surface normal N, and the ratio of inidices of refraction eta,
-// return the refraction vector. The returned result is computed by
-//
-// k = 1.0 - eta * eta * (1.0 - dot (N, I) * dot (N, I))
-// if (k < 0.0)
-//   result = genType (0.0)
-// else
-//   result = eta * I - (eta * dot (N, I) + sqrt (k)) * N
-//
-// The input parameters for the incident vector I and the surface normal N must already be
-// normalized to get the desired results.
-//
-
-float refract (float I, float N, float eta) {
-    const float k = 1.0 - eta * eta * (1.0 - dot (N, I) * dot (N, I));
-    if (k < 0.0)
-        return 0.0;
-    return eta * I - (eta * dot (N, I) + sqrt (k)) * N;
-}
-vec2 refract (vec2 I, vec2 N, float eta) {
-    const float k = 1.0 - eta * eta * (1.0 - dot (N, I) * dot (N, I));
-    if (k < 0.0)
-        return vec2 (0.0);
-    return eta * I - (eta * dot (N, I) + sqrt (k)) * N;
-}
-vec3 refract (vec3 I, vec3 N, float eta) {
-    const float k = 1.0 - eta * eta * (1.0 - dot (N, I) * dot (N, I));
-    if (k < 0.0)
-        return vec3 (0.0);
-    return eta * I - (eta * dot (N, I) + sqrt (k)) * N;
-}
-vec4 refract (vec4 I, vec4 N, float eta) {
-    const float k = 1.0 - eta * eta * (1.0 - dot (N, I) * dot (N, I));
-    if (k < 0.0)
-        return vec4 (0.0);
-    return eta * I - (eta * dot (N, I) + sqrt (k)) * N;
-}
-
-// 
-// 8.5 Matrix Functions
-// 
-
-// 
-// Multiply matrix x by matrix y component-wise, i.e., result[i][j] is the scalar product
-// of x[i][j] and y[i][j].
-// Note: to get linear algebraic matrix multiplication, use the multiply operator (*).
-// 
-
-mat2 matrixCompMult (mat2 x, mat2 y) {
-    return mat2 (
-        x[0].x * y[0].x, x[0].y * y[0].y,
-        x[1].x * y[1].x, x[1].y * y[1].y
-    );
-}
-mat3 matrixCompMult (mat3 x, mat3 y) {
-    return mat4 (
-        x[0].x * y[0].x, x[0].y * y[0].y, x[0].z * y[0].z,
-        x[1].x * y[1].x, x[1].y * y[1].y, x[1].z * y[1].z,
-        x[2].x * y[2].x, x[2].y * y[2].y, x[2].z * y[2].z
-    );
-}
-mat4 matrixCompMult (mat4 x, mat4 y) {
-    return mat4 (
-        x[0].x * y[0].x, x[0].y * y[0].y, x[0].z * y[0].z + x[0].w * y[0].w,
-        x[1].x * y[1].x, x[1].y * y[1].y, x[1].z * y[1].z + x[1].w * y[1].w,
-        x[2].x * y[2].x, x[2].y * y[2].y, x[2].z * y[2].z + x[2].w * y[2].w,
-        x[3].x * y[3].x, x[3].y * y[3].y, x[3].z * y[3].z + x[3].w * y[3].w
-    );
-}
-
-// 
-// 8.6 Vector Relational Functions
-// 
-// Relational and equality operators (<, <=, >, >=, ==, !=) are defined (or reserved) to produce
-// scalar Boolean results.
-// 
-
-// 
-// Returns the component-wise compare of x < y.
-// 
-
-bvec2 lessThan (vec2 x, vec2 y) {
-    return bvec2 (x.x < y.x, x.y < y.y);
-}
-bvec3 lessThan (vec3 x, vec3 y) {
-    return bvec3 (x.x < y.x, x.y < y.y, x.z < y.z);
-}
-bvec4 lessThan (vec4 x, vec4 y) {
-    return bvec4 (x.x < y.x, x.y < y.y, x.z < y.z, x.w < y.w);
-}
-bvec2 lessThan (ivec2 x, ivec2 y) {
-    return bvec2 (x.x < y.x, x.y < y.y);
-}
-bvec3 lessThan (ivec3 x, ivec3 y) {
-    return bvec3 (x.x < y.x, x.y < y.y, x.z < y.z);
-}
-bvec4 lessThan (ivec4 x, ivec4 y) {
-    return bvec4 (x.x < y.x, x.y < y.y, x.z < y.z, x.w < y.w);
-}
-
-// 
-// Returns the component-wise compare of x <= y.
-// 
-
-bvec2 lessThanEqual (vec2 x, vec2 y) {
-    return bvec2 (x.x <= y.x, x.y <= y.y);
-}
-bvec3 lessThanEqual (vec3 x, vec3 y) {
-    return bvec3 (x.x <= y.x, x.y <= y.y, x.z <= y.z);
-}
-bvec4 lessThanEqual (vec4 x, vec4 y) {
-    return bvec4 (x.x <= y.x, x.y <= y.y, x.z <= y.z, x.w <= y.w);
-}
-bvec2 lessThanEqual (ivec2 x, ivec2 y) {
-    return bvec2 (x.x <= y.x, x.y <= y.y);
-}
-bvec3 lessThanEqual (ivec3 x, ivec3 y) {
-    return bvec3 (x.x <= y.x, x.y <= y.y, x.z <= y.z);
-}
-bvec4 lessThanEqual (ivec4 x, ivec4 y) {
-    return bvec4 (x.x <= y.x, x.y <= y.y, x.z <= y.z, x.w <= y.w);
-}
-
-// 
-// Returns the component-wise compare of x > y.
-// 
-
-bvec2 greaterThan (vec2 x, vec2 y) {
-    return bvec2 (x.x > y.x, x.y > y.y);
-}
-bvec3 greaterThan (vec3 x, vec3 y) {
-    return bvec3 (x.x > y.x, x.y > y.y, x.z > y.z);
-}
-bvec4 greaterThan (vec4 x, vec4 y) {
-    return bvec4 (x.x > y.x, x.y > y.y, x.z > y.z, x.w > y.w);
-}
-bvec2 greaterThan (ivec2 x, ivec2 y) {
-    return bvec2 (x.x > y.x, x.y > y.y);
-}
-bvec3 greaterThan (ivec3 x, ivec3 y) {
-    return bvec3 (x.x > y.x, x.y > y.y, x.z > y.z);
-}
-bvec4 greaterThan (ivec4 x, ivec4 y) {
-    return bvec4 (x.x > y.x, x.y > y.y, x.z > y.z, x.w > y.w);
-}
-
-// 
-// Returns the component-wise compare of x >= y.
-// 
-
-bvec2 greaterThanEqual (vec2 x, vec2 y) {
-    return bvec2 (x.x >= y.x, x.y >= y.y);
-}
-bvec3 greaterThanEqual (vec3 x, vec3 y) {
-    return bvec3 (x.x >= y.x, x.y >= y.y, x.z >= y.z);
-}
-bvec4 greaterThanEqual (vec4 x, vec4 y) {
-    return bvec4 (x.x >= y.x, x.y >= y.y, x.z >= y.z, x.w >= y.w);
-}
-bvec2 greaterThanEqual (ivec2 x, ivec2 y) {
-    return bvec2 (x.x >= y.x, x.y >= y.y);
-}
-bvec3 greaterThanEqual (ivec3 x, ivec3 y) {
-    return bvec3 (x.x >= y.x, x.y >= y.y, x.z >= y.z);
-}
-bvec4 greaterThanEqual (ivec4 x, ivec4 y) {
-    return bvec4 (x.x >= y.x, x.y >= y.y, x.z >= y.z, x.w >= y.w);
-}
-
-// 
-// Returns the component-wise compare of x == y.
-// 
-
-bvec2 equal (vec2 x, vec2 y) {
-    return bvec2 (x.x == y.x, x.y == y.y);
-}
-bvec3 equal (vec3 x, vec3 y) {
-    return bvec3 (x.x == y.x, x.y == y.y, x.z == y.z);
-}
-bvec4 equal (vec4 x, vec4 y) {
-    return bvec4 (x.x == y.x, x.y == y.y, x.z == y.z, x.w == y.w);
-}
-bvec2 equal (ivec2 x, ivec2 y) {
-    return bvec2 (x.x == y.x, x.y == y.y);
-}
-bvec3 equal (ivec3 x, ivec3 y) {
-    return bvec3 (x.x == y.x, x.y == y.y, x.z == y.z);
-}
-bvec4 equal (ivec4 x, ivec4 y) {
-    return bvec4 (x.x == y.x, x.y == y.y, x.z == y.z, x.w == y.w);
-}
-
-// 
-// Returns the component-wise compare of x != y.
-// 
-
-bvec2 notEqual (vec2 x, vec2 y) {
-    return bvec2 (x.x != y.x, x.y != y.y);
-}
-bvec3 notEqual (vec3 x, vec3 y) {
-    return bvec3 (x.x != y.x, x.y != y.y, x.z != y.z);
-}
-bvec4 notEqual (vec4 x, vec4 y) {
-    return bvec4 (x.x != y.x, x.y != y.y, x.z != y.z, x.w != y.w);
-}
-bvec2 notEqual (ivec2 x, ivec2 y) {
-    return bvec2 (x.x != y.x, x.y != y.y);
-}
-bvec3 notEqual (ivec3 x, ivec3 y) {
-    return bvec3 (x.x != y.x, x.y != y.y, x.z != y.z);
-}
-bvec4 notEqual (ivec4 x, ivec4 y) {
-    return bvec4 (x.x != y.x, x.y != y.y, x.z != y.z, x.w != y.w);
-}
-
-// 
-// Returns true if any component of x is true.
-// 
-
-bool any (bvec2 x) {
-    return x.x || x.y;
-}
-bool any (bvec3 x) {
-    return x.x || x.y || x.z;
-}
-bool any (bvec4 x) {
-    return x.x || x.y || x.z || x.w;
-}
-
-// 
-// Returns true only if all components of x are true.
-// 
-
-bool all (bvec2 x) {
-    return x.x && x.y;
-}
-bool all (bvec3 x) {
-    return x.x && x.y && x.z;
-}
-bool all (bvec4 x) {
-    return x.x && x.y && x.z && x.w;
-}
-
-// 
-// Returns the component-wise logical complement of x.
-// 
-
-bvec2 not (bvec2 x) {
-    return bvec2 (!x.x, !x.y);
-}
-bvec3 not (bvec3 x) {
-    return bvec3 (!x.x, !x.y, !x.z);
-}
-bvec4 not (bvec4 x) {
-    return bvec4 (!x.x, !x.y, !x.z, !x.w);
-}
-
-// 
-// 8.7 Texture Lookup Functions
-// 
-// Texture lookup functions are available to both vertex and fragment shaders. However, level
-// of detail is not computed by fixed functionality for vertex shaders, so there are some
-// differences in operation between vertex and fragment texture lookups. The functions in the table
-// below provide access to textures through samplers, as set up through the OpenGL API. Texture
-// properties such as size, pixel format, number of dimensions, filtering method, number of mip-map
-// levels, depth comparison, and so on are also defined by OpenGL API calls. Such properties are
-// taken into account as the texture is accessed via the built-in functions defined below.
-// 
-// If a non-shadow texture call is made to a sampler that represents a depth texture with depth
-// comparisons turned on, then results are undefined. If a shadow texture call is made to a sampler
-// that represents a depth texture with depth comparisions turned off, the results are undefined.
-// If a shadow texture call is made to a sampler that does not represent a depth texture, then
-// results are undefined.
-// 
-// In all functions below, the bias parameter is optional for fragment shaders. The bias parameter
-// is not accepted in a vertex shader. For a fragment shader, if bias is present, it is added to
-// the calculated level of detail prior to performing the texture access operation. If the bias
-// parameter is not provided, then the implementation automatically selects level of detail:
-// For a texture that is not mip-mapped, the texture is used directly. If it is mip-mapped and
-// running in a fragment shader, the LOD computed by the implementation is used to do the texture
-// lookup. If it is mip-mapped and running on the vertex shader, then the base texture is used.
-// 
-// The built-ins suffixed with "Lod" are allowed only in a vertex shader. For the "Lod" functions,
-// lod is directly used as the level of detail.
-// 
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the 1D texture currently bound
-// to sampler. For the projective ("Proj") versions, the texture coordinate coord.s is divided by
-// the last component of coord.
-// 
-// XXX
-vec4 texture1D (sampler1D sampler, float coord) {
-    return vec4 (0.0);
-}
-vec4 texture1DProj (sampler1D sampler, vec2 coord) {
-    return texture1D (sampler, coord.s / coord.t);
-}
-vec4 texture1DProj (sampler1D sampler, vec4 coord) {
-    return texture1D (sampler, coord.s / coord.q);
-}
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the 2D texture currently bound
-// to sampler. For the projective ("Proj") versions, the texture coordinate (coord.s, coord.t) is
-// divided by the last component of coord. The third component of coord is ignored for the vec4
-// coord variant.
-// 
-// XXX
-vec4 texture2D (sampler2D sampler, vec2 coord) {
-    return vec4 (0.0);
-}
-vec4 texture2DProj (sampler2D sampler, vec3 coord) {
-    return texture2D (sampler, vec2 (coord.s / coord.p, coord.t / coord.p));
-}
-vec4 texture2DProj (sampler2D sampler, vec4 coord) {
-    return texture2D (sampler, vec2 (coord.s / coord.q, coord.t / coord.q));
-}
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the 3D texture currently bound
-// to sampler. For the projective ("Proj") versions, the texture coordinate is divided by coord.q.
-// 
-// XXX
-vec4 texture3D (sampler3D sampler, vec3 coord) {
-    return vec4 (0.0);
-}
-vec4 texture3DProj (sampler3D sampler, vec4 coord) {
-    return texture3D (sampler, vec3 (coord.s / coord.q, coord.t / coord.q, coord.p / coord.q));
-}
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the cube map texture currently bound
-// to sampler. The direction of coord is used to select which face to do a 2-dimensional texture
-// lookup in, as described in section 3.8.6 in version 1.4 of the OpenGL specification.
-// 
-// XXX
-vec4 textureCube (samplerCube sampler, vec3 coord) {
-    return vec4 (0.0);
-}
-
-// 
-// Use texture coordinate coord to do a depth comparison lookup on the depth texture bound
-// to sampler, as described in section 3.8.14 of version 1.4 of the OpenGL specification. The 3rd
-// component of coord (coord.p) is used as the R value. The texture bound to sampler must be a
-// depth texture, or results are undefined. For the projective ("Proj") version of each built-in,
-// the texture coordinate is divide by coord.q, giving a depth value R of coord.p/coord.q. The
-// second component of coord is ignored for the "1D" variants.
-// 
-// XXX
-vec4 shadow1D (sampler1DShadow sampler, vec3 coord) {
-    return vec4 (0.0);
-}
-// XXX
-vec4 shadow2D (sampler2DShadow sampler, vec3 coord) {
-    return vec4 (0.0);
-}
-vec4 shadow1DProj (sampler1DShadow sampler, vec4 coord) {
-    return shadow1D (sampler, vec3 (coord.s / coord.q, 0.0, coord.p / coord.q));
-}
-vec4 shadow2DProj (sampler2DShadow sampler, vec4 coord) {
-    return shadow2D (sampler, vec3 (coord.s / coord.q, coord.t / coord.q, coord.p / coord.q));
-}
-
-// 
-// 8.9 Noise Functions
-// 
-// Noise functions are available to both fragment and vertex shaders. They are stochastic functions
-// that can be used to increase visual complexity. Values returned by the following noise functions
-// give the appearance of randomness, but are not truly random. The noise functions below are
-// defined to have the following characteristics:
-// 
-// - The return value(s) are always in the range [-1,1], and cover at least the range [-0.6, 0.6],
-//   with a gaussian-like distribution.
-// * The return value(s) have an overall average of 0.0
-// * They are repeatable, in that a particular input value will always produce the same return value
-// * They are statistically invariant under rotation (i.e., no matter how the domain is rotated, it
-//   has the same statistical character)
-// * They have a statistical invariance under translation (i.e., no matter how the domain is
-//   translated, it has the same statistical character)
-// * They typically give different results under translation.
-// - The spatial frequency is narrowly concentrated, centered somewhere between 0.5 to 1.0.
-// 
-
-// 
-// Returns a 1D noise value based on the input value x.
-// 
-// XXX
-float noise1 (float x) {
-    return 0.0;
-}
-// XXX
-float noise1 (vec2 x) {
-    return 0.0;
-}
-// XXX
-float noise1 (vec3 x) {
-    return 0.0;
-}
-// XXX
-float noise1 (vec4 x) {
-    return 0.0;
-}
-
-// 
-// Returns a 2D noise value based on the input value x.
-// 
-// XXX
-vec2 noise2 (float x) {
-    return vec2 (0.0);
-}
-// XXX
-vec2 noise2 (vec2 x) {
-    return vec2 (0.0);
-}
-// XXX
-vec2 noise2 (vec3 x) {
-    return vec2 (0.0);
-}
-// XXX
-vec2 noise2 (vec4 x) {
-    return vec2 (0.0);
-}
-
-// 
-// Returns a 3D noise value based on the input value x.
-// 
-// XXX
-vec3 noise3 (float x) {
-    return vec3 (0.0);
-}
-// XXX
-vec3 noise3 (vec2 x) {
-    return vec3 (0.0);
-}
-// XXX
-vec3 noise3 (vec3 x) {
-    return vec3 (0.0);
-}
-// XXX
-vec3 noise3 (vec4 x) {
-    return vec3 (0.0);
-}
-
-// 
-// Returns a 4D noise value based on the input value x.
-// 
-// XXX
-vec4 noise4 (float x) {
-    return vec4 (0.0);
-}
-// XXX
-vec4 noise4 (vec2 x) {
-    return vec4 (0.0);
-}
-// XXX
-vec4 noise4 (vec3 x) {
-    return vec4 (0.0);
-}
-// XXX
-vec4 noise4 (vec4 x) {
-    return vec4 (0.0);
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core.gc b/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core.gc
deleted file mode 100755
index d1d2cb10f..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core.gc
+++ /dev/null
@@ -1,1565 +0,0 @@
-
-// 
-// This file defines nearly all constructors and operators for built-in data types, using
-// extended language syntax. In general, compiler treats constructors and operators as
-// ordinary functions with some exceptions. For example, the language does not allow
-// functions to be called in constant expressions - here the exception is made to allow it.
-// 
-// Each implementation provides its own version of this file. Each implementation can define
-// the required set of operators and constructors in its own fashion.
-// 
-// The extended language syntax is only present when compiling this file. It is implicitly
-// included at the very beginning of the compiled shader, so no built-in functions can be
-// used.
-// 
-// To communicate with the implementation, a special extended "__asm" keyword is used, followed
-// by an instruction name (any valid identifier), a destination variable identifier and a
-// a list of zero or more source variable identifiers. A variable identifier is a variable name
-// declared earlier in the code (as a function parameter, local or global variable).
-// An instruction name designates an instruction that must be exported by the implementation.
-// Each instruction receives data from source variable identifiers and returns data in the
-// destination variable identifier.
-// 
-// It is up to the implementation how to define a particular operator or constructor. If it is
-// expected to being used rarely, it can be defined in terms of other operators and constructors,
-// for example:
-// 
-// ivec2 __operator + (const ivec2 x, const ivec2 y) {
-//    return ivec2 (x[0] + y[0], x[1] + y[1]);
-// }
-// 
-// If a particular operator or constructor is expected to be used very often or is an atomic
-// operation (that is, an operation that cannot be expressed in terms of other operations or
-// would create a dependency cycle) it must be defined using one or more __asm constructs.
-// 
-// Each implementation must define constructors for all scalar types (bool, float, int).
-// There are 9 scalar-to-scalar constructors (including identity constructors). However,
-// since the language introduces special constructors (like matrix constructor with a single
-// scalar value), implementations must also implement these cases.
-// The compiler provides the following algorithm when resolving a constructor:
-// - try to find a constructor with a prototype matching ours,
-// - if no constructor is found and this is a scalar-to-scalar constructor, raise an error,
-// - if a constructor is found, execute it and return,
-// - count the size of the constructor parameter list - if it is less than the size of
-//   our constructor's type, raise an error,
-// - for each parameter in the list do a recursive constructor matching for appropriate
-//   scalar fields in the constructed variable,
-// 
-// Each implementation must also define a set of operators that deal with built-in data types.
-// There are four kinds of operators:
-// 1) Operators that are implemented only by the compiler: "()" (function call), "," (sequence)
-//    and "?:" (selection).
-// 2) Operators that are implemented by the compiler by expressing it in terms of other operators:
-//    - "." (field selection) - translated to subscript access,
-//    - "&&" (logical and) - translated to "<left_expr> ? <right_expr> : false",
-//    - "||" (logical or) - translated to "<left_expr> ? true : <right_expr>",
-// 3) Operators that can be defined by the implementation and if the required prototype is not
-//    found, standard behaviour is used:
-//    - "==", "!=", "=" (equality, assignment) - compare or assign matching fields one-by-one;
-//      note that at least operators for scalar data types must be defined by the implementation
-//      to get it work,
-// 4) All other operators not mentioned above. If no required prototype is found, an error is
-//    raised. An implementation must follow the language specification to provide all valid
-//    operator prototypes.
-// 
-
-int __constructor (const float _f) {
-    int _i;
-    __asm float_to_int _i, _f;
-    return _i;
-}
-
-bool __constructor (const int _i) {
-    return _i != 0;
-}
-
-bool __constructor (const float _f) {
-    return _f != 0.0;
-}
-
-int __constructor (const bool _b) {
-    return _b ? 1 : 0;
-}
-
-float __constructor (const bool _b) {
-    return _b ? 1.0 : 0.0;
-}
-
-float __constructor (const int _i) {
-    float _f;
-    __asm int_to_float _f, _i;
-    return _f;
-}
-
-bool __constructor (const bool _b) {
-    return _b;
-}
-
-int __constructor (const int _i) {
-    return _i;
-}
-
-float __constructor (const float _f) {
-    return _f;
-}
-
-vec2 __constructor (const float _f) {
-    return vec2 (_f, _f);
-}
-
-vec2 __constructor (const int _i) {
-    return vec2 (_i, _i);
-}
-
-vec2 __constructor (const bool _b) {
-    return vec2 (_b, _b);
-}
-
-vec3 __constructor (const float _f) {
-    return vec3 (_f, _f, _f);
-}
-
-vec3 __constructor (const int _i) {
-    return vec3 (_i, _i, _i);
-}
-
-vec3 __constructor (const bool _b) {
-    return vec3 (_b, _b, _b);
-}
-
-vec4 __constructor (const float _f) {
-    return vec4 (_f, _f, _f, _f);
-}
-
-vec4 __constructor (const int _i) {
-    return vec4 (_i, _i, _i, _i);
-}
-
-vec4 __constructor (const bool _b) {
-    return vec4 (_b, _b, _b, _b);
-}
-
-ivec2 __constructor (const int _i) {
-    return ivec2 (_i, _i);
-}
-
-ivec2 __constructor (const float _f) {
-    return ivec2 (_f, _f);
-}
-
-ivec2 __constructor (const bool _b) {
-    return ivec2 (_b, _b);
-}
-
-ivec3 __constructor (const int _i) {
-    return ivec3 (_i, _i, _i);
-}
-
-ivec3 __constructor (const float _f) {
-    return ivec3 (_f, _f, _f);
-}
-
-ivec3 __constructor (const bool _b) {
-    return ivec3 (_b, _b, _b);
-}
-
-ivec4 __constructor (const int _i) {
-    return ivec4 (_i, _i, _i, _i);
-}
-
-ivec4 __constructor (const float _f) {
-    return ivec4 (_f, _f, _f, _f);
-}
-
-ivec4 __constructor (const bool _b) {
-    return ivec4 (_b, _b, _b, _b);
-}
-
-bvec2 __constructor (const bool _b) {
-    return bvec2 (_b, _b);
-}
-
-bvec2 __constructor (const float _f) {
-    return bvec2 (_f, _f);
-}
-
-bvec2 __constructor (const int _i) {
-    return bvec2 (_i, _i);
-}
-
-bvec3 __constructor (const bool _b) {
-    return bvec3 (_b, _b, _b);
-}
-
-bvec3 __constructor (const float _f) {
-    return bvec3 (_f, _f, _f);
-}
-
-bvec3 __constructor (const int _i) {
-    return bvec3 (_i, _i, _i);
-}
-
-bvec4 __constructor (const bool _b) {
-    return bvec4 (_b, _b, _b, _b);
-}
-
-bvec4 __constructor (const float _f) {
-    return bvec4 (_f, _f, _f, _f);
-}
-
-bvec4 __constructor (const int _i) {
-    return bvec4 (_i, _i, _i, _i);
-}
-
-mat2 __constructor (const float _f) {
-    return mat2 (
-        _f, .0,
-        .0, _f
-    );
-}
-
-mat2 __constructor (const int _i) {
-    return mat2 (
-        _i, .0,
-        .0, _i
-    );
-}
-
-mat2 __constructor (const bool _b) {
-    return mat2 (
-        _b, .0,
-        .0, _b
-    );
-}
-
-mat3 __constructor (const float _f) {
-    return mat3 (
-        _f, .0, .0,
-        .0, _f, .0,
-        .0, .0, _f
-    );
-}
-
-mat3 __constructor (const int _i) {
-    return mat3 (
-        _i, .0, .0,
-        .0, _i, .0,
-        .0, .0, _i
-    );
-}
-
-mat3 __constructor (const bool _b) {
-    return mat3 (
-        _b, .0, .0,
-        .0, _b, .0,
-        .0, .0, _b
-    );
-}
-
-mat4 __constructor (const float _f) {
-    return mat4 (
-        _f, .0, .0, .0,
-        .0, _f, .0, .0,
-        .0, .0, _f, .0,
-        .0, .0, .0, _f
-    );
-}
-
-mat4 __constructor (const int _i) {
-    return mat4 (
-        _i, .0, .0, .0,
-        .0, _i, .0, .0,
-        .0, .0, _i, .0,
-        .0, .0, .0, _i
-    );
-}
-
-mat4 __constructor (const bool _b) {
-    return mat4 (
-        _b, .0, .0, .0,
-        .0, _b, .0, .0,
-        .0, .0, _b, .0,
-        .0, .0, .0, _b
-    );
-}
-
-//void __operator = (out float a, const float b) {
-//    __asm float_copy a, b;
-//}
-//
-//void __operator = (out int a, const int b) {
-//    __asm int_copy a, b;
-//}
-//
-//void __operator = (out bool a, const bool b) {
-//    __asm bool_copy a, b;
-//}
-//
-//void __operator = (out vec2 v, const vec2 u) {
-//    v.x = u.x, v.y = u.y;
-//}
-//
-//void __operator = (out vec3 v, const vec3 u) {
-//    v.x = u.x, v.y = u.y, v.z = u.z;
-//}
-//
-//void __operator = (out vec4 v, const vec4 u) {
-//    v.x = u.x, v.y = u.y, v.z = u.z, v.w = u.w;
-//}
-//
-//void __operator = (out ivec2 v, const ivec2 u) {
-//    v.x = u.x, v.y = u.y;
-//}
-//
-//void __operator = (out ivec3 v, const ivec3 u) {
-//    v.x = u.x, v.y = u.y, v.z = u.z;
-//}
-//
-//void __operator = (out ivec4 v, const ivec4 u) {
-//    v.x = u.x, v.y = u.y, v.z = u.z, v.w = u.w;
-//}
-//
-//void __operator = (out bvec2 v, const bvec2 u) {
-//    v.x = u.x, v.y = u.y;
-//}
-//
-//void __operator = (out bvec3 v, const bvec3 u) {
-//    v.x = u.x, v.y = u.y, v.z = u.z;
-//}
-//
-//void __operator = (out bvec4 v, const bvec4 u) {
-//    v.x = u.x, v.y = u.y, v.z = u.z, v.w = u.w;
-//}
-//
-//void __operator = (out mat2 m, const mat2 n) {
-//    m[0] = n[0], m[1] = n[1];
-//}
-//
-//void __operator = (out mat3 m, const mat3 n) {
-//    m[0] = n[0], m[1] = n[1], m[2] = n[2];
-//}
-//
-//void __operator = (out mat4 m, const mat4 n) {
-//    m[0] = n[0], m[1] = n[1], m[2] = n[2], m[3] = n[3];
-//}
-
-void __operator += (inout float a, const float b) {
-    __asm float_add a, a, b;
-}
-
-float __operator - (const float a) {
-    float c;
-    __asm float_negate c, a;
-    return c;
-}
-
-void __operator -= (inout float a, const float b) {
-    a += -b;
-}
-
-void __operator *= (inout float a, const float b) {
-    __asm float_multiply a, a, b;
-}
-
-void __operator /= (inout float a, const float b) {
-    __asm float_divide a, a, b;
-}
-
-float __operator + (const float a, const float b) {
-    float c;
-    c = a;
-    return c += b;
-}
-
-void __operator += (inout int a, const int b) {
-    a = int (float (a) + float (b));
-}
-
-int __operator - (const int a) {
-	return int (-float (a));
-}
-
-void __operator -= (inout int a, const int b) {
-    a += -b;
-}
-
-float __operator * (const float a, const float b) {
-    float c;
-    c = a;
-    return c *= b;
-}
-
-void __operator *= (inout int a, const int b) {
-    a = int (float (a) * float (b));
-}
-
-float __operator / (const float a, const float b) {
-    float c;
-    c = a;
-    return c /= b;
-}
-
-void __operator /= (inout int a, const int b) {
-    a = int (float (a) / float (b));
-}
-
-void __operator += (inout vec2 v, const vec2 u) {
-    v.x += u.x, v.y += u.y;
-}
-
-void __operator -= (inout vec2 v, const vec2 u) {
-    v.x -= u.x, v.y -= u.y;
-}
-
-void __operator *= (inout vec2 v, const vec2 u) {
-    v.x *= u.x, v.y *= u.y;
-}
-
-void __operator /= (inout vec2 v, const vec2 u) {
-    v.x /= u.x, v.y /= u.y;
-}
-
-void __operator += (inout vec3 v, const vec3 u) {
-    v.x += u.x, v.y += u.y, v.z += u.z;
-}
-
-void __operator -= (inout vec3 v, const vec3 u) {
-    v.x -= u.x, v.y -= u.y, v.z -= u.z;
-}
-
-void __operator *= (inout vec3 v, const vec3 u) {
-    v.x *= u.x, v.y *= u.y, v.z *= u.z;
-}
-
-void __operator /= (inout vec3 v, const vec3 u) {
-    v.x /= u.x, v.y /= u.y, v.z /= u.z;
-}
-
-void __operator += (inout vec4 v, const vec4 u) {
-    v.x += u.x, v.y += u.y, v.z += u.z, v.w += u.w;
-}
-
-void __operator -= (inout vec4 v, const vec4 u) {
-    v.x -= u.x, v.y -= u.y, v.z -= u.z, v.w -= u.w;
-}
-
-void __operator *= (inout vec4 v, const vec4 u) {
-    v.x *= u.x, v.y *= u.y, v.z *= u.z, v.w *= u.w;
-}
-
-void __operator /= (inout vec4 v, const vec4 u) {
-    v.x /= u.x, v.y /= u.y, v.z /= u.z, v.w /= u.w;
-}
-
-void __operator += (inout ivec2 v, const ivec2 u) {
-    v.x += u.x, v.y += u.y;
-}
-
-void __operator -= (inout ivec2 v, const ivec2 u) {
-    v.x -= u.x, v.y -= u.y;
-}
-
-void __operator *= (inout ivec2 v, const ivec2 u) {
-    v.x *= u.x, v.y *= u.y;
-}
-
-void __operator /= (inout ivec2 v, const ivec2 u) {
-    v.x /= u.x, v.y /= u.y;
-}
-
-void __operator += (inout ivec3 v, const ivec3 u) {
-    v.x += u.x, v.y += u.y, v.z += u.z;
-}
-
-void __operator -= (inout ivec3 v, const ivec3 u) {
-    v.x -= u.x, v.y -= u.y, v.z -= u.z;
-}
-
-void __operator *= (inout ivec3 v, const ivec3 u) {
-    v.x *= u.x, v.y *= u.y, v.z *= u.z;
-}
-
-void __operator /= (inout ivec3 v, const ivec3 u) {
-    v.x /= u.x, v.y /= u.y, v.z /= u.z;
-}
-
-void __operator += (inout ivec4 v, const ivec4 u) {
-    v.x += u.x, v.y += u.y, v.z += u.z, v.w += u.w;
-}
-
-void __operator -= (inout ivec4 v, const ivec4 u) {
-    v.x -= u.x, v.y -= u.y, v.z -= u.z, v.w -= u.w;
-}
-
-void __operator *= (inout ivec4 v, const ivec4 u) {
-    v.x *= u.x, v.y *= u.y, v.z *= u.z, v.w *= u.w;
-}
-
-void __operator /= (inout ivec4 v, const ivec4 u) {
-    v.x /= u.x, v.y /= u.y, v.z /= u.z, v.w /= u.w;
-}
-
-void __operator += (inout mat2 m, const mat2 n) {
-    m[0] += n[0], m[1] += n[1];
-}
-
-void __operator -= (inout mat2 m, const mat2 n) {
-    m[0] -= n[0], m[1] -= n[1];
-}
-
-vec2 __operator * (const mat2 m, const vec2 v) {
-    return vec2 (
-        v.x * m[0].x + v.y * m[1].x,
-        v.x * m[0].y + v.y * m[1].y
-    );
-}
-
-mat2 __operator * (const mat2 m, const mat2 n) {
-    return mat2 (m * n[0], m * n[1]);
-}
-
-void __operator *= (inout mat2 m, const mat2 n) {
-    m = m * n;
-}
-
-void __operator /= (inout mat2 m, const mat2 n) {
-    m[0] /= n[0], m[1] /= n[1];
-}
-
-void __operator += (inout mat3 m, const mat3 n) {
-    m[0] += n[0], m[1] += n[1], m[2] += n[2];
-}
-
-void __operator -= (inout mat3 m, const mat3 n) {
-    m[0] -= n[0], m[1] -= n[1], m[2] -= n[2];
-}
-
-vec3 __operator * (const mat3 m, const vec3 v) {
-    return vec3 (
-        v.x * m[0].x + v.y * m[1].x + v.z * m[2].x,
-        v.x * m[0].y + v.y * m[1].y + v.z * m[2].y,
-        v.x * m[0].z + v.y * m[1].z + v.z * m[2].z
-    );
-}
-
-mat3 __operator * (const mat3 m, const mat3 n) {
-    return mat3 (m * n[0], m * n[1], m * n[2]);
-}
-
-void __operator *= (inout mat3 m, const mat3 n) {
-    m = m * n;
-}
-
-void __operator /= (inout mat3 m, const mat3 n) {
-    m[0] /= n[0], m[1] /= n[1], m[2] /= n[2];
-}
-
-void __operator += (inout mat4 m, const mat4 n) {
-    m[0] += n[0], m[1] += n[1], m[2] += n[2], m[3] += n[3];
-}
-
-void __operator -= (inout mat4 m, const mat4 n) {
-    m[0] -= n[0], m[1] -= n[1], m[2] -= n[2], m[3] -= n[3];
-}
-
-vec4 __operator * (const mat4 m, const vec4 v) {
-    return vec4 (
-        v.x * m[0].x + v.y * m[1].x + v.z * m[2].x + v.w * m[3].x,
-        v.x * m[0].y + v.y * m[1].y + v.z * m[2].y + v.w * m[3].y,
-        v.x * m[0].z + v.y * m[1].z + v.z * m[2].z + v.w * m[3].z,
-        v.x * m[0].w + v.y * m[1].w + v.z * m[2].w + v.w * m[3].w
-    );
-}
-
-mat4 __operator * (const mat4 m, const mat4 n) {
-    return mat4 (m * n[0], m * n[1], m * n[2], m * n[3]);
-}
-
-void __operator *= (inout mat4 m, const mat4 n) {
-    m = m * n;
-}
-
-void __operator /= (inout mat4 m, const mat4 n) {
-    m[0] /= n[0], m[1] /= n[1], m[2] /= n[2], m[3] /= n[3];
-}
-
-void __operator += (inout vec2 v, const float a) {
-    v.x += a, v.y += a;
-}
-
-void __operator -= (inout vec2 v, const float a) {
-    v.x -= a, v.y -= a;
-}
-
-void __operator *= (inout vec2 v, const float a) {
-    v.x *= a, v.y *= a;
-}
-
-void __operator /= (inout vec2 v, const float a) {
-    v.x /= a, v.y /= a;
-}
-
-void __operator += (inout vec3 v, const float a) {
-    v.x += a, v.y += a, v.z += a;
-}
-
-void __operator -= (inout vec3 v, const float a) {
-    v.x -= a, v.y -= a, v.z -= a;
-}
-
-void __operator *= (inout vec3 v, const float a) {
-    v.x *= a, v.y *= a, v.z *= a;
-}
-
-void __operator /= (inout vec3 v, const float a) {
-    v.x /= a, v.y /= a, v.z /= a;
-}
-
-void __operator += (inout vec4 v, const float a) {
-    v.x += a, v.y += a, v.z += a, v.w += a;
-}
-
-void __operator -= (inout vec4 v, const float a) {
-    v.x -= a, v.y -= a, v.z -= a, v.w -= a;
-}
-
-void __operator *= (inout vec4 v, const float a) {
-    v.x *= a, v.y *= a, v.z *= a, v.w *= a;
-}
-
-void __operator /= (inout vec4 v, const float a) {
-    v.x /= a, v.y /= a, v.z /= a, v.w /= a;
-}
-
-void __operator += (inout mat2 m, const float a) {
-    m[0] += a, m[1] += a;
-}
-
-void __operator -= (inout mat2 m, const float a) {
-    m[0] -= a, m[1] -= a;
-}
-
-void __operator *= (inout mat2 m, const float a) {
-    m[0] *= a, m[1] *= a;
-}
-
-void __operator /= (inout mat2 m, const float a) {
-    m[0] /= a, m[1] /= a;
-}
-
-void __operator += (inout mat3 m, const float a) {
-    m[0] += a, m[1] += a, m[2] += a;
-}
-
-void __operator -= (inout mat3 m, const float a) {
-    m[0] -= a, m[1] -= a, m[2] -= a;
-}
-
-void __operator *= (inout mat3 m, const float a) {
-    m[0] *= a, m[1] *= a, m[2] *= a;
-}
-
-void __operator /= (inout mat3 m, const float a) {
-    m[0] /= a, m[1] /= a, m[2] /= a;
-}
-
-void __operator += (inout mat4 m, const float a) {
-    m[0] += a, m[1] += a, m[2] += a, m[3] += a;
-}
-
-void __operator -= (inout mat4 m, const float a) {
-    m[0] -= a, m[1] -= a, m[2] -= a, m[3] -= a;
-}
-
-void __operator *= (inout mat4 m, const float a) {
-    m[0] *= a, m[1] *= a, m[2] *= a, m[3] *= a;
-}
-
-void __operator /= (inout mat4 m, const float a) {
-    m[0] /= a, m[1] /= a, m[2] /= a, m[3] /= a;
-}
-
-vec2 __operator * (const vec2 v, const mat2 m) {
-    return vec2 (
-        v.x * m[0].x + v.y * m[0].y,
-        v.x * m[1].x + v.y * m[1].y
-    );
-}
-
-void __operator *= (inout vec2 v, const mat2 m) {
-    v = v * m;
-}
-
-vec3 __operator * (const vec3 v, const mat3 m) {
-    return vec3 (
-        v.x * m[0].x + v.y * m[0].y + v.z * m[0].z,
-        v.x * m[1].x + v.y * m[1].y + v.z * m[1].z,
-        v.x * m[2].x + v.y * m[2].y + v.z * m[2].z
-    );
-}
-
-void __operator *= (inout vec3 v, const mat3 m) {
-    v = v * m;
-}
-
-vec4 __operator * (const vec4 v, const mat4 m) {
-    return vec4 (
-        v.x * m[0].x + v.y * m[0].y + v.z * m[0].z + v.w * m[0].w,
-        v.x * m[1].x + v.y * m[1].y + v.z * m[1].z + v.w * m[1].w,
-        v.x * m[2].x + v.y * m[2].y + v.z * m[2].z + v.w * m[2].w,
-        v.x * m[3].x + v.y * m[3].y + v.z * m[3].z + v.w * m[3].w
-    );
-}
-
-void __operator *= (inout vec4 v, const mat4 m) {
-    v = v * m;
-}
-
-float __operator - (const float a, const float b) {
-    return a + -b;
-}
-
-int __operator + (const int a, const int b) {
-    int c;
-    c = a;
-    return c += b;
-}
-
-int __operator - (const int a, const int b) {
-    return a + -b;
-}
-
-int __operator * (const int a, const int b) {
-    int c;
-    return (c = a) *= b;
-}
-
-int __operator / (const int a, const int b) {
-    int c;
-    return (c = a) /= b;
-}
-
-vec2 __operator + (const vec2 v, const vec2 u) {
-    return vec2 (v.x + u.x, v.y + u.y);
-}
-
-vec2 __operator - (const vec2 v, const vec2 u) {
-    return vec2 (v.x - u.x, v.y - u.y);
-}
-
-vec3 __operator + (const vec3 v, const vec3 u) {
-    return vec3 (v.x + u.x, v.y + u.y, v.z + u.z);
-}
-
-vec3 __operator - (const vec3 v, const vec3 u) {
-    return vec3 (v.x - u.x, v.y - u.y, v.z - u.z);
-}
-
-vec4 __operator + (const vec4 v, const vec4 u) {
-    return vec4 (v.x + u.x, v.y + u.y, v.z + u.z, v.w + u.w);
-}
-
-vec4 __operator - (const vec4 v, const vec4 u) {
-    return vec4 (v.x - u.x, v.y - u.y, v.z - u.z, v.w - u.w);
-}
-
-ivec2 __operator + (const ivec2 v, const ivec2 u) {
-    return ivec2 (v.x + u.x, v.y + u.y);
-}
-
-ivec2 __operator - (const ivec2 v, const ivec2 u) {
-    return ivec2 (v.x - u.x, v.y - u.y);
-}
-
-ivec3 __operator + (const ivec3 v, const ivec3 u) {
-    return ivec3 (v.x + u.x, v.y + u.y, v.z + u.z);
-}
-
-ivec3 __operator - (const ivec3 v, const ivec3 u) {
-    return ivec3 (v.x - u.x, v.y - u.y, v.z - u.z);
-}
-
-ivec4 __operator + (const ivec4 v, const ivec4 u) {
-    return ivec4 (v.x + u.x, v.y + u.y, v.z + u.z, v.w + u.w);
-}
-
-ivec4 __operator - (const ivec4 v, const ivec4 u) {
-    return ivec4 (v.x - u.x, v.y - u.y, v.z - u.z, v.w - u.w);
-}
-
-mat2 __operator + (const mat2 m, const mat2 n) {
-    return mat2 (m[0] + n[0], m[1] + n[1]);
-}
-
-mat2 __operator - (const mat2 m, const mat2 n) {
-    return mat2 (m[0] - n[0], m[1] - n[1]);
-}
-
-mat3 __operator + (const mat3 m, const mat3 n) {
-    return mat3 (m[0] + n[0], m[1] + n[1], m[2] + n[2]);
-}
-
-mat3 __operator - (const mat3 m, const mat3 n) {
-    return mat3 (m[0] - n[0], m[1] - n[1], m[2] - n[2]);
-}
-
-mat4 __operator + (const mat4 m, const mat4 n) {
-    return mat4 (m[0] + n[0], m[1] + n[1], m[2] + n[2], m[3] + n[3]);
-}
-
-mat4 __operator - (const mat4 m, const mat4 n) {
-    return mat4 (m[0] - n[0], m[1] - n[1], m[2] - n[2], m[3] - n[3]);
-}
-
-vec2 __operator + (const float a, const vec2 u) {
-    return vec2 (a + u.x, a + u.y);
-}
-
-vec2 __operator + (const vec2 v, const float b) {
-    return vec2 (v.x + b, v.y + b);
-}
-
-vec2 __operator - (const float a, const vec2 u) {
-    return vec2 (a - u.x, a - u.y);
-}
-
-vec2 __operator - (const vec2 v, const float b) {
-    return vec2 (v.x - b, v.y - b);
-}
-
-vec2 __operator * (const float a, const vec2 u) {
-    return vec2 (a * u.x, a * u.y);
-}
-
-vec2 __operator * (const vec2 v, const float b) {
-    return vec2 (v.x * b, v.y * b);
-}
-
-vec2 __operator / (const float a, const vec2 u) {
-    return vec2 (a / u.x, a / u.y);
-}
-
-vec2 __operator / (const vec2 v, const float b) {
-    return vec2 (v.x / b, v.y / b);
-}
-
-vec3 __operator + (const float a, const vec3 u) {
-    return vec3 (a + u.x, a + u.y, a + u.z);
-}
-
-vec3 __operator + (const vec3 v, const float b) {
-    return vec3 (v.x + b, v.y + b, v.z + b);
-}
-
-vec3 __operator - (const float a, const vec3 u) {
-    return vec3 (a - u.x, a - u.y, a - u.z);
-}
-
-vec3 __operator - (const vec3 v, const float b) {
-    return vec3 (v.x - b, v.y - b, v.z - b);
-}
-
-vec3 __operator * (const float a, const vec3 u) {
-    return vec3 (a * u.x, a * u.y, a * u.z);
-}
-
-vec3 __operator * (const vec3 v, const float b) {
-    return vec3 (v.x * b, v.y * b, v.z * b);
-}
-
-vec3 __operator / (const float a, const vec3 u) {
-    return vec3 (a / u.x, a / u.y, a / u.z);
-}
-
-vec3 __operator / (const vec3 v, const float b) {
-    return vec3 (v.x / b, v.y / b, v.z / b);
-}
-
-vec4 __operator + (const float a, const vec4 u) {
-    return vec4 (a + u.x, a + u.y, a + u.z, a + u.w);
-}
-
-vec4 __operator + (const vec4 v, const float b) {
-    return vec4 (v.x + b, v.y + b, v.z + b, v.w + b);
-}
-
-vec4 __operator - (const float a, const vec4 u) {
-    return vec4 (a - u.x, a - u.y, a - u.z, a - u.w);
-}
-
-vec4 __operator - (const vec4 v, const float b) {
-    return vec4 (v.x - b, v.y - b, v.z - b, v.w - b);
-}
-
-vec4 __operator * (const float a, const vec4 u) {
-    return vec4 (a * u.x, a * u.y, a * u.z, a * u.w);
-}
-
-vec4 __operator * (const vec4 v, const float b) {
-    return vec4 (v.x * b, v.y * b, v.z * b, v.w * b);
-}
-
-vec4 __operator / (const float a, const vec4 u) {
-    return vec4 (a / u.x, a / u.y, a / u.z, a / u.w);
-}
-
-vec4 __operator / (const vec4 v, const float b) {
-    return vec4 (v.x / b, v.y / b, v.z / b, v.w / b);
-}
-
-mat2 __operator + (const float a, const mat2 n) {
-    return mat2 (a + n[0], a + n[1]);
-}
-
-mat2 __operator + (const mat2 m, const float b) {
-    return mat2 (m[0] + b, m[1] + b);
-}
-
-mat2 __operator - (const float a, const mat2 n) {
-    return mat2 (a - n[0], a - n[1]);
-}
-
-mat2 __operator - (const mat2 m, const float b) {
-    return mat2 (m[0] - b, m[1] - b);
-}
-
-mat2 __operator * (const float a, const mat2 n) {
-    return mat2 (a * n[0], a * n[1]);
-}
-
-mat2 __operator * (const mat2 m, const float b) {
-    return mat2 (m[0] * b, m[1] * b);
-}
-
-mat2 __operator / (const float a, const mat2 n) {
-    return mat2 (a / n[0], a / n[1]);
-}
-
-mat2 __operator / (const mat2 m, const float b) {
-    return mat2 (m[0] / b, m[1] / b);
-}
-
-mat3 __operator + (const float a, const mat3 n) {
-    return mat3 (a + n[0], a + n[1], a + n[2]);
-}
-
-mat3 __operator + (const mat3 m, const float b) {
-    return mat3 (m[0] + b, m[1] + b, m[2] + b);
-}
-
-mat3 __operator - (const float a, const mat3 n) {
-    return mat3 (a - n[0], a - n[1], a - n[2]);
-}
-
-mat3 __operator - (const mat3 m, const float b) {
-    return mat3 (m[0] - b, m[1] - b, m[2] - b);
-}
-
-mat3 __operator * (const float a, const mat3 n) {
-    return mat3 (a * n[0], a * n[1], a * n[2]);
-}
-
-mat3 __operator * (const mat3 m, const float b) {
-    return mat3 (m[0] * b, m[1] * b, m[2] * b);
-}
-
-mat3 __operator / (const float a, const mat3 n) {
-    return mat3 (a / n[0], a / n[1], a / n[2]);
-}
-
-mat3 __operator / (const mat3 m, const float b) {
-    return mat3 (m[0] / b, m[1] / b, m[2] / b);
-}
-
-mat4 __operator + (const float a, const mat4 n) {
-    return mat4 (a + n[0], a + n[1], a + n[2], a + n[3]);
-}
-
-mat4 __operator + (const mat4 m, const float b) {
-    return mat4 (m[0] + b, m[1] + b, m[2] + b, m[3] + b);
-}
-
-mat4 __operator - (const float a, const mat4 n) {
-    return mat4 (a - n[0], a - n[1], a - n[2], a - n[3]);
-}
-
-mat4 __operator - (const mat4 m, const float b) {
-    return mat4 (m[0] - b, m[1] - b, m[2] - b, m[3] - b);
-}
-
-mat4 __operator * (const float a, const mat4 n) {
-    return mat4 (a * n[0], a * n[1], a * n[2], a * n[3]);
-}
-
-mat4 __operator * (const mat4 m, const float b) {
-    return mat4 (m[0] * b, m[1] * b, m[2] * b, m[3] * b);
-}
-
-mat4 __operator / (const float a, const mat4 n) {
-    return mat4 (a / n[0], a / n[1], a / n[2], a / n[3]);
-}
-
-mat4 __operator / (const mat4 m, const float b) {
-    return mat4 (m[0] / b, m[1] / b, m[2] / b, m[3] / b);
-}
-
-ivec2 __operator + (const int a, const ivec2 u) {
-    return ivec2 (a + u.x, a + u.y);
-}
-
-ivec2 __operator + (const ivec2 v, const int b) {
-    return ivec2 (v.x + b, v.y + b);
-}
-
-ivec2 __operator - (const int a, const ivec2 u) {
-    return ivec2 (a - u.x, a - u.y);
-}
-
-ivec2 __operator - (const ivec2 v, const int b) {
-    return ivec2 (v.x - b, v.y - b);
-}
-
-ivec2 __operator * (const int a, const ivec2 u) {
-    return ivec2 (a * u.x, a * u.y);
-}
-
-ivec2 __operator * (const ivec2 v, const int b) {
-    return ivec2 (v.x * b, v.y * b);
-}
-
-ivec2 __operator / (const int a, const ivec2 u) {
-    return ivec2 (a / u.x, a / u.y);
-}
-
-ivec2 __operator / (const ivec2 v, const int b) {
-    return ivec2 (v.x / b, v.y / b);
-}
-
-ivec3 __operator + (const int a, const ivec3 u) {
-    return ivec3 (a + u.x, a + u.y, a + u.z);
-}
-
-ivec3 __operator + (const ivec3 v, const int b) {
-    return ivec3 (v.x + b, v.y + b, v.z + b);
-}
-
-ivec3 __operator - (const int a, const ivec3 u) {
-    return ivec3 (a - u.x, a - u.y, a - u.z);
-}
-
-ivec3 __operator - (const ivec3 v, const int b) {
-    return ivec3 (v.x - b, v.y - b, v.z - b);
-}
-
-ivec3 __operator * (const int a, const ivec3 u) {
-    return ivec3 (a * u.x, a * u.y, a * u.z);
-}
-
-ivec3 __operator * (const ivec3 v, const int b) {
-    return ivec3 (v.x * b, v.y * b, v.z * b);
-}
-
-ivec3 __operator / (const int a, const ivec3 u) {
-    return ivec3 (a / u.x, a / u.y, a / u.z);
-}
-
-ivec3 __operator / (const ivec3 v, const int b) {
-    return ivec3 (v.x / b, v.y / b, v.z / b);
-}
-
-ivec4 __operator + (const int a, const ivec4 u) {
-    return ivec4 (a + u.x, a + u.y, a + u.z, a + u.w);
-}
-
-ivec4 __operator + (const ivec4 v, const int b) {
-    return ivec4 (v.x + b, v.y + b, v.z + b, v.w + b);
-}
-
-ivec4 __operator - (const int a, const ivec4 u) {
-    return ivec4 (a - u.x, a - u.y, a - u.z, a - u.w);
-}
-
-ivec4 __operator - (const ivec4 v, const int b) {
-    return ivec4 (v.x - b, v.y - b, v.z - b, v.w - b);
-}
-
-ivec4 __operator * (const int a, const ivec4 u) {
-    return ivec4 (a * u.x, a * u.y, a * u.z, a * u.w);
-}
-
-ivec4 __operator * (const ivec4 v, const int b) {
-    return ivec4 (v.x * b, v.y * b, v.z * b, v.w * b);
-}
-
-ivec4 __operator / (const int a, const ivec4 u) {
-    return ivec4 (a / u.x, a / u.y, a / u.z, a / u.w);
-}
-
-ivec4 __operator / (const ivec4 v, const int b) {
-    return ivec4 (v.x / b, v.y / b, v.z / b, v.w / b);
-}
-
-vec2 __operator * (const vec2 v, const vec2 u) {
-    return vec2 (v.x * u.x, v.y * u.y);
-}
-
-vec3 __operator * (const vec3 v, const vec3 u) {
-    return vec3 (v.x * u.x, v.y * u.y, v.z * u.z);
-}
-
-vec4 __operator * (const vec4 v, const vec4 u) {
-    return vec4 (v.x * u.x, v.y * u.y, v.z * u.z, v.w * u.w);
-}
-
-ivec2 __operator * (const ivec2 v, const ivec2 u) {
-    return ivec2 (v.x * u.x, v.y * u.y);
-}
-
-ivec3 __operator * (const ivec3 v, const ivec3 u) {
-    return ivec3 (v.x * u.x, v.y * u.y, v.z * u.z);
-}
-
-ivec4 __operator * (const ivec4 v, const ivec4 u) {
-    return ivec4 (v.x * u.x, v.y * u.y, v.z * u.z, v.w * u.w);
-}
-
-vec2 __operator / (const vec2 v, const vec2 u) {
-    return vec2 (v.x / u.x, v.y / u.y);
-}
-
-vec3 __operator / (const vec3 v, const vec3 u) {
-    return vec3 (v.x / u.x, v.y / u.y, v.z / u.z);
-}
-
-vec4 __operator / (const vec4 v, const vec4 u) {
-    return vec4 (v.x / u.x, v.y / u.y, v.z / u.z, v.w / u.w);
-}
-
-ivec2 __operator / (const ivec2 v, const ivec2 u) {
-    return ivec2 (v.x / u.x, v.y / u.y);
-}
-
-ivec3 __operator / (const ivec3 v, const ivec3 u) {
-    return ivec3 (v.x / u.x, v.y / u.y, v.z / u.z);
-}
-
-ivec4 __operator / (const ivec4 v, const ivec4 u) {
-    return ivec4 (v.x / u.x, v.y / u.y, v.z / u.z, v.w / u.w);
-}
-
-mat2 __operator / (const mat2 m, const mat2 n) {
-    return mat2 (m[0] / n[0], m[1] / n[1]);
-}
-
-mat3 __operator / (const mat3 m, const mat3 n) {
-    return mat3 (m[0] / n[0], m[1] / n[1], m[2] / n[2]);
-}
-
-mat4 __operator / (const mat4 m, const mat4 n) {
-    return mat4 (m[0] / n[0], m[1] / n[1], m[2] / n[2], m[3] / n[3]);
-}
-
-vec2 __operator - (const vec2 v) {
-    return vec2 (-v.x, -v.y);
-}
-
-vec3 __operator - (const vec3 v) {
-    return vec3 (-v.x, -v.y, -v.z);
-}
-
-vec4 __operator - (const vec4 v) {
-    return vec4 (-v.x, -v.y, -v.z, -v.w);
-}
-
-ivec2 __operator - (const ivec2 v) {
-    return ivec2 (-v.x, -v.y);
-}
-
-ivec3 __operator - (const ivec3 v) {
-    return ivec3 (-v.x, -v.y, -v.z);
-}
-
-ivec4 __operator - (const ivec4 v) {
-    return ivec4 (-v.x, -v.y, -v.z, -v.w);
-}
-
-mat2 __operator - (const mat2 m) {
-    return mat2 (-m[0], -m[1]);
-}
-
-mat3 __operator - (const mat3 m) {
-    return mat3 (-m[0], -m[1], -m[2]);
-}
-
-mat4 __operator - (const mat4 m) {
-    return mat4 (-m[0], -m[1], -m[2], -m[3]);
-}
-
-// 
-// NOTE: postfix increment and decrement operators take additional dummy int parameter to
-//       distinguish their prototypes from prefix ones.
-// 
-
-void __operator -- (inout float a) {
-    a -= 1.0;
-}
-
-void __operator -- (inout int a) {
-    a -= 1;
-}
-
-void __operator -- (inout vec2 v) {
-    --v.x, --v.y;
-}
-
-void __operator -- (inout vec3 v) {
-    --v.x, --v.y, --v.z;
-}
-
-void __operator -- (inout vec4 v) {
-    --v.x, --v.y, --v.z, --v.w;
-}
-
-void __operator -- (inout ivec2 v) {
-    --v.x, --v.y;
-}
-
-void __operator -- (inout ivec3 v) {
-    --v.x, --v.y, --v.z;
-}
-
-void __operator -- (inout ivec4 v) {
-    --v.x, --v.y, --v.z, --v.w;
-}
-
-void __operator -- (inout mat2 m) {
-    --m[0], --m[1];
-}
-
-void __operator -- (inout mat3 m) {
-    --m[0], --m[1], --m[2];
-}
-
-void __operator -- (inout mat4 m) {
-    --m[0], --m[1], --m[2], --m[3];
-}
-
-void __operator ++ (inout float a) {
-    a += 1.0;
-}
-
-void __operator ++ (inout int a) {
-    a += 1;
-}
-
-void __operator ++ (inout vec2 v) {
-    ++v.x, ++v.y;
-}
-
-void __operator ++ (inout vec3 v) {
-    ++v.x, ++v.y, ++v.z;
-}
-
-void __operator ++ (inout vec4 v) {
-    ++v.x, ++v.y, ++v.z, ++v.w;
-}
-
-void __operator ++ (inout ivec2 v) {
-    ++v.x, ++v.y;
-}
-
-void __operator ++ (inout ivec3 v) {
-    ++v.x, ++v.y, ++v.z;
-}
-
-void __operator ++ (inout ivec4 v) {
-    ++v.x, ++v.y, ++v.z, ++v.w;
-}
-
-void __operator ++ (inout mat2 m) {
-    ++m[0], ++m[1];
-}
-
-void __operator ++ (inout mat3 m) {
-    ++m[0], ++m[1], ++m[2];
-}
-
-void __operator ++ (inout mat4 m) {
-    ++m[0], ++m[1], ++m[2], ++m[3];
-}
-
-float __operator -- (inout float a, const int) {
-    float c;
-    c = a;
-    --a;
-    return c;
-}
-
-int __operator -- (inout int a, const int) {
-    int c;
-    c = a;
-    --a;
-    return c;
-}
-
-vec2 __operator -- (inout vec2 v, const int) {
-    return vec2 (v.x--, v.y--);
-}
-
-vec3 __operator -- (inout vec3 v, const int) {
-    return vec3 (v.x--, v.y--, v.z--);
-}
-
-vec4 __operator -- (inout vec4 v, const int) {
-    return vec4 (v.x--, v.y--, v.z--, v.w--);
-}
-
-ivec2 __operator -- (inout ivec2 v, const int) {
-    return ivec2 (v.x--, v.y--);
-}
-
-ivec3 __operator -- (inout ivec3 v, const int) {
-    return ivec3 (v.x--, v.y--, v.z--);
-}
-
-ivec4 __operator -- (inout ivec4 v, const int) {
-    return ivec4 (v.x--, v.y--, v.z--, v.w--);
-}
-
-mat2 __operator -- (inout mat2 m, const int) {
-    return mat2 (m[0]--, m[1]--);
-}
-
-mat3 __operator -- (inout mat3 m, const int) {
-    return mat3 (m[0]--, m[1]--, m[2]--);
-}
-
-mat4 __operator -- (inout mat4 m, const int) {
-    return mat4 (m[0]--, m[1]--, m[2]--, m[3]--);
-}
-
-float __operator ++ (inout float a, const int) {
-    float c;
-    c = a;
-    ++a;
-    return c;
-}
-
-int __operator ++ (inout int a, const int) {
-    int c;
-    c = a;
-    ++a;
-    return c;
-}
-
-vec2 __operator ++ (inout vec2 v, const int) {
-    return vec2 (v.x++, v.y++);
-}
-
-vec3 __operator ++ (inout vec3 v, const int) {
-    return vec3 (v.x++, v.y++, v.z++);
-}
-
-vec4 __operator ++ (inout vec4 v, const int) {
-    return vec4 (v.x++, v.y++, v.z++, v.w++);
-}
-
-ivec2 __operator ++ (inout ivec2 v, const int) {
-    return ivec2 (v.x++, v.y++);
-}
-
-ivec3 __operator ++ (inout ivec3 v, const int) {
-    return ivec3 (v.x++, v.y++, v.z++);
-}
-
-ivec4 __operator ++ (inout ivec4 v, const int) {
-    return ivec4 (v.x++, v.y++, v.z++, v.w++);
-}
-
-mat2 __operator ++ (inout mat2 m, const int) {
-    return mat2 (m[0]++, m[1]++);
-}
-
-mat3 __operator ++ (inout mat3 m, const int) {
-    return mat3 (m[0]++, m[1]++, m[2]++);
-}
-
-mat4 __operator ++ (inout mat4 m, const int) {
-    return mat4 (m[0]++, m[1]++, m[2]++, m[3]++);
-}
-
-bool __operator < (const float a, const float b) {
-    bool c;
-    __asm float_less c, a, b;
-    return c;
-}
-
-bool __operator < (const int a, const int b) {
-	return float (a) < float (b);
-}
-
-bool __operator > (const float a, const float b) {
-    return b < a;
-}
-
-bool __operator > (const int a, const int b) {
-    return b < a;
-}
-
-bool __operator >= (const float a, const float b) {
-    return a > b || a == b;
-}
-
-bool __operator >= (const int a, const int b) {
-    return a > b || a == b;
-}
-
-bool __operator <= (const float a, const float b) {
-    return a < b || a == b;
-}
-
-bool __operator <= (const int a, const int b) {
-    return a < b || a == b;
-}
-
-//bool __operator == (const float a, const float b) {
-//    bool c;
-//    __asm float_equal c, a, b;
-//    return c;
-//}
-//
-//bool __operator == (const int a, const int b) {
-//	return float (a) == float (b);
-//}
-//
-//bool __operator == (const bool a, const bool b) {
-//    return float (a) == float (b);
-//}
-//
-//bool __operator == (const vec2 v, const vec2 u) {
-//    return v.x == u.x && v.y == u.y;
-//}
-//
-//bool __operator == (const vec3 v, const vec3 u) {
-//    return v.x == u.x && v.y == u.y && v.z == u.z;
-//}
-//
-//bool __operator == (const vec4 v, const vec4 u) {
-//    return v.x == u.x && v.y == u.y && v.z == u.z && v.w == u.w;
-//}
-//
-//bool __operator == (const ivec2 v, const ivec2 u) {
-//    return v.x == u.x && v.y == u.y;
-//}
-//
-//bool __operator == (const ivec3 v, const ivec3 u) {
-//    return v.x == u.x && v.y == u.y && v.z == u.z;
-//}
-//
-//bool __operator == (const ivec4 v, const ivec4 u) {
-//    return v.x == u.x && v.y == u.y && v.z == u.z && v.w == u.w;
-//}
-//
-//bool __operator == (const bvec2 v, const bvec2 u) {
-//    return v.x == u.x && v.y == u.y;
-//}
-//
-//bool __operator == (const bvec3 v, const bvec3 u) {
-//    return v.x == u.x && v.y == u.y && v.z == u.z;
-//}
-//
-//bool __operator == (const bvec4 v, const bvec4 u) {
-//    return v.x == u.x && v.y == u.y && v.z == u.z && v.w == u.w;
-//}
-//
-//bool __operator == (const mat2 m, const mat2 n) {
-//    return m[0] == n[0] && m[1] == n[1];
-//}
-//
-//bool __operator == (const mat3 m, const mat3 n) {
-//    return m[0] == n[0] && m[1] == n[1] && m[2] == n[2];
-//}
-//
-//bool __operator == (const mat4 m, const mat4 n) {
-//    return m[0] == n[0] && m[1] == n[1] && m[2] == n[2] && m[3] == n[3];
-//}
-//
-//bool __operator != (const float a, const float b) {
-//    return !(a == b);
-//}
-//
-//bool __operator != (const int a, const int b) {
-//    return !(a == b);
-//}
-//
-//bool __operator != (const bool a, const bool b) {
-//    return !(a == b);
-//}
-//
-//bool __operator != (const vec2 v, const vec2 u) {
-//    return v.x != u.x || v.y != u.y;
-//}
-//
-//bool __operator != (const vec3 v, const vec3 u) {
-//    return v.x != u.x || v.y != u.y || v.z != u.z;
-//}
-//
-//bool __operator != (const vec4 v, const vec4 u) {
-//    return v.x != u.x || v.y != u.y || v.z != u.z || v.w != u.w;
-//}
-//
-//bool __operator != (const ivec2 v, const ivec2 u) {
-//    return v.x != u.x || v.y != u.y;
-//}
-//
-//bool __operator != (const ivec3 v, const ivec3 u) {
-//    return v.x != u.x || v.y != u.y || v.z != u.z;
-//}
-//
-//bool __operator != (const ivec4 v, const ivec4 u) {
-//    return v.x != u.x || v.y != u.y || v.z != u.z || v.w != u.w;
-//}
-//
-//bool __operator != (const bvec2 v, const bvec2 u) {
-//    return v.x != u.x || v.y != u.y;
-//}
-//
-//bool __operator != (const bvec3 v, const bvec3 u) {
-//    return v.x != u.x || v.y != u.y || v.z != u.z;
-//}
-//
-//bool __operator != (const bvec4 v, const bvec4 u) {
-//    return v.x != u.x || v.y != u.y || v.z != u.z || v.w != u.w;
-//}
-//
-//bool __operator != (const mat2 m, const mat2 n) {
-//    return m[0] != n[0] || m[1] != n[1];
-//}
-//
-//bool __operator != (const mat3 m, const mat3 n) {
-//    return m[0] != n[0] || m[1] != n[1] || m[2] != n[2];
-//}
-//
-//bool __operator != (const mat4 m, const mat4 n) {
-//    return m[0] != n[0] || m[1] != n[1] || m[2] != n[2] || m[3] != n[3];
-//}
-
-bool __operator ^^ (const bool a, const bool b) {
-    return a != b;
-}
-
-// 
-// These operators are handled internally by the compiler:
-// 
-// bool __operator && (bool a, bool b) {
-//     return a ? b : false;
-// }
-// bool __operator || (bool a, bool b) {
-//     return a ? true : b;
-// }
-// 
-
-bool __operator ! (const bool a) {
-    return a == false;
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin.gc b/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin.gc
deleted file mode 100755
index b4c5aa3ec..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin.gc
+++ /dev/null
@@ -1,366 +0,0 @@
-
-// 
-// TODO:
-// - implement texture1D, texture2D, texture3D, textureCube,
-// - implement shadow1D, shadow2D,
-// - implement dFdx, dFdy,
-// 
-
-// 
-// From Shader Spec, ver. 1.10, rev. 59
-// 
-// The output of the fragment shader is processed by the fixed function operations at the back end
-// of the OpenGL pipeline. Fragment shaders output values to the OpenGL pipeline using the built-in
-// variables gl_FragColor, gl_FragData and gl_FragDepth, unless the discard keyword is executed.
-// 
-// These variables may be written more than once within a fragment shader. If so, the last value
-// assigned is the one used in the subsequent fixed function pipeline. The values written to these
-// variables may be read back after writing them. Reading from these variables before writing them
-// results in an undefined value. The fixed functionality computed depth for a fragment may be
-// obtained by reading gl_FragCoord.z, described below.
-// 
-// Writing to gl_FragColor specifies the fragment color that will be used by the subsequent fixed
-// functionality pipeline. If subsequent fixed functionality consumes fragment color and an
-// execution of a fragment shader does not write a value to gl_FragColor then the fragment color
-// consumed is undefined.
-// 
-// If the frame buffer is configured as a color index buffer then behavior is undefined when using
-// a fragment shader.
-// 
-// Writing to gl_FragDepth will establish the depth value for the fragment being processed. If
-// depth buffering is enabled, and a shader does not write gl_FragDepth, then the fixed function
-// value for depth will be used as the fragment's depth value. If a shader statically assigns
-// a value to gl_FragDepth, and there is an execution path through the shader that does not set
-// gl_FragDepth, then the value of the fragment's depth may be undefined for executions of the
-// shader that take that path. That is, if a shader statically contains a write gl_FragDepth, then
-// it is responsible for always writing it.
-//
-// (A shader contains a static assignment to a variable x if, after pre-processing, the shader
-// contains statement that would write x, whether or not run-time flow of control will cause
-// that statement to be executed.)
-//
-// The variable gl_FragData is an array. Writing to gl_FragData[n] specifies the fragment data
-// that will be used by the subsequent fixed functionality pipeline for data n. If subsequent
-// fixed functionality consumes fragment data and an execution of a fragment shader does not
-// write a value to it, then the fragment data consumed is undefined.
-//
-// If a shader statically assigns a value to gl_FragColor, it may not assign a value to any element
-// of gl_FragData. If a shader statically writes a value to any element of gl_FragData, it may not
-// assign a value to gl_FragColor. That is, a shader may assign values to either gl_FragColor or
-// gl_FragData, but not both.
-// 
-// If a shader executes the discard keyword, the fragment is discarded, and the values of
-// gl_FragDepth, gl_FragColor and gl_FragData become irrelevant.
-// 
-// The variable gl_FragCoord is available as a read-only variable from within fragment shaders
-// and it holds the window relative coordinates x, y, z, and 1/w values for the fragment. This
-// value is the result of the fixed functionality that interpolates primitives after vertex
-// processing to generate fragments. The z component is the depth value that would be used for
-// the fragment's depth if a shader contained no writes to gl_FragDepth. This is useful for
-// invariance if a shader conditionally computes gl_FragDepth but otherwise wants the fixed
-// functionality fragment depth.
-// 
-// The fragment shader has access to the read-only built-in variable gl_FrontFacing whose value
-// is true if the fragment belongs to a front-facing primitive. One use of this is to emulate
-// two-sided lighting by selecting one of two colors calculated by the vertex shader.
-// 
-// The built-in variables that are accessible from a fragment shader are intrinsically given types
-// as follows:
-// 
-
-__fixed_input vec4 gl_FragCoord;
-__fixed_input bool gl_FrontFacing;
-__fixed_output vec4 gl_FragColor;
-__fixed_output vec4 gl_FragData[gl_MaxDrawBuffers];
-__fixed_output float gl_FragDepth;
-
-// 
-// However, they do not behave like variables with no qualifier; their behavior is as described
-// above. These built-in variables have global scope.
-// 
-
-// 
-// Unlike user-defined varying variables, the built-in varying variables don't have a strict
-// one-to-one correspondence between the vertex language and the fragment language. Two sets are
-// provided, one for each language. Their relationship is described below.
-// 
-// The following varying variables are available to read from in a fragment shader. The gl_Color
-// and gl_SecondaryColor names are the same names as attributes passed to the vertex shader.
-// However, there is no name conflict, because attributes are visible only in vertex shaders
-// and the following are only visible in a fragment shader.
-// 
-
-varying vec4 gl_Color;
-varying vec4 gl_SecondaryColor;
-varying vec4 gl_TexCoord[];                             // at most will be gl_MaxTextureCoords
-varying float gl_FogFragCoord;
-
-// 
-// The values in gl_Color and gl_SecondaryColor will be derived automatically by the system from
-// gl_FrontColor, gl_BackColor, gl_FrontSecondaryColor, and gl_BackSecondaryColor based on which
-// face is visible. If fixed functionality is used for vertex processing, then gl_FogFragCoord will
-// either be the z-coordinate of the fragment in eye space, or the interpolation of the fog
-// coordinate, as described in section 3.10 of the OpenGL 1.4 Specification. The gl_TexCoord[]
-// values are the interpolated gl_TexCoord[] values from a vertex shader or the texture coordinates
-// of any fixed pipeline based vertex functionality.
-// 
-// Indices to the fragment shader gl_TexCoord array are as described above in the vertex shader
-// text.
-// 
-
-// 
-// The OpenGL Shading Language defines an assortment of built-in convenience functions for scalar
-// and vector operations. Many of these built-in functions can be used in more than one type
-// of shader, but some are intended to provide a direct mapping to hardware and so are available
-// only for a specific type of shader.
-// 
-// The built-in functions basically fall into three categories:
-// 
-// * They expose some necessary hardware functionality in a convenient way such as accessing
-//   a texture map. There is no way in the language for these functions to be emulated by a shader.
-// 
-// * They represent a trivial operation (clamp, mix, etc.) that is very simple for the user
-//   to write, but they are very common and may have direct hardware support. It is a very hard
-//   problem for the compiler to map expressions to complex assembler instructions.
-// 
-// * They represent an operation graphics hardware is likely to accelerate at some point. The
-//   trigonometry functions fall into this category.
-// 
-// Many of the functions are similar to the same named ones in common C libraries, but they support
-// vector input as well as the more traditional scalar input.
-// 
-// Applications should be encouraged to use the built-in functions rather than do the equivalent
-// computations in their own shader code since the built-in functions are assumed to be optimal
-// (e.g., perhaps supported directly in hardware).
-// 
-// User code can replace built-in functions with their own if they choose, by simply re-declaring
-// and defining the same name and argument list.
-// 
-
-// 
-// 8.7 Texture Lookup Functions
-// 
-// Texture lookup functions are available to both vertex and fragment shaders. However, level
-// of detail is not computed by fixed functionality for vertex shaders, so there are some
-// differences in operation between vertex and fragment texture lookups. The functions in the table
-// below provide access to textures through samplers, as set up through the OpenGL API. Texture
-// properties such as size, pixel format, number of dimensions, filtering method, number of mip-map
-// levels, depth comparison, and so on are also defined by OpenGL API calls. Such properties are
-// taken into account as the texture is accessed via the built-in functions defined below.
-// 
-// If a non-shadow texture call is made to a sampler that represents a depth texture with depth
-// comparisons turned on, then results are undefined. If a shadow texture call is made to a sampler
-// that represents a depth texture with depth comparisions turned off, the results are undefined.
-// If a shadow texture call is made to a sampler that does not represent a depth texture, then
-// results are undefined.
-// 
-// In all functions below, the bias parameter is optional for fragment shaders. The bias parameter
-// is not accepted in a vertex shader. For a fragment shader, if bias is present, it is added to
-// the calculated level of detail prior to performing the texture access operation. If the bias
-// parameter is not provided, then the implementation automatically selects level of detail:
-// For a texture that is not mip-mapped, the texture is used directly. If it is mip-mapped and
-// running in a fragment shader, the LOD computed by the implementation is used to do the texture
-// lookup. If it is mip-mapped and running on the vertex shader, then the base texture is used.
-// 
-// The built-ins suffixed with "Lod" are allowed only in a vertex shader. For the "Lod" functions,
-// lod is directly used as the level of detail.
-// 
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the 1D texture currently bound
-// to sampler. For the projective ("Proj") versions, the texture coordinate coord.s is divided by
-// the last component of coord.
-// 
-// XXX
-vec4 texture1D (sampler1D sampler, float coord, float bias) {
-    return vec4 (0.0);
-}
-vec4 texture1DProj (sampler1D sampler, vec2 coord, float bias) {
-    return texture1D (sampler, coord.s / coord.t, bias);
-}
-vec4 texture1DProj (sampler1D sampler, vec4 coord, float bias) {
-    return texture1D (sampler, coord.s / coord.q, bias);
-}
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the 2D texture currently bound
-// to sampler. For the projective ("Proj") versions, the texture coordinate (coord.s, coord.t) is
-// divided by the last component of coord. The third component of coord is ignored for the vec4
-// coord variant.
-// 
-// XXX
-vec4 texture2D (sampler2D sampler, vec2 coord, float bias) {
-    return vec4 (0.0);
-}
-vec4 texture2DProj (sampler2D sampler, vec3 coord, float bias) {
-    return texture2D (sampler, vec2 (coord.s / coord.p, coord.t / coord.p), bias);
-}
-vec4 texture2DProj (sampler2D sampler, vec4 coord, float bias) {
-    return texture2D (sampler, vec2 (coord.s / coord.q, coord.s / coord.q), bias);
-}
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the 3D texture currently bound
-// to sampler. For the projective ("Proj") versions, the texture coordinate is divided by coord.q.
-// 
-// XXX
-vec4 texture3D (sampler3D sampler, vec3 coord, float bias) {
-    return vec4 (0.0);
-}   
-vec4 texture3DProj (sampler3D sampler, vec4 coord, float bias) {
-    return texture3DProj (sampler, vec3 (coord.s / coord.q, coord.t / coord.q, coord.p / coord.q),
-        bias);
-}
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the cube map texture currently bound
-// to sampler. The direction of coord is used to select which face to do a 2-dimensional texture
-// lookup in, as described in section 3.8.6 in version 1.4 of the OpenGL specification.
-// 
-// XXX
-vec4 textureCube (samplerCube sampler, vec3 coord, float bias) {
-    return vec4 (0.0);
-}
-
-// 
-// Use texture coordinate coord to do a depth comparison lookup on the depth texture bound
-// to sampler, as described in section 3.8.14 of version 1.4 of the OpenGL specification. The 3rd
-// component of coord (coord.p) is used as the R value. The texture bound to sampler must be a
-// depth texture, or results are undefined. For the projective ("Proj") version of each built-in,
-// the texture coordinate is divide by coord.q, giving a depth value R of coord.p/coord.q. The
-// second component of coord is ignored for the "1D" variants.
-// 
-// XXX
-vec4 shadow1D (sampler1DShadow sampler, vec3 coord, float bias) {
-    return vec4 (0.0);
-}
-// XXX
-vec4 shadow2D (sampler2DShadow sampler, vec3 coord, float bias) {
-    return vec4 (0.0);
-}
-vec4 shadow1DProj (sampler1DShadow sampler, vec4 coord, float bias) {
-    return shadow1D (sampler, vec3 (coord.s / coord.q, 0.0, coord.p / coord.q), bias);
-}
-vec4 shadow2DProj (sampler2DShadow sampler, vec4 coord, float bias) {
-    return shadow2D (sampler, vec3 (coord.s / coord.q, coord.t / coord.q, coord.p / coord.q), bias);
-}
-
-//
-// 8.8 Fragment Processing Functions
-// 
-// Fragment processing functions are only available in shaders intended for use on the fragment
-// processor. Derivatives may be computationally expensive and/or numerically unstable. Therefore,
-// an OpenGL implementation may approximate the true derivatives by using a fast but not entirely
-// accurate derivative computation.
-// 
-// The expected behavior of a derivative is specified using forward/backward differencing.
-// 
-// Forward differencing:
-// 
-// F(x+dx) - F(x) ~ dFdx(x) * dx            1a
-// dFdx(x) ~ (F(x+dx) - F(x)) / dx          1b
-// 
-// Backward differencing:
-// 
-// F(x-dx) - F(x) ~ -dFdx(x) * dx           2a
-// dFdx(x) ~ (F(x) - F(x-dx)) / dx          2b
-// 
-// With single-sample rasterization, dx <= 1.0 in equations 1b and 2b. For multi-sample
-// rasterization, dx < 2.0 in equations 1b and 2b.
-// 
-// dFdy is approximated similarly, with y replacing x.
-// 
-// A GL implementation may use the above or other methods to perform the calculation, subject
-// to the following conditions:
-// 
-// 1) The method may use piecewise linear approximations. Such linear approximations imply that
-//    higher order derivatives, dFdx(dFdx(x)) and above, are undefined.
-// 
-// 2) The method may assume that the function evaluated is continuous. Therefore derivatives within
-//    the body of a non-uniform conditional are undefined.
-// 
-// 3) The method may differ per fragment, subject to the constraint that the method may vary by
-//    window coordinates, not screen coordinates. The invariance requirement described in section
-//    3.1 of the OpenGL 1.4 specification is relaxed for derivative calculations, because
-//    the method may be a function of fragment location.
-// 
-// Other properties that are desirable, but not required, are:
-// 
-// 4) Functions should be evaluated within the interior of a primitive (interpolated, not
-//    extrapolated).
-// 
-// 5) Functions for dFdx should be evaluated while holding y constant. Functions for dFdy should
-//    be evaluated while holding x constant. However, mixed higher order derivatives, like
-//    dFdx(dFdy(y)) and dFdy(dFdx(x)) are undefined.
-// 
-// In some implementations, varying degrees of derivative accuracy may be obtained by providing
-// GL hints (section 5.6 of the OpenGL 1.4 specification), allowing a user to make an image
-// quality versus speed tradeoff.
-// 
-
-// 
-// Returns the derivative in x using local differencing for the input argument p.
-// 
-// XXX
-float dFdx (float p) {
-    return 0.0;
-}
-// XXX
-vec2 dFdx (vec2 p) {
-    return vec2 (0.0);
-}
-// XXX
-vec3 dFdx (vec3 p) {
-    return vec3 (0.0);
-}
-// XXX
-vec4 dFdx (vec4 p) {
-    return vec4 (0.0);
-}
-
-// 
-// Returns the derivative in y using local differencing for the input argument p.
-// 
-// These two functions are commonly used to estimate the filter width used to anti-alias procedural
-// textures.We are assuming that the expression is being evaluated in parallel on a SIMD array so
-// that at any given point in time the value of the function is known at the grid points
-// represented by the SIMD array. Local differencing between SIMD array elements can therefore
-// be used to derive dFdx, dFdy, etc.
-// 
-// XXX
-float dFdy (float p) {
-    return 0.0;
-}
-// XXX
-vec2 dFdy (vec2 p) {
-    return vec2 (0.0);
-}
-// XXX
-vec3 dFdy (vec3 p) {
-    return vec3 (0.0);
-}
-// XXX
-vec4 dFdy (vec4 p) {
-    return vec4 (0.0);
-}
-
-// 
-// Returns the sum of the absolute derivative in x and y using local differencing for the input
-// argument p, i.e.:
-// 
-// return = abs (dFdx (p)) + abs (dFdy (p));
-// 
-
-float fwidth (float p) {
-    return abs (dFdx (p)) + abs (dFdy (p));
-}
-vec2 fwidth (vec2 p) {
-    return abs (dFdx (p)) + abs (dFdy (p));
-}
-vec3 fwidth (vec3 p) {
-    return abs (dFdx (p)) + abs (dFdy (p));
-}
-vec4 fwidth (vec4 p) {
-    return abs (dFdx (p)) + abs (dFdy (p));
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader.syn b/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader.syn
deleted file mode 100644
index 65d7fe353..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader.syn
+++ /dev/null
@@ -1,1508 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.2
- *
- * Copyright (C) 2004-2005  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * \file slang_shader.syn
- * slang vertex/fragment shader syntax
- * \author Michal Krol
- */
-
-/*
- * usage:
- *   syn2c slang_shader.syn > slang_shader_syn.h
- *
- * when modifying or extending this file, several things must be taken into consideration:
- * - when adding new operators that were marked as reserved in the initial specification,
- *   one must only uncomment particular lines of code that refer to operators being added;
- * - when adding new shader target, one must reserve new value for shader_type register and
- *   use it in .if constructs for symbols that are exclusive for that shader;
- * - some symbols mimic output of other symbols - the best example is the "for" construct:
- *   expression "for (foo(); ; bar())" is seen as "for (foo(); true; bar())" by the output
- *   processor - hence, special care must be taken when rearranging output of essential symbols;
- * - order of single-quoted tokens does matter in alternatives - so do not parse "<" operator
- *   before "<<" and "<<" before "<<=";
- * - all double-quoted tokens are internally preprocessed to eliminate problems with parsing
- *   strings that are prefixes of other strings, like "sampler1D" and "sampler1DShadow";
- */
-
-.syntax translation_unit;
-
-/* revision number - increment after each change affecting emitted output */
-.emtcode REVISION                                   2
-
-/* external declaration */
-.emtcode EXTERNAL_NULL                              0
-.emtcode EXTERNAL_FUNCTION_DEFINITION               1
-.emtcode EXTERNAL_DECLARATION                       2
-
-/* declaration */
-.emtcode DECLARATION_FUNCTION_PROTOTYPE             1
-.emtcode DECLARATION_INIT_DECLARATOR_LIST           2
-
-/* function type */
-.emtcode FUNCTION_ORDINARY                          0
-.emtcode FUNCTION_CONSTRUCTOR                       1
-.emtcode FUNCTION_OPERATOR                          2
-
-/* operator type */
-.emtcode OPERATOR_ASSIGN                            1
-.emtcode OPERATOR_ADDASSIGN                         2
-.emtcode OPERATOR_SUBASSIGN                         3
-.emtcode OPERATOR_MULASSIGN                         4
-.emtcode OPERATOR_DIVASSIGN                         5
-/*.emtcode OPERATOR_MODASSIGN                         6*/
-/*.emtcode OPERATOR_LSHASSIGN                         7*/
-/*.emtcode OPERATOR_RSHASSIGN                         8*/
-/*.emtcode OPERATOR_ORASSIGN                          9*/
-/*.emtcode OPERATOR_XORASSIGN                         10*/
-/*.emtcode OPERATOR_ANDASSIGN                         11*/
-.emtcode OPERATOR_LOGICALXOR                        12
-/*.emtcode OPERATOR_BITOR                             13*/
-/*.emtcode OPERATOR_BITXOR                            14*/
-/*.emtcode OPERATOR_BITAND                            15*/
-.emtcode OPERATOR_EQUAL                             16
-.emtcode OPERATOR_NOTEQUAL                          17
-.emtcode OPERATOR_LESS                              18
-.emtcode OPERATOR_GREATER                           19
-.emtcode OPERATOR_LESSEQUAL                         20
-.emtcode OPERATOR_GREATEREQUAL                      21
-/*.emtcode OPERATOR_LSHIFT                            22*/
-/*.emtcode OPERATOR_RSHIFT                            23*/
-.emtcode OPERATOR_MULTIPLY                          24
-.emtcode OPERATOR_DIVIDE                            25
-/*.emtcode OPERATOR_MODULUS                           26*/
-.emtcode OPERATOR_INCREMENT                         27
-.emtcode OPERATOR_DECREMENT                         28
-.emtcode OPERATOR_PLUS                              29
-.emtcode OPERATOR_MINUS                             30
-/*.emtcode OPERATOR_COMPLEMENT                        31*/
-.emtcode OPERATOR_NOT                               32
-
-/* init declarator list */
-.emtcode DECLARATOR_NONE                            0
-.emtcode DECLARATOR_NEXT                            1
-
-/* variable declaration */
-.emtcode VARIABLE_NONE                              0
-.emtcode VARIABLE_IDENTIFIER                        1
-.emtcode VARIABLE_INITIALIZER                       2
-.emtcode VARIABLE_ARRAY_EXPLICIT                    3
-.emtcode VARIABLE_ARRAY_UNKNOWN                     4
-
-/* type qualifier */
-.emtcode TYPE_QUALIFIER_NONE                        0
-.emtcode TYPE_QUALIFIER_CONST                       1
-.emtcode TYPE_QUALIFIER_ATTRIBUTE                   2
-.emtcode TYPE_QUALIFIER_VARYING                     3
-.emtcode TYPE_QUALIFIER_UNIFORM                     4
-.emtcode TYPE_QUALIFIER_FIXEDOUTPUT                 5
-.emtcode TYPE_QUALIFIER_FIXEDINPUT                  6
-
-/* type specifier */
-.emtcode TYPE_SPECIFIER_VOID                        0
-.emtcode TYPE_SPECIFIER_BOOL                        1
-.emtcode TYPE_SPECIFIER_BVEC2                       2
-.emtcode TYPE_SPECIFIER_BVEC3                       3
-.emtcode TYPE_SPECIFIER_BVEC4                       4
-.emtcode TYPE_SPECIFIER_INT                         5
-.emtcode TYPE_SPECIFIER_IVEC2                       6
-.emtcode TYPE_SPECIFIER_IVEC3                       7
-.emtcode TYPE_SPECIFIER_IVEC4                       8
-.emtcode TYPE_SPECIFIER_FLOAT                       9
-.emtcode TYPE_SPECIFIER_VEC2                        10
-.emtcode TYPE_SPECIFIER_VEC3                        11
-.emtcode TYPE_SPECIFIER_VEC4                        12
-.emtcode TYPE_SPECIFIER_MAT2                        13
-.emtcode TYPE_SPECIFIER_MAT3                        14
-.emtcode TYPE_SPECIFIER_MAT4                        15
-.emtcode TYPE_SPECIFIER_SAMPLER1D                   16
-.emtcode TYPE_SPECIFIER_SAMPLER2D                   17
-.emtcode TYPE_SPECIFIER_SAMPLER3D                   18
-.emtcode TYPE_SPECIFIER_SAMPLERCUBE                 19
-.emtcode TYPE_SPECIFIER_SAMPLER1DSHADOW             20
-.emtcode TYPE_SPECIFIER_SAMPLER2DSHADOW             21
-.emtcode TYPE_SPECIFIER_STRUCT                      22
-.emtcode TYPE_SPECIFIER_TYPENAME                    23
-
-/* structure field */
-.emtcode FIELD_NONE                                 0
-.emtcode FIELD_NEXT                                 1
-.emtcode FIELD_ARRAY                                2
-
-/* operation */
-.emtcode OP_END                                     0
-.emtcode OP_BLOCK_BEGIN_NO_NEW_SCOPE                1
-.emtcode OP_BLOCK_BEGIN_NEW_SCOPE                   2
-.emtcode OP_DECLARE                                 3
-.emtcode OP_ASM                                     4
-.emtcode OP_BREAK                                   5
-.emtcode OP_CONTINUE                                6
-.emtcode OP_DISCARD                                 7
-.emtcode OP_RETURN                                  8
-.emtcode OP_EXPRESSION                              9
-.emtcode OP_IF                                      10
-.emtcode OP_WHILE                                   11
-.emtcode OP_DO                                      12
-.emtcode OP_FOR                                     13
-.emtcode OP_PUSH_VOID                               14
-.emtcode OP_PUSH_BOOL                               15
-.emtcode OP_PUSH_INT                                16
-.emtcode OP_PUSH_FLOAT                              17
-.emtcode OP_PUSH_IDENTIFIER                         18
-.emtcode OP_SEQUENCE                                19
-.emtcode OP_ASSIGN                                  20
-.emtcode OP_ADDASSIGN                               21
-.emtcode OP_SUBASSIGN                               22
-.emtcode OP_MULASSIGN                               23
-.emtcode OP_DIVASSIGN                               24
-/*.emtcode OP_MODASSIGN                               25*/
-/*.emtcode OP_LSHASSIGN                               26*/
-/*.emtcode OP_RSHASSIGN                               27*/
-/*.emtcode OP_ORASSIGN                                28*/
-/*.emtcode OP_XORASSIGN                               29*/
-/*.emtcode OP_ANDASSIGN                               30*/
-.emtcode OP_SELECT                                  31
-.emtcode OP_LOGICALOR                               32
-.emtcode OP_LOGICALXOR                              33
-.emtcode OP_LOGICALAND                              34
-/*.emtcode OP_BITOR                                   35*/
-/*.emtcode OP_BITXOR                                  36*/
-/*.emtcode OP_BITAND                                  37*/
-.emtcode OP_EQUAL                                   38
-.emtcode OP_NOTEQUAL                                39
-.emtcode OP_LESS                                    40
-.emtcode OP_GREATER                                 41
-.emtcode OP_LESSEQUAL                               42
-.emtcode OP_GREATEREQUAL                            43
-/*.emtcode OP_LSHIFT                                  44*/
-/*.emtcode OP_RSHIFT                                  45*/
-.emtcode OP_ADD                                     46
-.emtcode OP_SUBTRACT                                47
-.emtcode OP_MULTIPLY                                48
-.emtcode OP_DIVIDE                                  49
-/*.emtcode OP_MODULUS                                 50*/
-.emtcode OP_PREINCREMENT                            51
-.emtcode OP_PREDECREMENT                            52
-.emtcode OP_PLUS                                    53
-.emtcode OP_MINUS                                   54
-/*.emtcode OP_COMPLEMENT                              55*/
-.emtcode OP_NOT                                     56
-.emtcode OP_SUBSCRIPT                               57
-.emtcode OP_CALL                                    58
-.emtcode OP_FIELD                                   59
-.emtcode OP_POSTINCREMENT                           60
-.emtcode OP_POSTDECREMENT                           61
-
-/* parameter qualifier */
-.emtcode PARAM_QUALIFIER_IN                         0
-.emtcode PARAM_QUALIFIER_OUT                        1
-.emtcode PARAM_QUALIFIER_INOUT                      2
-
-/* function parameter */
-.emtcode PARAMETER_NONE                             0
-.emtcode PARAMETER_NEXT                             1
-
-/* function parameter array presence */
-.emtcode PARAMETER_ARRAY_NOT_PRESENT                0
-.emtcode PARAMETER_ARRAY_PRESENT                    1
-
-.errtext INVALID_EXTERNAL_DECLARATION               "error 2001: invalid external declaration"
-.errtext INVALID_OPERATOR_OVERRIDE                  "error 2002: invalid operator override"
-.errtext LBRACE_EXPECTED                            "error 2003: '{' expected but '$err_token$' found"
-.errtext LPAREN_EXPECTED                            "error 2004: '(' expected but '$err_token$' found"
-.errtext RPAREN_EXPECTED                            "error 2005: ')' expected but '$err_token$' found"
-
-/* tells whether the shader that is being parsed is a built-in shader or not */
-/*   0 - normal behaviour */
-/*   1 - accepts constructor and operator definitions and __asm statements */
-/* the implementation will set it to 1 when compiling internal built-in shaders */
-.regbyte parsing_builtin                            0
-
-/* holds the type of the shader being parsed; possible values are listed below */
-/*   FRAGMENT_SHADER            1 */
-/*   VERTEX_SHADER              2 */
-/* shader type is set by the caller before parsing */
-.regbyte shader_type                                0
-
-/*
-    <variable_identifier>               ::= <identifier>
-*/
-variable_identifier
-    identifier .emit OP_PUSH_IDENTIFIER;
-
-/*
-    <primary_expression>                ::= <variable_identifier>
-                                          | <intconstant>
-                                          | <floatconstant>
-                                          | <boolconstant>
-                                          | "(" <expression> ")"
-*/
-primary_expression
-    floatconstant .or boolconstant .or intconstant .or variable_identifier .or primary_expression_1;
-primary_expression_1
-    lparen .and expression .and rparen;
-
-/*
-    <postfix_expression>                ::= <primary_expression>
-                                          | <postfix_expression> "[" <integer_expression> "]"
-                                          | <function_call>
-                                          | <postfix_expression> "." <field_selection>
-                                          | <postfix_expression> "++"
-                                          | <postfix_expression> "--"
-*/
-postfix_expression
-    postfix_expression_1 .and .loop postfix_expression_2;
-postfix_expression_1
-    function_call .or primary_expression;
-postfix_expression_2
-    postfix_expression_3 .or postfix_expression_4 .or
-    plusplus .emit OP_POSTINCREMENT .or
-    minusminus .emit OP_POSTDECREMENT;
-postfix_expression_3
-    lbracket .and integer_expression .and rbracket .emit OP_SUBSCRIPT;
-postfix_expression_4
-    dot .and field_selection .emit OP_FIELD;
-
-/*
-    <integer_expression>                ::= <expression>
-*/
-integer_expression
-    expression;
-
-/*
-    <function_call>                     ::= <function_call_generic>
-*/
-function_call
-    function_call_generic .emit OP_CALL .and .true .emit OP_END;
-
-/*
-    <function_call_generic>             ::= <function_call_header_with_parameters> ")"
-                                          | <function_call_header_no_parameters> ")"
-*/
-function_call_generic
-    function_call_generic_1 .or function_call_generic_2;
-function_call_generic_1
-    function_call_header_with_parameters .and rparen .error RPAREN_EXPECTED;
-function_call_generic_2
-    function_call_header_no_parameters .and rparen .error RPAREN_EXPECTED;
-
-/*
-    <function_call_header_no_parameters>::= <function_call_header> "void"
-                                          | <function_call_header>
-*/
-function_call_header_no_parameters
-    function_call_header .and function_call_header_no_parameters_1;
-function_call_header_no_parameters_1
-    "void" .or .true;
-
-/*
-    <function_call_header_with_parameters>::= <function_call_header> <assignment_expression>
-                                            | <function_call_header_with_parameters> ","
-                                              <assignment_expression>
-*/
-function_call_header_with_parameters
-    function_call_header .and assignment_expression .and .true .emit OP_END .and
-    .loop function_call_header_with_parameters_1;
-function_call_header_with_parameters_1
-    comma .and assignment_expression .and .true .emit OP_END;
-
-/*
-    <function_call_header>              ::= <function_identifier> "("
-*/
-function_call_header
-    function_identifier .and lparen;
-
-/*
-    <function_identifier>               ::= <constructor_identifier>
-                                          | <identifier>
-
-note: <constructor_identifier> has been deleted
-*/
-function_identifier
-    identifier;
-
-/*
-    <unary_expression>                  ::= <postfix_expression>
-                                          | "++" <unary_expression>
-                                          | "--" <unary_expression>
-                                          | <unary_operator> <unary_expression>
-
-    <unary_operator>                    ::= "+"
-                                          | "-"
-                                          | "!"
-                                          | "~" // reserved
-*/
-unary_expression
-    postfix_expression .or unary_expression_1 .or unary_expression_2 .or unary_expression_3 .or
-    unary_expression_4 .or unary_expression_5/* .or unary_expression_6*/;
-unary_expression_1
-    plusplus .and unary_expression .and .true .emit OP_PREINCREMENT;
-unary_expression_2
-    minusminus .and unary_expression .and .true .emit OP_PREDECREMENT;
-unary_expression_3
-    plus .and unary_expression .and .true .emit OP_PLUS;
-unary_expression_4
-    minus .and unary_expression .and .true .emit OP_MINUS;
-unary_expression_5
-    bang .and unary_expression .and .true .emit OP_NOT;
-/*unary_expression_6
-    tilde .and unary_expression .and .true .emit OP_COMPLEMENT;*/
-
-/*
-    <multiplicative_expression>         ::= <unary_expression>
-                                          | <multiplicative_expression> "*" <unary_expression>
-                                          | <multiplicative_expression> "/" <unary_expression>
-                                          | <multiplicative_expression> "%" <unary_expression> // reserved
-*/
-multiplicative_expression
-    unary_expression .and .loop multiplicative_expression_1;
-multiplicative_expression_1
-    multiplicative_expression_2 .or multiplicative_expression_3/* .or multiplicative_expression_4*/;
-multiplicative_expression_2
-    star .and unary_expression .and .true .emit OP_MULTIPLY;
-multiplicative_expression_3
-    slash .and unary_expression .and .true .emit OP_DIVIDE;
-/*multiplicative_expression_4
-    percent .and unary_expression .and .true .emit OP_MODULUS;*/
-
-/*
-    <additive_expression>               ::= <multiplicative_expression>
-                                          | <additive_expression> "+" <multiplicative_expression>
-                                          | <additive_expression> "-" <multiplicative_expression>
-*/
-additive_expression
-    multiplicative_expression .and .loop additive_expression_1;
-additive_expression_1
-    additive_expression_2 .or additive_expression_3;
-additive_expression_2
-    plus .and multiplicative_expression .and .true .emit OP_ADD;
-additive_expression_3
-    minus .and multiplicative_expression .and .true .emit OP_SUBTRACT;
-
-/*
-    <shift_expression>                  ::= <additive_expression>
-                                          | <shift_expression> "<<" <additive_expression> // reserved
-                                          | <shift_expression> ">>" <additive_expression> // reserved
-*/
-shift_expression
-    additive_expression/* .and .loop shift_expression_1*/;
-/*shift_expression_1
-    shift_expression_2 .or shift_expression_3;*/
-/*shift_expression_2
-    lessless .and additive_expression .and .true .emit OP_LSHIFT;*/
-/*shift_expression_3
-    greatergreater .and additive_expression .and .true .emit OP_RSHIFT;*/
-
-/*
-    <relational_expression>             ::= <shift_expression>
-                                          | <relational_expression> "<" <shift_expression>
-                                          | <relational_expression> ">" <shift_expression>
-                                          | <relational_expression> "<=" <shift_expression>
-                                          | <relational_expression> ">=" <shift_expression>
-*/
-relational_expression
-    shift_expression .and .loop relational_expression_1;
-relational_expression_1
-    relational_expression_2 .or relational_expression_3 .or relational_expression_4 .or
-    relational_expression_5;
-relational_expression_2
-    lessequals .and shift_expression .and .true .emit OP_LESSEQUAL;
-relational_expression_3
-    greaterequals .and shift_expression .and .true .emit OP_GREATEREQUAL;
-relational_expression_4
-    less .and shift_expression .and .true .emit OP_LESS;
-relational_expression_5
-    greater .and shift_expression .and .true .emit OP_GREATER;
-
-/*
-    <equality_expression>               ::= <relational_expression>
-                                          | <equality_expression> "==" <relational_expression>
-                                          | <equality_expression> "!=" <relational_expression>
-*/
-equality_expression
-    relational_expression .and .loop equality_expression_1;
-equality_expression_1
-    equality_expression_2 .or equality_expression_3;
-equality_expression_2
-    equalsequals .and relational_expression .and .true .emit OP_EQUAL;
-equality_expression_3
-    bangequals .and relational_expression .and .true .emit OP_NOTEQUAL;
-
-/*
-    <and_expression>                    ::= <equality_expression>
-                                          | <and_expression> "&" <equality_expression> // reserved
-*/
-and_expression
-    equality_expression/* .and .loop and_expression_1*/;
-/*and_expression_1
-    ampersand .and equality_expression .and .true .emit OP_BITAND;*/
-
-/*
-    <exclusive_or_expression>           ::= <and_expression>
-                                          | <exclusive_or_expression> "^" <and_expression> // reserved
-*/
-exclusive_or_expression
-    and_expression/* .and .loop exclusive_or_expression_1*/;
-/*exclusive_or_expression_1
-    caret .and and_expression .and .true .emit OP_BITXOR;*/
-
-/*
-    <inclusive_or_expression>           ::= <exclusive_or_expression>
-                                          | <inclusive_or_expression> "|" <exclusive_or_expression> // reserved
-*/
-inclusive_or_expression
-    exclusive_or_expression/* .and .loop inclusive_or_expression_1*/;
-/*inclusive_or_expression_1
-    bar .and exclusive_or_expression .and .true .emit OP_BITOR;*/
-
-/*
-    <logical_and_expression>            ::= <inclusive_or_expression>
-                                          | <logical_and_expression> "&&" <inclusive_or_expression>
-*/
-logical_and_expression
-    inclusive_or_expression .and .loop logical_and_expression_1;
-logical_and_expression_1
-    ampersandampersand .and inclusive_or_expression .and .true .emit OP_LOGICALAND;
-
-/*
-    <logical_xor_expression>            ::= <logical_and_expression>
-                                          | <logical_xor_expression> "^^" <logical_and_expression>
-*/
-logical_xor_expression
-    logical_and_expression .and .loop logical_xor_expression_1;
-logical_xor_expression_1
-    caretcaret .and logical_and_expression .and .true .emit OP_LOGICALXOR;
-
-/*
-    <logical_or_expression>             ::= <logical_xor_expression>
-                                          | <logical_or_expression> "||" <logical_xor_expression>
-*/
-logical_or_expression
-    logical_xor_expression .and .loop logical_or_expression_1;
-logical_or_expression_1
-    barbar .and logical_xor_expression .and .true .emit OP_LOGICALOR;
-
-/*
-    <conditional_expression>            ::= <logical_or_expression>
-                                          | <logical_or_expression> "?" <expression> ":"
-                                            <conditional_expression>
-*/
-conditional_expression
-    logical_or_expression .and .loop conditional_expression_1;
-conditional_expression_1
-    question .and expression .and colon .and conditional_expression .and .true .emit OP_SELECT;
-
-/*
-    <assignment_expression>             ::= <conditional_expression>
-                                          | <unary_expression> <assignment_operator>
-                                            <assignment_expression>
-
-    <assignment_operator>               ::= "="
-                                          | "*="
-                                          | "/="
-                                          | "+="
-                                          | "-="
-                                          | "%=" // reserved
-                                          | "<<=" // reserved
-                                          | ">>=" // reserved
-                                          | "&=" // reserved
-                                          | "^=" // reserved
-                                          | "|=" // reserved
-*/
-assignment_expression
-    assignment_expression_1 .or assignment_expression_2 .or assignment_expression_3 .or
-    assignment_expression_4 .or assignment_expression_5/* .or assignment_expression_6 .or
-    assignment_expression_7 .or assignment_expression_8 .or assignment_expression_9 .or
-    assignment_expression_10 .or assignment_expression_11*/ .or conditional_expression;
-assignment_expression_1
-    unary_expression .and equals .and assignment_expression .and .true .emit OP_ASSIGN;
-assignment_expression_2
-    unary_expression .and starequals .and assignment_expression .and .true .emit OP_MULASSIGN;
-assignment_expression_3
-    unary_expression .and slashequals .and assignment_expression .and .true .emit OP_DIVASSIGN;
-assignment_expression_4
-    unary_expression .and plusequals .and assignment_expression .and .true .emit OP_ADDASSIGN;
-assignment_expression_5
-    unary_expression .and minusequals .and assignment_expression .and .true .emit OP_SUBASSIGN;
-/*assignment_expression_6
-    unary_expression .and percentequals .and assignment_expression .and .true .emit OP_MODASSIGN;*/
-/*assignment_expression_7
-    unary_expression .and lesslessequals .and assignment_expression .and .true .emit OP_LSHASSIGN;*/
-/*assignment_expression_8
-    unary_expression .and greatergreaterequals .and assignment_expression .and
-    .true .emit OP_RSHASSIGN;*/
-/*assignment_expression_9
-    unary_expression .and ampersandequals .and assignment_expression .and .true .emit OP_ANDASSIGN;*/
-/*assignment_expression_10
-    unary_expression .and caretequals .and assignment_expression .and .true .emit OP_XORASSIGN;*/
-/*assignment_expression_11
-    unary_expression .and barequals .and assignment_expression .and .true .emit OP_ORASSIGN;*/
-
-/*
-    <expression>                        ::= <assignment_expression>
-                                          | <expression> "," <assignment_expression>
-*/
-expression
-    assignment_expression .and .loop expression_1;
-expression_1
-    comma .and assignment_expression .and .true .emit OP_SEQUENCE;
-
-/*
-    <constant_expression>               ::= <conditional_expression>
-*/
-constant_expression
-    conditional_expression .and .true .emit OP_END;
-
-/*
-    <declaration>                       ::= <function_prototype> ";"
-                                          | <init_declarator_list> ";"
-*/
-declaration
-    declaration_1 .or declaration_2;
-declaration_1
-    function_prototype .emit DECLARATION_FUNCTION_PROTOTYPE .and semicolon;
-declaration_2
-    init_declarator_list .emit DECLARATION_INIT_DECLARATOR_LIST .and semicolon;
-
-/*
-    <function_prototype>                ::= <function_declarator> ")"
-*/
-function_prototype
-    function_declarator .and rparen .error RPAREN_EXPECTED .emit PARAMETER_NONE;
-
-/*
-    <function_declarator>               ::= <function_header>
-                                          | <function_header_with_parameters>
-*/
-function_declarator
-    function_header_with_parameters .or function_header;
-
-/*
-    <function_header_with_parameters>   ::= <function_header> <parameter_declaration>
-                                          | <function_header_with_parameters> ","
-                                            <parameter_declaration>
-*/
-function_header_with_parameters
-    function_header .and parameter_declaration .and .loop function_header_with_parameters_1;
-function_header_with_parameters_1
-    comma .and parameter_declaration;
-
-/*
-    <function_header>                   ::= <fully_specified_type> <identifier> "("
-*/
-function_header
-    function_header_nospace .or function_header_space;
-function_header_space
-    fully_specified_type_space .and space .and function_decl_identifier .and lparen;
-function_header_nospace
-    fully_specified_type_nospace .and function_decl_identifier .and lparen;
-
-/*
-    <function_decl_identifier>          ::= "__constructor"
-                                          | <__operator>
-                                          | <identifier>
-
-note: this is an extension to the standard language specification - normally slang disallows
-      operator and constructor prototypes and definitions
-*/
-function_decl_identifier
-    .if (parsing_builtin != 0) __operator .emit FUNCTION_OPERATOR .or
-    .if (parsing_builtin != 0) "__constructor" .emit FUNCTION_CONSTRUCTOR .or
-    identifier .emit FUNCTION_ORDINARY;
-
-/*
-    <__operator>                        ::= "__operator" <overriden_op>
-
-note: this is an extension to the standard language specification - normally slang disallows
-      operator prototypes and definitions
-*/
-__operator
-    "__operator" .and overriden_operator .error INVALID_OPERATOR_OVERRIDE;
-
-/*
-    <overriden_op>                      ::= "="
-                                          | "+="
-                                          | "-="
-                                          | "*="
-                                          | "/="
-                                          | "%=" // reserved
-                                          | "<<=" // reserved
-                                          | ">>=" // reserved
-                                          | "&=" // reserved
-                                          | "^=" // reserved
-                                          | "|=" // reserved
-                                          | "^^"
-                                          | "|" // reserved
-                                          | "^" // reserved
-                                          | "&" // reserved
-                                          | "=="
-                                          | "!="
-                                          | "<"
-                                          | ">"
-                                          | "<="
-                                          | ">="
-                                          | "<<" // reserved
-                                          | ">>" // reserved
-                                          | "*"
-                                          | "/"
-                                          | "%" // reserved
-                                          | "++"
-                                          | "--"
-                                          | "+"
-                                          | "-"
-                                          | "~" // reserved
-                                          | "!"
-
-note: this is an extension to the standard language specification - normally slang disallows
-      operator prototypes and definitions
-*/
-overriden_operator
-    plusplus .emit OPERATOR_INCREMENT .or
-    plusequals .emit OPERATOR_ADDASSIGN .or
-    plus .emit OPERATOR_PLUS .or
-    minusminus .emit OPERATOR_DECREMENT .or
-    minusequals .emit OPERATOR_SUBASSIGN .or
-    minus .emit OPERATOR_MINUS .or
-    bangequals .emit OPERATOR_NOTEQUAL .or
-    bang .emit OPERATOR_NOT .or
-    starequals .emit OPERATOR_MULASSIGN .or
-    star .emit OPERATOR_MULTIPLY .or
-    slashequals .emit OPERATOR_DIVASSIGN .or
-    slash .emit OPERATOR_DIVIDE .or
-    lessequals .emit OPERATOR_LESSEQUAL .or
-    /*lesslessequals .emit OPERATOR_LSHASSIGN .or*/
-    /*lessless .emit OPERATOR_LSHIFT .or*/
-    less .emit OPERATOR_LESS .or
-    greaterequals .emit OPERATOR_GREATEREQUAL .or
-    /*greatergreaterequals .emit OPERATOR_RSHASSIGN .or*/
-    /*greatergreater .emit OPERATOR_RSHIFT .or*/
-    greater .emit OPERATOR_GREATER .or
-    equalsequals .emit OPERATOR_EQUAL .or
-    equals .emit OPERATOR_ASSIGN .or
-    /*percentequals .emit OPERATOR_MODASSIGN .or*/
-    /*percent .emit OPERATOR_MODULUS .or*/
-    /*ampersandequals .emit OPERATOR_ANDASSIGN */
-    /*ampersand .emit OPERATOR_BITAND .or*/
-    /*barequals .emit OPERATOR_ORASSIGN .or*/
-    /*bar .emit OPERATOR_BITOR .or*/
-    /*tilde .emit OPERATOR_COMPLEMENT .or*/
-    /*caretequals .emit OPERATOR_XORASSIGN .or*/
-    caretcaret .emit OPERATOR_LOGICALXOR /*.or
-    caret .emit OPERATOR_BITXOR*/;
-
-/*
-    <parameter_declarator>              ::= <type_specifier> <identifier>
-                                          | <type_specifier> <identifier> "[" <constant_expression>
-                                            "]"
-*/
-parameter_declarator
-    parameter_declarator_nospace .or parameter_declarator_space;
-parameter_declarator_nospace
-    type_specifier_nospace .and identifier .and parameter_declarator_1;
-parameter_declarator_space
-    type_specifier_space .and space .and identifier .and parameter_declarator_1;
-parameter_declarator_1
-    parameter_declarator_2 .emit PARAMETER_ARRAY_PRESENT .or
-    .true .emit PARAMETER_ARRAY_NOT_PRESENT;
-parameter_declarator_2
-    lbracket .and constant_expression .and rbracket;
-
-/*
-    <parameter_declaration>             ::= <type_qualifier> <parameter_qualifier>
-                                            <parameter_declarator>
-                                          | <type_qualifier> <parameter_qualifier>
-                                            <parameter_type_specifier>
-                                          | <parameter_qualifier> <parameter_declarator>
-                                          | <parameter_qualifier> <parameter_type_specifier>
-*/
-parameter_declaration
-    parameter_declaration_1 .emit PARAMETER_NEXT;
-parameter_declaration_1
-    parameter_declaration_2 .or parameter_declaration_3;
-parameter_declaration_2
-    type_qualifier .and space .and parameter_qualifier .and parameter_declaration_4;
-parameter_declaration_3
-    parameter_qualifier .emit TYPE_QUALIFIER_NONE .and parameter_declaration_4;
-parameter_declaration_4
-    parameter_declarator .or parameter_type_specifier;
-
-/*
-    <parameter_qualifier>               ::= "in"
-                                          | "out"
-                                          | "inout"
-                                          | ""
-*/
-parameter_qualifier
-    parameter_qualifier_1 .or .true .emit PARAM_QUALIFIER_IN;
-parameter_qualifier_1
-    parameter_qualifier_2 .and space;
-parameter_qualifier_2
-    "in" .emit PARAM_QUALIFIER_IN .or
-    "out" .emit PARAM_QUALIFIER_OUT .or
-    "inout" .emit PARAM_QUALIFIER_INOUT;
-
-/*
-    <parameter_type_specifier>          ::= <type_specifier>
-                                          | <type_specifier> "[" <constant_expression> "]"
-*/
-parameter_type_specifier
-    parameter_type_specifier_1 .and .true .emit '\0' .and parameter_type_specifier_2;
-parameter_type_specifier_1
-    type_specifier_nospace .or type_specifier_space;
-parameter_type_specifier_2
-    parameter_type_specifier_3 .emit PARAMETER_ARRAY_PRESENT .or
-    .true .emit PARAMETER_ARRAY_NOT_PRESENT;
-parameter_type_specifier_3
-    lbracket .and constant_expression .and rbracket;
-
-/*
-    <init_declarator_list>              ::= <single_declaration>
-                                          | <init_declarator_list> "," <identifier>
-                                          | <init_declarator_list> "," <identifier> "[" "]"
-                                          | <init_declarator_list> "," <identifier> "["
-                                            <constant_expression> "]"
-                                          | <init_declarator_list> "," <identifier> "="
-                                            <initializer>
-*/
-init_declarator_list
-    single_declaration .and .loop init_declarator_list_1 .emit DECLARATOR_NEXT .and
-    .true .emit DECLARATOR_NONE;
-init_declarator_list_1
-    comma .and identifier .emit VARIABLE_IDENTIFIER .and init_declarator_list_2;
-init_declarator_list_2
-    init_declarator_list_3 .or init_declarator_list_4 .or .true .emit VARIABLE_NONE;
-init_declarator_list_3
-    equals .and initializer .emit VARIABLE_INITIALIZER;
-init_declarator_list_4
-    lbracket .and init_declarator_list_5 .and rbracket;
-init_declarator_list_5
-    constant_expression .emit VARIABLE_ARRAY_EXPLICIT .or .true .emit VARIABLE_ARRAY_UNKNOWN;
-
-/*
-    <single_declaration>                ::= <fully_specified_type>
-                                          | <fully_specified_type> <identifier>
-                                          | <fully_specified_type> <identifier> "[" "]"
-                                          | <fully_specified_type> <identifier> "["
-                                            <constant_expression> "]"
-                                          | <fully_specified_type> <identifier> "=" <initializer>
-*/
-single_declaration
-    single_declaration_nospace .or single_declaration_space;
-single_declaration_space
-    fully_specified_type_space .and single_declaration_space_1;
-single_declaration_nospace
-    fully_specified_type_nospace .and single_declaration_nospace_1;
-single_declaration_space_1
-    single_declaration_space_2 .emit VARIABLE_IDENTIFIER .or .true .emit VARIABLE_NONE;
-single_declaration_nospace_1
-    single_declaration_nospace_2 .emit VARIABLE_IDENTIFIER .or .true .emit VARIABLE_NONE;
-single_declaration_space_2
-    space .and identifier .and single_declaration_3;
-single_declaration_nospace_2
-    identifier .and single_declaration_3;
-single_declaration_3
-    single_declaration_4 .or single_declaration_5 .or .true .emit VARIABLE_NONE;
-single_declaration_4
-    equals .and initializer .emit VARIABLE_INITIALIZER;
-single_declaration_5
-    lbracket .and single_declaration_6 .and rbracket;
-single_declaration_6
-    constant_expression .emit VARIABLE_ARRAY_EXPLICIT .or .true .emit VARIABLE_ARRAY_UNKNOWN;
-
-/*
-    <fully_specified_type>              ::= <type_specifier>
-                                          | <type_qualifier> <type_specifier>
-*/
-fully_specified_type_space
-    fully_specified_type_1 .and type_specifier_space;
-fully_specified_type_nospace
-    fully_specified_type_1 .and type_specifier_nospace;
-fully_specified_type_1
-    fully_specified_type_2 .or .true .emit TYPE_QUALIFIER_NONE;
-fully_specified_type_2
-    type_qualifier .and space;
-
-/*
-    <type_qualifier>                    ::= "const"
-                                          | "attribute" // Vertex only.
-                                          | "varying"
-                                          | "uniform"
-										  | "__fixed_output"
-										  | "__fixed_input"
-
-note: this is an extension to the standard language specification - normally slang disallows
-      __fixed_output and __fixed_input type qualifiers
-*/
-type_qualifier
-    "const" .emit TYPE_QUALIFIER_CONST .or
-    .if (shader_type == 2) "attribute" .emit TYPE_QUALIFIER_ATTRIBUTE .or
-    "varying" .emit TYPE_QUALIFIER_VARYING .or
-    "uniform" .emit TYPE_QUALIFIER_UNIFORM .or
-	.if (parsing_builtin != 0) "__fixed_output" .emit TYPE_QUALIFIER_FIXEDOUTPUT .or
-	.if (parsing_builtin != 0) "__fixed_input" .emit TYPE_QUALIFIER_FIXEDINPUT;
-
-/*
-    <type_specifier>                    ::= "void"
-                                          | "float"
-                                          | "int"
-                                          | "bool"
-                                          | "vec2"
-                                          | "vec3"
-                                          | "vec4"
-                                          | "bvec2"
-                                          | "bvec3"
-                                          | "bvec4"
-                                          | "ivec2"
-                                          | "ivec3"
-                                          | "ivec4"
-                                          | "mat2"
-                                          | "mat3"
-                                          | "mat4"
-                                          | "sampler1D"
-                                          | "sampler2D"
-                                          | "sampler3D"
-                                          | "samplerCube"
-                                          | "sampler1DShadow"
-                                          | "sampler2DShadow"
-                                          | <struct_specifier>
-                                          | <type_name>
-*/
-type_specifier_space
-    "void" .emit TYPE_SPECIFIER_VOID .or
-    "float" .emit TYPE_SPECIFIER_FLOAT .or
-    "int" .emit TYPE_SPECIFIER_INT .or
-    "bool" .emit TYPE_SPECIFIER_BOOL .or
-    "vec2" .emit TYPE_SPECIFIER_VEC2 .or
-    "vec3" .emit TYPE_SPECIFIER_VEC3 .or
-    "vec4" .emit TYPE_SPECIFIER_VEC4 .or
-    "bvec2" .emit TYPE_SPECIFIER_BVEC2 .or
-    "bvec3" .emit TYPE_SPECIFIER_BVEC3 .or
-    "bvec4" .emit TYPE_SPECIFIER_BVEC4 .or
-    "ivec2" .emit TYPE_SPECIFIER_IVEC2 .or
-    "ivec3" .emit TYPE_SPECIFIER_IVEC3 .or
-    "ivec4" .emit TYPE_SPECIFIER_IVEC4 .or
-    "mat2" .emit TYPE_SPECIFIER_MAT2 .or
-    "mat3" .emit TYPE_SPECIFIER_MAT3 .or
-    "mat4" .emit TYPE_SPECIFIER_MAT4 .or
-    "sampler1D" .emit TYPE_SPECIFIER_SAMPLER1D .or
-    "sampler2D" .emit TYPE_SPECIFIER_SAMPLER2D .or
-    "sampler3D" .emit TYPE_SPECIFIER_SAMPLER3D .or
-    "samplerCube" .emit TYPE_SPECIFIER_SAMPLERCUBE .or
-    "sampler1DShadow" .emit TYPE_SPECIFIER_SAMPLER1DSHADOW .or
-    "sampler2DShadow" .emit TYPE_SPECIFIER_SAMPLER2DSHADOW .or
-    type_name .emit TYPE_SPECIFIER_TYPENAME;
-type_specifier_nospace
-    struct_specifier .emit TYPE_SPECIFIER_STRUCT;
-
-/*
-    <struct_specifier>                  ::= "struct" <identifier> "{" <struct_declaration_list> "}"
-                                          | "struct" "{" <struct_declaration_list> "}"
-*/
-struct_specifier
-    "struct" .and struct_specifier_1 .and optional_space .and lbrace .error LBRACE_EXPECTED .and
-    struct_declaration_list .and rbrace .emit FIELD_NONE;
-struct_specifier_1
-    struct_specifier_2 .or .true .emit '\0';
-struct_specifier_2
-    space .and identifier;
-
-/*
-    <struct_declaration_list>           ::= <struct_declaration>
-                                          | <struct_declaration_list> <struct_declaration>
-*/
-struct_declaration_list
-    struct_declaration .and .loop struct_declaration .emit FIELD_NEXT;
-
-/*
-    <struct_declaration>                ::= <type_specifier> <struct_declarator_list> ";"
-*/
-struct_declaration
-    struct_declaration_nospace .or struct_declaration_space;
-struct_declaration_space
-    type_specifier_space .and space .and struct_declarator_list .and semicolon .emit FIELD_NONE;
-struct_declaration_nospace
-    type_specifier_nospace .and struct_declarator_list .and semicolon .emit FIELD_NONE;
-
-/*
-    <struct_declarator_list>            ::= <struct_declarator>
-                                          | <struct_declarator_list> "," <struct_declarator>
-*/
-struct_declarator_list
-    struct_declarator .and .loop struct_declarator_list_1 .emit FIELD_NEXT;
-struct_declarator_list_1
-    comma .and struct_declarator;
-
-/*
-    <struct_declarator>                 ::= <identifier>
-                                          | <identifier> "[" <constant_expression> "]"
-*/
-struct_declarator
-    identifier .and struct_declarator_1;
-struct_declarator_1
-    struct_declarator_2 .emit FIELD_ARRAY .or .true .emit FIELD_NONE;
-struct_declarator_2
-    lbracket .and constant_expression .and rbracket;
-
-/*
-    <initializer>                       ::= <assignment_expression>
-*/
-initializer
-    assignment_expression .and .true .emit OP_END;
-
-/*
-    <declaration_statement>             ::= <declaration>
-*/
-declaration_statement
-    declaration;
-
-/*
-    <statement>                         ::= <compound_statement>
-                                          | <simple_statement>
-*/
-statement
-    compound_statement .or simple_statement;
-statement_space
-    compound_statement .or statement_space_1;
-statement_space_1
-    space .and simple_statement;
-
-/*
-    <simple_statement>                  ::= <__asm_statement>
-                                          | <selection_statement>
-                                          | <iteration_statement>
-                                          | <jump_statement>
-                                          | <expression_statement>
-                                          | <declaration_statement>
-
-note: this is an extension to the standard language specification - normally slang disallows
-      use of __asm statements
-*/
-simple_statement
-    .if (parsing_builtin != 0) __asm_statement .emit OP_ASM .or
-    selection_statement .or
-    iteration_statement .or
-    jump_statement .or
-    expression_statement .emit OP_EXPRESSION .or
-    declaration_statement .emit OP_DECLARE;
-
-/*
-    <compound_statement>                ::= "{" "}"
-                                          | "{" <statement_list> "}"
-*/
-compound_statement
-    compound_statement_1 .emit OP_BLOCK_BEGIN_NEW_SCOPE .and .true .emit OP_END;
-compound_statement_1
-    compound_statement_2 .or compound_statement_3;
-compound_statement_2
-    lbrace .and rbrace;
-compound_statement_3
-    lbrace .and statement_list .and rbrace;
-
-/*
-    <statement_no_new_scope>            ::= <compound_statement_no_new_scope>
-                                          | <simple_statement>
-*/
-statement_no_new_scope
-    compound_statement_no_new_scope .or simple_statement;
-
-/*
-    <compound_statement_no_new_scope>   ::= "{" "}"
-                                          | "{" <statement_list> "}"
-*/
-compound_statement_no_new_scope
-    compound_statement_no_new_scope_1 .emit OP_BLOCK_BEGIN_NO_NEW_SCOPE .and .true .emit OP_END;
-compound_statement_no_new_scope_1
-    compound_statement_no_new_scope_2 .or compound_statement_no_new_scope_3;
-compound_statement_no_new_scope_2
-    lbrace .and rbrace;
-compound_statement_no_new_scope_3
-    lbrace .and statement_list .and rbrace;
-
-/*
-    <statement_list>                    ::= <statement>
-                                          | <statement_list> <statement>
-*/
-statement_list
-    statement .and .loop statement;
-
-/*
-    <expression_statement>              ::= ";"
-                                          | <expression> ";"
-*/
-expression_statement
-    expression_statement_1 .or expression_statement_2;
-expression_statement_1
-    semicolon .emit OP_PUSH_VOID .emit OP_END;
-expression_statement_2
-    expression .and semicolon .emit OP_END;
-
-/*
-    <selection_statement>               ::= "if" "(" <expression> ")" <selection_rest_statement>
-*/
-selection_statement
-    "if" .emit OP_IF .and lparen .error LPAREN_EXPECTED .and expression .and
-    rparen .error RPAREN_EXPECTED .emit OP_END .and selection_rest_statement;
-
-/*
-    <selection_rest_statement>          ::= <statement> "else" <statement>
-                                          | <statement>
-*/
-selection_rest_statement
-    statement .and selection_rest_statement_1;
-selection_rest_statement_1
-    selection_rest_statement_2 .or .true .emit OP_EXPRESSION .emit OP_PUSH_VOID .emit OP_END;
-selection_rest_statement_2
-    "else" .and optional_space .and statement;
-
-/*
-    <condition>                         ::= <expression>
-                                          | <fully_specified_type> <identifier> "=" <initializer>
-
-note: if <condition_1> is executed, the emit format must match <declaration> emit format
-*/
-condition
-    condition_1 .emit OP_DECLARE .emit DECLARATION_INIT_DECLARATOR_LIST .or
-    condition_3 .emit OP_EXPRESSION;
-condition_1
-    condition_1_nospace .or condition_1_space;
-condition_1_nospace
-    fully_specified_type_nospace .and condition_2;
-condition_1_space
-    fully_specified_type_space .and space .and condition_2;
-condition_2
-    identifier .emit VARIABLE_IDENTIFIER .and equals .emit VARIABLE_INITIALIZER .and
-    initializer .and .true .emit DECLARATOR_NONE;
-condition_3
-    expression .and .true .emit OP_END;
-
-/*
-    <iteration_statement>               ::= "while" "(" <condition> ")" <statement_no_new_scope>
-                                          | "do" <statement> "while" "(" <expression> ")" ";"
-                                          | "for" "(" <for_init_statement> <for_rest_statement> ")"
-                                            <statement_no_new_scope>
-*/
-iteration_statement
-    iteration_statement_1 .or iteration_statement_2 .or iteration_statement_3;
-iteration_statement_1
-    "while" .emit OP_WHILE .and lparen .error LPAREN_EXPECTED .and condition .and
-    rparen .error RPAREN_EXPECTED .and statement_no_new_scope;
-iteration_statement_2
-    "do" .emit OP_DO .and statement_space .and "while" .and lparen .error LPAREN_EXPECTED .and
-    expression .and rparen .error RPAREN_EXPECTED .emit OP_END .and semicolon;
-iteration_statement_3
-    "for" .emit OP_FOR .and lparen .error LPAREN_EXPECTED .and for_init_statement .and
-    for_rest_statement .and rparen .error RPAREN_EXPECTED .and statement_no_new_scope;
-
-/*
-    <for_init_statement>                ::= <expression_statement>
-                                          | <declaration_statement>
-*/
-for_init_statement
-    expression_statement .emit OP_EXPRESSION .or declaration_statement .emit OP_DECLARE;
-
-/*
-    <conditionopt>                      ::= <condition>
-                                          | ""
-
-note: <conditionopt> is used only by "for" statement - if <condition> is ommitted, parser
-      simulates default behaviour, that is simulates "true" expression
-*/
-conditionopt
-    condition .or
-    .true .emit OP_EXPRESSION .emit OP_PUSH_BOOL .emit 2 .emit '1' .emit '\0' .emit OP_END;
-
-/*
-    <for_rest_statement>                ::= <conditionopt> ";"
-                                          | <conditionopt> ";" <expression>
-*/
-for_rest_statement
-    conditionopt .and semicolon .and for_rest_statement_1;
-for_rest_statement_1
-    for_rest_statement_2 .or .true .emit OP_PUSH_VOID .emit OP_END;
-for_rest_statement_2
-    expression .and .true .emit OP_END;
-
-/*
-    <jump_statement>                    ::= "continue" ";"
-                                          | "break" ";"
-                                          | "return" ";"
-                                          | "return" <expression> ";"
-                                          | "discard" ";" // Fragment shader only.
-*/
-jump_statement
-    jump_statement_1 .or jump_statement_2 .or jump_statement_3 .or jump_statement_4 .or
-    .if (shader_type == 1) jump_statement_5;
-jump_statement_1
-    "continue" .and semicolon .emit OP_CONTINUE;
-jump_statement_2
-    "break" .and semicolon .emit OP_BREAK;
-jump_statement_3
-    "return" .emit OP_RETURN .and optional_space .and expression .and semicolon .emit OP_END;
-jump_statement_4
-    "return" .emit OP_RETURN .and semicolon .emit OP_PUSH_VOID .emit OP_END;
-jump_statement_5
-    "discard" .and semicolon .emit OP_DISCARD;
-
-/*
-    <__asm_statement>                   ::= "__asm" <identifier> <asm_arguments> ";"
-
-note: this is an extension to the standard language specification - normally slang disallows
-      __asm statements
-*/
-__asm_statement
-    "__asm" .and space .and identifier .and space .and asm_arguments .and semicolon .emit OP_END;
-
-/*
-    <asm_arguments>                     ::= <identifier>
-                                          | <asm_arguments> "," <identifier>
-
-note: this is an extension to the standard language specification - normally slang disallows
-      __asm statements
-*/
-asm_arguments
-    variable_identifier .and .true .emit OP_END .and .loop asm_arguments_1;
-asm_arguments_1
-    comma .and variable_identifier .and .true .emit OP_END;
-
-/*
-    <translation_unit>                  ::= <external_declaration>
-                                          | <translation_unit> <external_declaration>
-*/
-translation_unit
-    optional_space .emit REVISION .and external_declaration .error INVALID_EXTERNAL_DECLARATION .and
-    .loop external_declaration .and optional_space .and
-    '\0' .error INVALID_EXTERNAL_DECLARATION .emit EXTERNAL_NULL;
-
-/*
-    <external_declaration>              ::= <function_definition>
-                                          | <declaration>
-*/
-external_declaration
-    function_definition .emit EXTERNAL_FUNCTION_DEFINITION .or
-    declaration .emit EXTERNAL_DECLARATION;
-
-/*
-    <function_definition>               :: <function_prototype> <compound_statement_no_new_scope>
-*/
-function_definition
-    function_prototype .and compound_statement_no_new_scope;
-
-/* helper rulez, not part of the official language syntax */
-
-digit_oct
-    '0'-'7';
-
-digit_dec
-    '0'-'9';
-
-digit_hex
-    '0'-'9' .or 'A'-'F' .or 'a'-'f';
-
-id_character_first
-    'a'-'z' .or 'A'-'Z' .or '_';
-
-id_character_next
-    id_character_first .or digit_dec;
-
-identifier
-    id_character_first .emit * .and .loop id_character_next .emit * .and .true .emit '\0';
-
-float
-    float_1 .or float_2;
-float_1
-    float_fractional_constant .and float_optional_exponent_part;
-float_2
-    float_digit_sequence .and .true .emit '\0' .and float_exponent_part;
-
-float_fractional_constant
-    float_fractional_constant_1 .or float_fractional_constant_2 .or float_fractional_constant_3;
-float_fractional_constant_1
-    float_digit_sequence .and '.' .and float_digit_sequence;
-float_fractional_constant_2
-    float_digit_sequence .and '.' .and .true .emit '\0';
-float_fractional_constant_3
-    '.' .emit '\0' .and float_digit_sequence;
-
-float_optional_exponent_part
-    float_exponent_part .or .true .emit '\0';
-
-float_digit_sequence
-    digit_dec .emit * .and .loop digit_dec .emit * .and .true .emit '\0';
-
-float_exponent_part
-    float_exponent_part_1 .or float_exponent_part_2;
-float_exponent_part_1
-    'e' .and float_optional_sign .and float_digit_sequence;
-float_exponent_part_2
-    'E' .and float_optional_sign .and float_digit_sequence;
-
-float_optional_sign
-    float_sign .or .true;
-
-float_sign
-    '+' .or '-' .emit '-';
-
-integer
-    integer_hex .or integer_oct .or integer_dec;
-
-integer_hex
-    '0' .and integer_hex_1 .emit 0x10 .and digit_hex .emit * .and .loop digit_hex .emit * .and
-    .true .emit '\0';
-integer_hex_1
-    'x' .or 'X';
-
-integer_oct
-    '0' .emit 8 .emit * .and .loop digit_oct .emit * .and .true .emit '\0';
-
-integer_dec
-    digit_dec .emit 10 .emit * .and .loop digit_dec .emit * .and .true .emit '\0';
-
-boolean
-    "true" .emit 2 .emit '1' .emit '\0' .or
-    "false" .emit 2 .emit '0' .emit '\0';
-
-type_name
-    identifier;
-
-field_selection
-    identifier;
-
-floatconstant
-    float .emit OP_PUSH_FLOAT;
-
-intconstant
-    integer .emit OP_PUSH_INT;
-
-boolconstant
-    boolean .emit OP_PUSH_BOOL;
-
-optional_space
-    .loop single_space;
-
-space
-    single_space .and .loop single_space;
-
-single_space
-    white_char .or c_style_comment_block .or cpp_style_comment_block;
-
-white_char
-    ' ' .or '\t' .or new_line .or '\v' .or '\f';
-
-new_line
-    cr_lf .or lf_cr .or '\n' .or '\r';
-
-cr_lf
-    '\r' .and '\n';
-
-lf_cr
-    '\n' .and '\r';
-
-c_style_comment_block
-    '/' .and '*' .and c_style_comment_rest;
-
-c_style_comment_rest
-    .loop c_style_comment_char_no_star .and c_style_comment_rest_1;
-c_style_comment_rest_1
-    c_style_comment_end .or c_style_comment_rest_2;
-c_style_comment_rest_2
-    '*' .and c_style_comment_rest;
-
-c_style_comment_char_no_star
-    '\x2B'-'\xFF' .or '\x01'-'\x29';
-
-c_style_comment_end
-    '*' .and '/';
-
-cpp_style_comment_block
-    '/' .and '/' .and cpp_style_comment_block_1;
-cpp_style_comment_block_1
-    cpp_style_comment_block_2 .or cpp_style_comment_block_3;
-cpp_style_comment_block_2
-    .loop cpp_style_comment_char .and new_line;
-cpp_style_comment_block_3
-    .loop cpp_style_comment_char;
-
-cpp_style_comment_char
-    '\x0E'-'\xFF' .or '\x01'-'\x09' .or '\x0B'-'\x0C';
-
-/* lexical rulez */
-
-/*ampersand
-    optional_space .and '&' .and optional_space;*/
-
-ampersandampersand
-    optional_space .and '&' .and '&' .and optional_space;
-
-/*ampersandequals
-    optional_space .and '&' .and '=' .and optional_space;*/
-
-/*bar
-    optional_space .and '|' .and optional_space;*/
-
-barbar
-    optional_space .and '|' .and '|' .and optional_space;
-
-/*barequals
-    optional_space .and '|' .and '=' .and optional_space;*/
-
-bang
-    optional_space .and '!' .and optional_space;
-
-bangequals
-    optional_space .and '!' .and '=' .and optional_space;
-
-/*caret
-    optional_space .and '^' .and optional_space;*/
-
-caretcaret
-    optional_space .and '^' .and '^' .and optional_space;
-
-/*caretequals
-    optional_space .and '^' .and '=' .and optional_space;*/
-
-colon
-    optional_space .and ':' .and optional_space;
-
-comma
-    optional_space .and ',' .and optional_space;
-
-dot
-    optional_space .and '.' .and optional_space;
-
-equals
-    optional_space .and '=' .and optional_space;
-
-equalsequals
-    optional_space .and '=' .and '=' .and optional_space;
-
-greater
-    optional_space .and '>' .and optional_space;
-
-greaterequals
-    optional_space .and '>' .and '=' .and optional_space;
-
-/*greatergreater
-    optional_space .and '>' .and '>' .and optional_space;*/
-
-/*greatergreaterequals
-    optional_space .and '>' .and '>' .and '=' .and optional_space;*/
-
-lbrace
-    optional_space .and '{' .and optional_space;
-
-lbracket
-    optional_space .and '[' .and optional_space;
-
-less
-    optional_space .and '<' .and optional_space;
-
-lessequals
-    optional_space .and '<' .and '=' .and optional_space;
-
-/*lessless
-    optional_space .and '<' .and '<' .and optional_space;*/
-
-/*lesslessequals
-    optional_space .and '<' .and '<' .and '=' .and optional_space;*/
-
-lparen
-    optional_space .and '(' .and optional_space;
-
-minus
-    optional_space .and '-' .and optional_space;
-
-minusequals
-    optional_space .and '-' .and '=' .and optional_space;
-
-minusminus
-    optional_space .and '-' .and '-' .and optional_space;
-
-/*percent
-    optional_space .and '%' .and optional_space;*/
-
-/*percentequals
-    optional_space .and '%' .and '=' .and optional_space;*/
-
-plus
-    optional_space .and '+' .and optional_space;
-
-plusequals
-    optional_space .and '+' .and '=' .and optional_space;
-
-plusplus
-    optional_space .and '+' .and '+' .and optional_space;
-
-question
-    optional_space .and '?' .and optional_space;
-
-rbrace
-    optional_space .and '}' .and optional_space;
-
-rbracket
-    optional_space .and ']' .and optional_space;
-
-rparen
-    optional_space .and ')' .and optional_space;
-
-semicolon
-    optional_space .and ';' .and optional_space;
-
-slash
-    optional_space .and '/' .and optional_space;
-
-slashequals
-    optional_space .and '/' .and '=' .and optional_space;
-
-star
-    optional_space .and '*' .and optional_space;
-
-starequals
-    optional_space .and '*' .and '=' .and optional_space;
-
-/*tilde
-    optional_space .and '~' .and optional_space;*/
-
-/* string rulez - these are used internally by the parser when parsing quoted strings */
-
-.string string_lexer;
-
-string_lexer
-    lex_first_identifier_character .and .loop lex_next_identifier_character;
-
-lex_first_identifier_character
-    'a'-'z' .or 'A'-'Z' .or '_';
-
-lex_next_identifier_character
-    'a'-'z' .or 'A'-'Z' .or '0'-'9' .or '_';
-
-/* error rulez - these are used by error messages */
-
-err_token
-    '~' .or '`' .or '!' .or '@' .or '#' .or '$' .or '%' .or '^' .or '&' .or '*' .or '(' .or ')' .or
-    '-' .or '+' .or '=' .or '|' .or '\\' .or '[' .or ']' .or '{' .or '}' .or ':' .or ';' .or '"' .or
-    '\'' .or '<' .or ',' .or '>' .or '.' .or '/' .or '?' .or err_identifier;
-
-err_identifier
-    id_character_first .and .loop id_character_next;
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version.syn b/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version.syn
deleted file mode 100755
index 3a8c7046b..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version.syn
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 2005  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file slang_version.syn
- * slang #version directive syntax
- * \author Michal Krol
- */
-
-.syntax version_directive;
-
-version_directive
-	version_directive_1 .and .loop version_directive_2;
-version_directive_1
-	prior_optional_spaces .and optional_version_directive .and .true .emit $;
-version_directive_2
-	prior_optional_spaces .and version_directive_body .and .true .emit $;
-
-optional_version_directive
-	version_directive_body .or .true .emit 10 .emit 1;
-
-version_directive_body
-	'#' .and optional_space .and "version" .and space .and version_number .and optional_space .and
-	new_line;
-
-version_number
-	version_number_110;
-
-version_number_110
-	leading_zeroes .and "110" .emit 10 .emit 1;
-
-leading_zeroes
-	.loop zero;
-
-zero
-	'0';
-
-space
-    single_space .and .loop single_space;
-
-optional_space
-    .loop single_space;
-
-single_space
-    ' ' .or '\t';
-
-prior_optional_spaces
-	.loop prior_space;
-
-prior_space
-	c_style_comment_block .or cpp_style_comment_block .or space .or new_line;
-
-c_style_comment_block
-    '/' .and '*' .and c_style_comment_rest;
-
-c_style_comment_rest
-    .loop c_style_comment_char_no_star .and c_style_comment_rest_1;
-c_style_comment_rest_1
-    c_style_comment_end .or c_style_comment_rest_2;
-c_style_comment_rest_2
-    '*' .and c_style_comment_rest;
-
-c_style_comment_char_no_star
-    '\x2B'-'\xFF' .or '\x01'-'\x29';
-
-c_style_comment_end
-    '*' .and '/';
-
-cpp_style_comment_block
-    '/' .and '/' .and cpp_style_comment_block_1;
-cpp_style_comment_block_1
-    cpp_style_comment_block_2 .or cpp_style_comment_block_3;
-cpp_style_comment_block_2
-    .loop cpp_style_comment_char .and new_line;
-cpp_style_comment_block_3
-    .loop cpp_style_comment_char;
-
-cpp_style_comment_char
-    '\x0E'-'\xFF' .or '\x01'-'\x09' .or '\x0B'-'\x0C';
-
-new_line
-    cr_lf .or lf_cr .or '\n' .or '\r';
-
-cr_lf
-    '\r' .and '\n';
-
-lf_cr
-	'\n' .and '\r';
-
-.string __string_filter;
-
-__string_filter
-    .loop __identifier_char;
-
-__identifier_char
-    'a'-'z' .or 'A'-'Z' .or '_' .or '0'-'9';
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin.gc b/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin.gc
deleted file mode 100755
index 850fd2bb8..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin.gc
+++ /dev/null
@@ -1,262 +0,0 @@
-
-// 
-// TODO:
-// - what to do with ftransform? can it stay in the current form?
-// - implement texture1DLod, texture2DLod, texture3DLod, textureCubeLod,
-// - implement shadow1DLod, shadow2DLod,
-// 
-
-// 
-// From Shader Spec, ver. 1.10, rev. 59
-// 
-// Some OpenGL operations still continue to occur in fixed functionality in between the vertex
-// processor and the fragment processor. Other OpenGL operations continue to occur in fixed
-// functionality after the fragment processor. Shaders communicate with the fixed functionality
-// of OpenGL through the use of built-in variables.
-// 
-// The variable gl_Position is available only in the vertex language and is intended for writing
-// the homogeneous vertex position. All executions of a well-formed vertex shader must write
-// a value into this variable. It can be written at any time during shader execution. It may also
-// be read back by the shader after being written. This value will be used by primitive assembly,
-// clipping, culling, and other fixed functionality operations that operate on primitives after
-// vertex processing has occurred. Compilers may generate a diagnostic message if they detect
-// gl_Position is not written, or read before being written, but not all such cases are detectable.
-// Results are undefined if a vertex shader is executed and does not write gl_Position.
-// 
-// The variable gl_PointSize is available only in the vertex language and is intended for a vertex
-// shader to write the size of the point to be rasterized. It is measured in pixels.
-// 
-// The variable gl_ClipVertex is available only in the vertex language and provides a place for
-// vertex shaders to write the coordinate to be used with the user clipping planes. The user must
-// ensure the clip vertex and user clipping planes are defined in the same coordinate space. User
-// clip planes work properly only under linear transform. It is undefined what happens under
-// non-linear transform.
-// 
-// These built-in vertex shader variables for communicating with fixed functionality are
-// intrinsically declared with the following types:
-// 
-
-__fixed_output vec4 gl_Position;                                       // must be written to
-__fixed_output float gl_PointSize;                                     // may be written to
-__fixed_output vec4 gl_ClipVertex;                                     // may be written to
-
-// 
-// If gl_PointSize or gl_ClipVertex are not written to, their values are undefined. Any of these
-// variables can be read back by the shader after writing to them, to retrieve what was written.
-// Reading them before writing them results in undefined behavior. If they are written more than
-// once, it is the last value written that is consumed by the subsequent operations.
-// 
-// These built-in variables have global scope.
-// 
-
-// 
-// The following attribute names are built into the OpenGL vertex language and can be used from
-// within a vertex shader to access the current values of attributes declared by OpenGL. All page
-// numbers and notations are references to the OpenGL 1.4 specification.
-// 
-
-// 
-// Vertex Attributes, p. 19.
-// 
-
-attribute vec4 gl_Color;
-attribute vec4 gl_SecondaryColor;
-attribute vec3 gl_Normal;
-attribute vec4 gl_Vertex;
-attribute vec4 gl_MultiTexCoord0;
-attribute vec4 gl_MultiTexCoord1;
-attribute vec4 gl_MultiTexCoord2;
-attribute vec4 gl_MultiTexCoord3;
-attribute vec4 gl_MultiTexCoord4;
-attribute vec4 gl_MultiTexCoord5;
-attribute vec4 gl_MultiTexCoord6;
-attribute vec4 gl_MultiTexCoord7;
-attribute float gl_FogCoord;
-
-// 
-// Unlike user-defined varying variables, the built-in varying variables don't have a strict
-// one-to-one correspondence between the vertex language and the fragment language. Two sets are
-// provided, one for each language. Their relationship is described below.
-// 
-// The following built-in varying variables are available to write to in a vertex shader.
-// A particular one should be written to if any functionality in a corresponding fragment shader
-// or fixed pipeline uses it or state derived from it. Otherwise, behavior is undefined.
-//
-
-varying vec4 gl_FrontColor;
-varying vec4 gl_BackColor;
-varying vec4 gl_FrontSecondaryColor;
-varying vec4 gl_BackSecondaryColor;
-varying vec4 gl_TexCoord[];                             // at most will be gl_MaxTextureCoords
-varying float gl_FogFragCoord;
-
-// 
-// For gl_FogFragCoord, the value written will be used as the "c" value on page 160 of the
-// OpenGL 1.4 Specification by the fixed functionality pipeline. For example, if the z-coordinate
-// of the fragment in eye space is desired as "c", then that's what the vertex shader should write
-// into gl_FogFragCoord.
-// 
-// As with all arrays, indices used to subscript gl_TexCoord must either be an integral constant
-// expressions, or this array must be re-declared by the shader with a size. The size can be
-// at most gl_MaxTextureCoords. Using indexes close to 0 may aid the implementation
-// in preserving varying resources.
-// 
-
-// 
-// The OpenGL Shading Language defines an assortment of built-in convenience functions for scalar
-// and vector operations. Many of these built-in functions can be used in more than one type
-// of shader, but some are intended to provide a direct mapping to hardware and so are available
-// only for a specific type of shader.
-// 
-// The built-in functions basically fall into three categories:
-// 
-// * They expose some necessary hardware functionality in a convenient way such as accessing
-//   a texture map. There is no way in the language for these functions to be emulated by a shader.
-// 
-// * They represent a trivial operation (clamp, mix, etc.) that is very simple for the user
-//   to write, but they are very common and may have direct hardware support. It is a very hard
-//   problem for the compiler to map expressions to complex assembler instructions.
-// 
-// * They represent an operation graphics hardware is likely to accelerate at some point. The
-//   trigonometry functions fall into this category.
-// 
-// Many of the functions are similar to the same named ones in common C libraries, but they support
-// vector input as well as the more traditional scalar input.
-// 
-// Applications should be encouraged to use the built-in functions rather than do the equivalent
-// computations in their own shader code since the built-in functions are assumed to be optimal
-// (e.g., perhaps supported directly in hardware).
-// 
-// User code can replace built-in functions with their own if they choose, by simply re-declaring
-// and defining the same name and argument list.
-// 
-
-// 
-// Geometric Functions
-// 
-// These operate on vectors as vectors, not component-wise.
-// 
-
-// 
-// For vertex shaders only. This function will ensure that the incoming vertex value will be
-// transformed in a way that produces exactly the same result as would be produced by OpenGL's
-// fixed functionality transform. It is intended to be used to compute gl_Position, e.g.,
-// gl_Position = ftransform()
-// This function should be used, for example, when an application is rendering the same geometry in
-// separate passes, and one pass uses the fixed functionality path to render and another pass uses
-// programmable shaders.
-// 
-
-vec4 ftransform () {
-    return gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-// 
-// 8.7 Texture Lookup Functions
-// 
-// Texture lookup functions are available to both vertex and fragment shaders. However, level
-// of detail is not computed by fixed functionality for vertex shaders, so there are some
-// differences in operation between vertex and fragment texture lookups. The functions in the table
-// below provide access to textures through samplers, as set up through the OpenGL API. Texture
-// properties such as size, pixel format, number of dimensions, filtering method, number of mip-map
-// levels, depth comparison, and so on are also defined by OpenGL API calls. Such properties are
-// taken into account as the texture is accessed via the built-in functions defined below.
-// 
-// If a non-shadow texture call is made to a sampler that represents a depth texture with depth
-// comparisons turned on, then results are undefined. If a shadow texture call is made to a sampler
-// that represents a depth texture with depth comparisions turned off, the results are undefined.
-// If a shadow texture call is made to a sampler that does not represent a depth texture, then
-// results are undefined.
-// 
-// In all functions below, the bias parameter is optional for fragment shaders. The bias parameter
-// is not accepted in a vertex shader. For a fragment shader, if bias is present, it is added to
-// the calculated level of detail prior to performing the texture access operation. If the bias
-// parameter is not provided, then the implementation automatically selects level of detail:
-// For a texture that is not mip-mapped, the texture is used directly. If it is mip-mapped and
-// running in a fragment shader, the LOD computed by the implementation is used to do the texture
-// lookup. If it is mip-mapped and running on the vertex shader, then the base texture is used.
-// 
-// The built-ins suffixed with "Lod" are allowed only in a vertex shader. For the "Lod" functions,
-// lod is directly used as the level of detail.
-// 
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the 1D texture currently bound
-// to sampler. For the projective ("Proj") versions, the texture coordinate coord.s is divided by
-// the last component of coord.
-// 
-// XXX
-vec4 texture1DLod (sampler1D sampler, float coord, float lod) {
-    return vec4 (0.0);
-}
-vec4 texture1DProjLod (sampler1D sampler, vec2 coord, float lod) {
-    return texture1DLod (sampler, coord.s / coord.t, lod);
-}
-vec4 texture1DProjLod (sampler1D sampler, vec4 coord, float lod) {
-    return texture1DLod (sampler, coord.s / coord.q, lod);
-}
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the 2D texture currently bound
-// to sampler. For the projective ("Proj") versions, the texture coordinate (coord.s, coord.t) is
-// divided by the last component of coord. The third component of coord is ignored for the vec4
-// coord variant.
-// 
-// XXX
-vec4 texture2DLod (sampler2D sampler, vec2 coord, float lod) {
-    return vec4 (0.0);
-}
-vec4 texture2DProjLod (sampler2D sampler, vec3 coord, float lod) {
-    return texture2DLod (sampler, vec2 (coord.s / coord.p, coord.t / coord.p), lod);
-}
-vec4 texture2DProjLod (sampler2D sampler, vec4 coord, float lod) {
-    return texture2DLod (sampler, vec2 (coord.s / coord.q, coord.t / coord.q), lod);
-}
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the 3D texture currently bound
-// to sampler. For the projective ("Proj") versions, the texture coordinate is divided by coord.q.
-// 
-// XXX
-vec4 texture3DLod (sampler3D sampler, vec3 coord, float lod) {
-    return vec4 (0.0);
-}
-vec4 texture3DProjLod (sampler3D sampler, vec4 coord, float lod) {
-    return texture3DLod (sampler, vec3 (coord.s / coord.q, coord.t / coord.q, coord.s / coord.q),
-        lod);
-}
-
-// 
-// Use the texture coordinate coord to do a texture lookup in the cube map texture currently bound
-// to sampler. The direction of coord is used to select which face to do a 2-dimensional texture
-// lookup in, as described in section 3.8.6 in version 1.4 of the OpenGL specification.
-// 
-// XXX
-vec4 textureCubeLod (samplerCube sampler, vec3 coord, float lod) {
-    return vec4 (0.0);
-}
-
-// 
-// Use texture coordinate coord to do a depth comparison lookup on the depth texture bound
-// to sampler, as described in section 3.8.14 of version 1.4 of the OpenGL specification. The 3rd
-// component of coord (coord.p) is used as the R value. The texture bound to sampler must be a
-// depth texture, or results are undefined. For the projective ("Proj") version of each built-in,
-// the texture coordinate is divide by coord.q, giving a depth value R of coord.p/coord.q. The
-// second component of coord is ignored for the "1D" variants.
-// 
-// XXX
-vec4 shadow1DLod (sampler1DShadow sampler, vec3 coord, float lod) {
-    return vec4 (0.0);
-}
-// XXX
-vec4 shadow2DLod (sampler2DShadow sampler, vec3 coord, float lod) {
-    return vec4 (0.0);
-}
-vec4 shadow1DProjLod (sampler1DShadow sampler, vec4 coord, float lod) {
-    return shadow1DLod (sampler, vec3 (coord.s / coord.q, 0.0, coord.p / coord.q), lod);
-}
-vec4 shadow2DProjLod (sampler2DShadow sampler, vec4 coord, float lod) {
-    return shadow2DLod (sampler, vec3 (coord.s / coord.q, coord.t / coord.q, coord.p / coord.q),
-        lod);
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.cpp b/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.cpp
deleted file mode 100755
index 3f437ee7d..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 2005  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "slang_mesa.h"
-#include "Initialisation.h"
-#include "Include/Common.h"
-#include "Include/ShHandle.h"
-#include "Public/ShaderLang.h"
-
-
-class TGenericCompiler: public TCompiler
-{
-public:
-	TGenericCompiler (EShLanguage l, int dOptions): TCompiler(l, infoSink), debugOptions(dOptions)
-	{
-	}
-public:
-	virtual bool compile (TIntermNode *root)
-	{
-		haveValidObjectCode = true;
-		return haveValidObjectCode;
-	}
-	TInfoSink infoSink;
-	int debugOptions;
-};
-
-TCompiler *ConstructCompiler (EShLanguage language, int debugOptions)
-{
-	return new TGenericCompiler (language, debugOptions);
-}
-
-void DeleteCompiler (TCompiler *compiler)
-{
-	delete compiler;
-}
-
-class TGenericLinker: public TLinker
-{
-public:
-	TGenericLinker (EShExecutable e, int dOptions): TLinker(e, infoSink), debugOptions(dOptions)
-	{
-	}
-public:
-	bool link (TCompilerList &, TUniformMap *)
-	{
-		return true;
-	}
-	void getAttributeBindings (ShBindingTable const **t) const
-	{
-	}
-	TInfoSink infoSink;
-	int debugOptions;
-};
-
-TShHandleBase *ConstructLinker (EShExecutable executable, int debugOptions)
-{
-	return new TGenericLinker (executable, debugOptions);
-}
-
-void DeleteLinker (TShHandleBase *linker)
-{
-	delete linker;
-}
-
-class TUniformLinkedMap: public TUniformMap
-{
-public:
-	TUniformLinkedMap()
-	{
-	}
-public:
-	virtual int getLocation (const char *name)
-	{
-		return 0;
-	}
-};
-
-TUniformMap *ConstructUniformMap ()
-{
-	return new TUniformLinkedMap;
-}
-
-void DeleteUniformMap (TUniformMap *map)
-{
-	delete map;
-}
-
-
-namespace std
-{
-
-void _Xran ()
-{
-	/* XXX fix this under Linux */
-	/*_THROW(out_of_range, "invalid string position");*/
-}
-
-void _Xlen ()
-{
-	/* XXX fix this under Linux */
-	/*_THROW(length_error, "string too long");*/
-}
-
-}
-
-
-/* these functions link with extern "C" */
-
-int _mesa_isalnum (char c)
-{
-	return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9');
-}
-
-int _glslang_3dlabs_InitProcess ()
-{
-	return InitProcess () ? 1 : 0;
-}
-
-int _glslang_3dlabs_ShInitialize ()
-{
-	return ShInitialize () ? 1 : 0;
-}
-
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.h
deleted file mode 100755
index 41f79aa70..000000000
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 2005  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-int _mesa_isalnum (char);
-int _glslang_3dlabs_InitProcess ();
-int _glslang_3dlabs_ShInitialize ();
-
-#if defined __cplusplus
-}
-#endif
-
-- 
cgit v1.2.3