ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libgender/shader_vars.C
(Generate patch)

Comparing libgender/shader_vars.C (file contents):
Revision 1.1 by root, Sat Oct 23 21:43:27 2004 UTC vs.
Revision 1.2 by root, Sun Oct 24 00:36:23 2004 UTC

… …
2 2
3namespace shader { 3namespace shader {
4 4
5 struct vin vin; 5 struct vin vin;
6 6
7 varying_3f vin::position_3f ("gl_Vertex"); 7 varying_3f vin::vertex_3f ("gl_Vertex");
8 varying_4f vin::position_4f ("gl_Vertex"); 8 varying_4f vin::vertex_4f ("gl_Vertex");
9 varying_3f vin::normal_3f ("gl_Normal"); 9 varying_3f vin::normal_3f ("gl_Normal");
10 varying_3f vin::color_3f ("gl_Color"); 10 varying_3f vin::color_3f ("gl_Color");
11 varying_4f vin::color_4f ("gl_Color"); 11 varying_4f vin::color_4f ("gl_Color");
12 varying_3f vin::color2_3f ("gl_SecondaryColor"); 12 varying_3f vin::secondary_color_3f ("gl_SecondaryColor");
13 varying_4f vin::color2_4f ("gl_SecondaryColor"); 13 varying_4f vin::secondary_color_4f ("gl_SecondaryColor");
14 varying_1f vin::texcoord_1f[8] = 14 varying_1f vin::tex_coord_1f[8] =
15 { 15 {
16 varying_1f ("gl_TexCoord[0]"), varying_1f ("gl_TexCoord[1]"), varying_1f ("gl_TexCoord[2]"), varying_1f ("gl_TexCoord[3]"), 16 varying_1f ("gl_TexCoord[0]"), varying_1f ("gl_TexCoord[1]"), varying_1f ("gl_TexCoord[2]"), varying_1f ("gl_TexCoord[3]"),
17 varying_1f ("gl_TexCoord[4]"), varying_1f ("gl_TexCoord[5]"), varying_1f ("gl_TexCoord[6]"), varying_1f ("gl_TexCoord[7]"), 17 varying_1f ("gl_TexCoord[4]"), varying_1f ("gl_TexCoord[5]"), varying_1f ("gl_TexCoord[6]"), varying_1f ("gl_TexCoord[7]"),
18 }; 18 };
19 varying_2f vin::texcoord_2f[8] = 19 varying_2f vin::tex_coord_2f[8] =
20 { 20 {
21 varying_2f ("gl_TexCoord[0]"), varying_2f ("gl_TexCoord[1]"), varying_2f ("gl_TexCoord[2]"), varying_2f ("gl_TexCoord[3]"), 21 varying_2f ("gl_TexCoord[0]"), varying_2f ("gl_TexCoord[1]"), varying_2f ("gl_TexCoord[2]"), varying_2f ("gl_TexCoord[3]"),
22 varying_2f ("gl_TexCoord[4]"), varying_2f ("gl_TexCoord[5]"), varying_2f ("gl_TexCoord[6]"), varying_2f ("gl_TexCoord[7]"), 22 varying_2f ("gl_TexCoord[4]"), varying_2f ("gl_TexCoord[5]"), varying_2f ("gl_TexCoord[6]"), varying_2f ("gl_TexCoord[7]"),
23 }; 23 };
24 varying_3f vin::texcoord_3f[8] = 24 varying_3f vin::tex_coord_3f[8] =
25 { 25 {
26 varying_3f ("gl_TexCoord[0]"), varying_3f ("gl_TexCoord[1]"), varying_3f ("gl_TexCoord[2]"), varying_3f ("gl_TexCoord[3]"), 26 varying_3f ("gl_TexCoord[0]"), varying_3f ("gl_TexCoord[1]"), varying_3f ("gl_TexCoord[2]"), varying_3f ("gl_TexCoord[3]"),
27 varying_3f ("gl_TexCoord[4]"), varying_3f ("gl_TexCoord[5]"), varying_3f ("gl_TexCoord[6]"), varying_3f ("gl_TexCoord[7]"), 27 varying_3f ("gl_TexCoord[4]"), varying_3f ("gl_TexCoord[5]"), varying_3f ("gl_TexCoord[6]"), varying_3f ("gl_TexCoord[7]"),
28 }; 28 };
29 varying_4f vin::texcoord_4f[8] = 29 varying_4f vin::tex_coord_4f[8] =
30 { 30 {
31 varying_4f ("gl_TexCoord[0]"), varying_4f ("gl_TexCoord[1]"), varying_4f ("gl_TexCoord[2]"), varying_4f ("gl_TexCoord[3]"), 31 varying_4f ("gl_TexCoord[0]"), varying_4f ("gl_TexCoord[1]"), varying_4f ("gl_TexCoord[2]"), varying_4f ("gl_TexCoord[3]"),
32 varying_4f ("gl_TexCoord[4]"), varying_4f ("gl_TexCoord[5]"), varying_4f ("gl_TexCoord[6]"), varying_4f ("gl_TexCoord[7]"), 32 varying_4f ("gl_TexCoord[4]"), varying_4f ("gl_TexCoord[5]"), varying_4f ("gl_TexCoord[6]"), varying_4f ("gl_TexCoord[7]"),
33 }; 33 };
34 varying_1f vin::psize_1f ("PSIZE");
35 34
36 glvar vin::position ("gl_Position"); 35 glvar vin::vertex ("gl_Vertex");
37 glvar vin::normal ("gl_Normal"); 36 glvar vin::normal ("gl_Normal");
37 glvar vin::color ("gl_Color");
38 glvar vin::secondary_color ("gl_SecondaryColor");
39 glvar vin::tex_coord[8] =
40 {
41 glvar ("gl_MultiTexCoord0"), glvar ("gl_MultiTexCoord1"), glvar ("gl_MultiTexCoord2"), glvar ("gl_MultiTexCoord3"),
42 glvar ("gl_MultiTexCoord4"), glvar ("gl_MultiTexCoord5"), glvar ("gl_MultiTexCoord6"), glvar ("gl_MultiTexCoord7"),
43 };
44 glvar vin::fog_coord ("gl_FogCoord");
38 45
46 struct vout vout;
47
39 glvar vout::position ("gl_Position"); 48 glvar vout::position ("gl_Position");
40 glvar vout::point_size ("gl_PointSize"); 49 glvar vout::point_size ("gl_PointSize");
41 glvar vout::clip_vertex ("gl_ClipVertex"); 50 glvar vout::clip_vertex ("gl_ClipVertex");
42 glvar vout::front_color ("gl_FontColor"); 51 glvar vout::front_color ("gl_FontColor");
43 glvar vout::back_color ("gl_BackColor"); 52 glvar vout::back_color ("gl_BackColor");
44 glvar vout::front_secondary_color ("gl_FrontSecondaryColor"); 53 glvar vout::front_secondary_color ("gl_FrontSecondaryColor");
45 glvar vout::back_secondary_color ("gl_BackSecondaryColor"); 54 glvar vout::back_secondary_color ("gl_BackSecondaryColor");
46 glvar vout::texcoord[8] = 55 glvar vout::tex_coord[8] =
47 { 56 {
48 glvar ("gl_TexCoord[0]"), glvar ("gl_TexCoord[1]"), glvar ("gl_TexCoord[2]"), glvar ("gl_TexCoord[3]"), 57 glvar ("gl_TexCoord[0]"), glvar ("gl_TexCoord[1]"), glvar ("gl_TexCoord[2]"), glvar ("gl_TexCoord[3]"),
49 glvar ("gl_TexCoord[4]"), glvar ("gl_TexCoord[5]"), glvar ("gl_TexCoord[6]"), glvar ("gl_TexCoord[7]"), 58 glvar ("gl_TexCoord[4]"), glvar ("gl_TexCoord[5]"), glvar ("gl_TexCoord[6]"), glvar ("gl_TexCoord[7]"),
50 }; 59 };
51 glvar vout::fog_frag_coord ("gl_FogFragCoord"); 60 glvar vout::fog_frag_coord ("gl_FogFragCoord");
52 61
62 struct fin fin;
63
53 glvar fin::frag_coord ("gl_FragCoord"); 64 glvar fin::frag_coord ("gl_FragCoord");
65 glvar fin::front_facing ("gl_FrontFacing");
54 glvar fin::color ("gl_Color"); 66 glvar fin::color ("gl_Color");
55 glvar fin::secondary_color ("gl_SecondaryColor"); 67 glvar fin::secondary_color ("gl_SecondaryColor");
56 glvar fin::texcoord[8] = 68 glvar fin::tex_coord[8] =
57 { 69 {
58 glvar ("gl_TexCoord[0]"), glvar ("gl_TexCoord[1]"), glvar ("gl_TexCoord[2]"), glvar ("gl_TexCoord[3]"), 70 glvar ("gl_TexCoord[0]"), glvar ("gl_TexCoord[1]"), glvar ("gl_TexCoord[2]"), glvar ("gl_TexCoord[3]"),
59 glvar ("gl_TexCoord[4]"), glvar ("gl_TexCoord[5]"), glvar ("gl_TexCoord[6]"), glvar ("gl_TexCoord[7]"), 71 glvar ("gl_TexCoord[4]"), glvar ("gl_TexCoord[5]"), glvar ("gl_TexCoord[6]"), glvar ("gl_TexCoord[7]"),
60 }; 72 };
61 glvar fin::fog_frag_coord ("gl_FogFragCoord"); 73 glvar fin::fog_frag_coord ("gl_FogFragCoord");
62 74
75 struct fout fout;
76
63 glvar fout::frag_color ("gl_FragColor"); 77 glvar fout::frag_color ("gl_FragColor");
64 glvar fout::frag_depth ("gl_FragDepth"); 78 glvar fout::frag_depth ("gl_FragDepth");
65 glvar fout::frag_data[2] = { glvar ("gl_FragData[0]"), glvar ("gl_FragData[1]") }; 79 glvar fout::frag_data[2] = { glvar ("gl_FragData[0]"), glvar ("gl_FragData[1]") };
66 80
67 uniform_matrix_4f gl::model_view_matrix ("gl_ModelViewMatrix"), 81 uniform_matrix_4f gl::model_view_matrix ("gl_ModelViewMatrix"),
68 gl::projection_matrix ("gl_ProjectionMatrix"), 82 gl::projection_matrix ("gl_ProjectionMatrix"),
69 gl::model_view_projection_matrix ("gl_ModelViewProjectionMatrix"), 83 gl::model_view_projection_matrix ("gl_ModelViewProjectionMatrix"),
… …
103 uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[2]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[3]"), 117 uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[2]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[3]"),
104 uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[4]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[5]"), 118 uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[4]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[5]"),
105 uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[6]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[7]"), 119 uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[6]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[7]"),
106 }; 120 };
107 121
108 uniform_matrix_3f gl::normal_matrix; 122 uniform_matrix_3f gl::normal_matrix ("gl_NormalMatrix");
109 123
110 uniform_1f gl::normal_scale; 124 uniform_1f gl::normal_scale ("gl_NormalScale");
111 uniform_1f gl::depth_range_near, depth_range_far, depth_range_diff; 125 uniform_1f gl::depth_range_near ("gl_DepthRange.near"),
126 gl::depth_range_far ("gl_DepthRange.far"),
127 gl::depth_range_diff ("gl_DepthRange.diff");
112 128
113 uniform_4f gl::clip_plane[2]; 129 uniform_4f gl::clip_plane[2] = { uniform_4f ("gl_ClipPlane[0]"), uniform_4f ("gl_ClipPlane[1]") };
114 130
115 uniform_4f gl::front_material_emission, 131 uniform_4f gl::front_material_emission ("gl_FrontMaterialEmission"),
116 gl::front_material_ambient, 132 gl::front_material_ambient ("gl_FrontMaterialAmbient"),
117 gl::front_material_diffuse, 133 gl::front_material_diffuse ("gl_FrontMaterialDiffuse"),
118 gl::front_material_specular, 134 gl::front_material_specular ("gl_FrontMaterialSpecular"),
119 gl::front_material_shininess; 135 gl::front_material_shininess ("gl_FrontMaterialShininess");
120 uniform_4f gl::back_material_emission, 136 uniform_4f gl::back_material_emission ("gl_BackMaterialEmission"),
121 gl::back_material_ambient, 137 gl::back_material_ambient ("gl_BackMaterialAmbient"),
122 gl::back_material_diffuse, 138 gl::back_material_diffuse ("gl_BackMaterialDiffuse"),
123 gl::back_material_specular, 139 gl::back_material_specular ("gl_BackMaterialSpecular"),
124 gl::back_material_shininess; 140 gl::back_material_shininess ("gl_BackMaterialShininess");
125 141
126 uniform_4f gl::light_model_ambient; 142 uniform_4f gl::light_model_ambient ("gl_LightModel.ambient");
127 uniform_4f gl::front_light_model_product_scene_color; 143 uniform_4f gl::front_light_model_product_scene_color ("gl_FrontLightModelProduct.sceneColor");
128 uniform_4f gl::back_light_model_product_scene_color; 144 uniform_4f gl::back_light_model_product_scene_color ("gl_BackLightModelProduct.sceneColor");
129
130#if 0
131 varying_4f fin::position_4f ("gl_Position");
132 varying_4f fin::color_4f ("gl_Color");
133 varying_4f fin::color2_4f ("gl_SecondaryColor");
134 varying_4f fin::texcoord_4f[8] =
135 {
136 varying_4f ("gl_TexCoord[0]"), varying_4f ("gl_TexCoord[1]"), varying_4f ("gl_TexCoord[2]"), varying_4f ("gl_TexCoord[3]"),
137 varying_4f ("gl_TexCoord[4]"), varying_4f ("gl_TexCoord[5]"), varying_4f ("gl_TexCoord[6]"), varying_4f ("gl_TexCoord[7]"),
138 };
139#endif
140
141 struct fout fout;
142
143#if 0
144 varying_4f fout::color_4f ("gl_FragColor");
145 varying_1f fout::depth_1f ("gl_FragDepth");
146#endif
147 145
148} 146}
149 147
150 148

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines