--- libgender/shader_vars.h	2004/10/23 21:43:27	1.1
+++ libgender/shader_vars.h	2004/10/24 01:36:00	1.3
@@ -7,57 +7,63 @@
 
   extern struct vin
   {
-    static varying_3f position_3f;
-    static varying_4f position_4f;
+    // for setting
+    static varying_3f vertex_3f;
+    static varying_4f vertex_4f;
     static varying_3f normal_3f;
     static varying_3f color_3f;
     static varying_4f color_4f;
-    static varying_3f color2_3f;
-    static varying_4f color2_4f;
-    static varying_1f psize_1f;
-    static varying_1f texcoord_1f[8];
-    static varying_2f texcoord_2f[8];
-    static varying_3f texcoord_3f[8];
-    static varying_4f texcoord_4f[8];
-
-    static glvar position;
-    static glvar normal;
+    static varying_3f secondary_color_3f;
+    static varying_4f secondary_color_4f;
+    static varying_1f tex_coord_1f[8];
+    static varying_2f tex_coord_2f[8];
+    static varying_3f tex_coord_3f[8];
+    static varying_4f tex_coord_4f[8];
+
+    // for the vertex shader
+    static const glvar vertex;
+    static const glvar normal;
+    static const glvar color;
+    static const glvar secondary_color;
+    static const glvar tex_coord[8];
+    static const glvar fog_coord;
   } vin;
 
   extern struct vout
   {
     // glstate builtin
-    static glvar position;
-    static glvar point_size;
-    static glvar clip_vertex;
+    static const glvar position;
+    static const glvar point_size;
+    static const glvar clip_vertex;
 
     // standard varying
-    static glvar front_color;
-    static glvar back_color;
-    static glvar front_secondary_color;
-    static glvar back_secondary_color;
-    static glvar texcoord[8];
-    static glvar fog_frag_coord;
+    static const glvar front_color;
+    static const glvar back_color;
+    static const glvar front_secondary_color;
+    static const glvar back_secondary_color;
+    static const glvar tex_coord[8];
+    static const glvar fog_frag_coord;
   } vout;
 
   extern struct fin
   {
     // glstate builtin
-    static glvar frag_coord;
+    static const glvar frag_coord;
+    static const glvar front_facing;
 
     // standard varying
-    static glvar color;
-    static glvar secondary_color;
-    static glvar texcoord[8];
-    static glvar fog_frag_coord;
+    static const glvar color;
+    static const glvar secondary_color;
+    static const glvar tex_coord[8];
+    static const glvar fog_frag_coord;
   } fin;
 
   extern struct fout
   {
     // glstate builtin
-    static glvar frag_color;
-    static glvar frag_depth;
-    static glvar frag_data[2];
+    static const glvar frag_color;
+    static const glvar frag_depth;
+    static const glvar frag_data[2];
   } fout;
 
   // predefined globals