--- libgender/shader_vars.C 2004/10/24 01:36:00 1.3 +++ libgender/shader_vars.C 2004/10/29 15:58:50 1.6 @@ -4,6 +4,7 @@ struct vin vin; +#if 0 varying_3f vin::vertex_3f ("gl_Vertex"); varying_4f vin::vertex_4f ("gl_Vertex"); varying_3f vin::normal_3f ("gl_Normal"); @@ -31,117 +32,118 @@ varying_4f ("gl_TexCoord[0]"), varying_4f ("gl_TexCoord[1]"), varying_4f ("gl_TexCoord[2]"), varying_4f ("gl_TexCoord[3]"), varying_4f ("gl_TexCoord[4]"), varying_4f ("gl_TexCoord[5]"), varying_4f ("gl_TexCoord[6]"), varying_4f ("gl_TexCoord[7]"), }; +#endif - glvar const vin::vertex ("gl_Vertex"); - glvar const vin::normal ("gl_Normal"); - glvar const vin::color ("gl_Color"); - glvar const vin::secondary_color ("gl_SecondaryColor"); - glvar const vin::tex_coord[8] = + gluvar const vin::vertex ("gl_Vertex"); + gluvar const vin::normal ("gl_Normal"); + gluvar const vin::color ("gl_Color"); + gluvar const vin::secondary_color ("gl_SecondaryColor"); + gluvar const vin::tex_coord[8] = { - glvar ("gl_MultiTexCoord0"), glvar ("gl_MultiTexCoord1"), glvar ("gl_MultiTexCoord2"), glvar ("gl_MultiTexCoord3"), - glvar ("gl_MultiTexCoord4"), glvar ("gl_MultiTexCoord5"), glvar ("gl_MultiTexCoord6"), glvar ("gl_MultiTexCoord7"), + gluvar ("gl_MultiTexCoord0"), gluvar ("gl_MultiTexCoord1"), gluvar ("gl_MultiTexCoord2"), gluvar ("gl_MultiTexCoord3"), + gluvar ("gl_MultiTexCoord4"), gluvar ("gl_MultiTexCoord5"), gluvar ("gl_MultiTexCoord6"), gluvar ("gl_MultiTexCoord7"), }; - glvar const vin::fog_coord ("gl_FogCoord"); + gluvar const vin::fog_coord ("gl_FogCoord"); struct vout vout; - glvar const vout::position ("gl_Position"); - glvar const vout::point_size ("gl_PointSize"); - glvar const vout::clip_vertex ("gl_ClipVertex"); - glvar const vout::front_color ("gl_FontColor"); - glvar const vout::back_color ("gl_BackColor"); - glvar const vout::front_secondary_color ("gl_FrontSecondaryColor"); - glvar const vout::back_secondary_color ("gl_BackSecondaryColor"); - glvar const vout::tex_coord[8] = + gluvar const vout::position ("gl_Position"); + gluvar const vout::point_size ("gl_PointSize"); + gluvar const vout::clip_vertex ("gl_ClipVertex"); + gluvar const vout::front_color ("gl_FontColor"); + gluvar const vout::back_color ("gl_BackColor"); + gluvar const vout::front_secondary_color ("gl_FrontSecondaryColor"); + gluvar const vout::back_secondary_color ("gl_BackSecondaryColor"); + gluvar const vout::tex_coord[8] = { - glvar ("gl_TexCoord[0]"), glvar ("gl_TexCoord[1]"), glvar ("gl_TexCoord[2]"), glvar ("gl_TexCoord[3]"), - glvar ("gl_TexCoord[4]"), glvar ("gl_TexCoord[5]"), glvar ("gl_TexCoord[6]"), glvar ("gl_TexCoord[7]"), + gluvar ("gl_TexCoord[0]"), gluvar ("gl_TexCoord[1]"), gluvar ("gl_TexCoord[2]"), gluvar ("gl_TexCoord[3]"), + gluvar ("gl_TexCoord[4]"), gluvar ("gl_TexCoord[5]"), gluvar ("gl_TexCoord[6]"), gluvar ("gl_TexCoord[7]"), }; - glvar const vout::fog_frag_coord ("gl_FogFragCoord"); + gluvar const vout::fog_frag_coord ("gl_FogFragCoord"); struct fin fin; - glvar const fin::frag_coord ("gl_FragCoord"); - glvar const fin::front_facing ("gl_FrontFacing"); - glvar const fin::color ("gl_Color"); - glvar const fin::secondary_color ("gl_SecondaryColor"); - glvar const fin::tex_coord[8] = + gluvar const fin::frag_coord ("gl_FragCoord"); + gluvar const fin::front_facing ("gl_FrontFacing"); + gluvar const fin::color ("gl_Color"); + gluvar const fin::secondary_color ("gl_SecondaryColor"); + gluvar const fin::tex_coord[8] = { - glvar ("gl_TexCoord[0]"), glvar ("gl_TexCoord[1]"), glvar ("gl_TexCoord[2]"), glvar ("gl_TexCoord[3]"), - glvar ("gl_TexCoord[4]"), glvar ("gl_TexCoord[5]"), glvar ("gl_TexCoord[6]"), glvar ("gl_TexCoord[7]"), + gluvar ("gl_TexCoord[0]"), gluvar ("gl_TexCoord[1]"), gluvar ("gl_TexCoord[2]"), gluvar ("gl_TexCoord[3]"), + gluvar ("gl_TexCoord[4]"), gluvar ("gl_TexCoord[5]"), gluvar ("gl_TexCoord[6]"), gluvar ("gl_TexCoord[7]"), }; - glvar const fin::fog_frag_coord ("gl_FogFragCoord"); + gluvar const fin::fog_frag_coord ("gl_FogFragCoord"); struct fout fout; - glvar const fout::frag_color ("gl_FragColor"); - glvar const fout::frag_depth ("gl_FragDepth"); - glvar const fout::frag_data[2] = { glvar ("gl_FragData[0]"), glvar ("gl_FragData[1]") }; - - uniform_matrix_4f gl::model_view_matrix ("gl_ModelViewMatrix"), - gl::projection_matrix ("gl_ProjectionMatrix"), - gl::model_view_projection_matrix ("gl_ModelViewProjectionMatrix"), - gl::texture_matrix[8] = - { - uniform_matrix_4f ("gl_TextureMatrix[0]"), uniform_matrix_4f ("gl_TextureMatrix[1]"), - uniform_matrix_4f ("gl_TextureMatrix[2]"), uniform_matrix_4f ("gl_TextureMatrix[3]"), - uniform_matrix_4f ("gl_TextureMatrix[4]"), uniform_matrix_4f ("gl_TextureMatrix[5]"), - uniform_matrix_4f ("gl_TextureMatrix[6]"), uniform_matrix_4f ("gl_TextureMatrix[7]"), - }; - uniform_matrix_4f gl::model_view_matrix_inverse ("gl_ModelViewMatrixInverse"), - gl::projection_matrix_inverse ("gl_ProjectionMatrixInverse"), - gl::model_view_projection_matrix_inverse ("gl_ModelViewProjectionMatrixInverse"), - gl::texture_matrix_inverse[8] = - { - uniform_matrix_4f ("gl_TextureMatrixInverse[0]"), uniform_matrix_4f ("gl_TextureMatrixInverse[1]"), - uniform_matrix_4f ("gl_TextureMatrixInverse[2]"), uniform_matrix_4f ("gl_TextureMatrixInverse[3]"), - uniform_matrix_4f ("gl_TextureMatrixInverse[4]"), uniform_matrix_4f ("gl_TextureMatrixInverse[5]"), - uniform_matrix_4f ("gl_TextureMatrixInverse[6]"), uniform_matrix_4f ("gl_TextureMatrixInverse[7]"), - }; - uniform_matrix_4f gl::model_view_matrix_transpose ("gl_ModelViewMatrixTranspose"), - gl::projection_matrix_transpose ("gl_ProjectionMatrixTranspose"), - gl::model_view_projection_matrix_transpose ("gl_ModelViewProjectionMatrixTranspose"), - gl::texture_matrix_transpose[8] = - { - uniform_matrix_4f ("gl_TextureMatrixTranspose[0]"), uniform_matrix_4f ("gl_TextureMatrixTranspose[1]"), - uniform_matrix_4f ("gl_TextureMatrixTranspose[2]"), uniform_matrix_4f ("gl_TextureMatrixTranspose[3]"), - uniform_matrix_4f ("gl_TextureMatrixTranspose[4]"), uniform_matrix_4f ("gl_TextureMatrixTranspose[5]"), - uniform_matrix_4f ("gl_TextureMatrixTranspose[6]"), uniform_matrix_4f ("gl_TextureMatrixTranspose[7]"), - }; - uniform_matrix_4f gl::model_view_matrix_inverse_transpose ("gl_ModelViewMatrixInverseTranspose"), - gl::projection_matrix_inverse_transpose ("gl_ProjectionMatrixInverseTranspose"), - gl::model_view_projection_matrix_inverse_transpose ("gl_ModelViewProjectionMatrixInverseTranspose"), - gl::texture_matrix_inverse_transpose[8] = - { - uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[0]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[1]"), - uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[2]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[3]"), - uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[4]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[5]"), - uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[6]"), uniform_matrix_4f ("gl_TextureMatrixInverseTranspose[7]"), - }; - - uniform_matrix_3f gl::normal_matrix ("gl_NormalMatrix"); - - uniform_1f gl::normal_scale ("gl_NormalScale"); - uniform_1f gl::depth_range_near ("gl_DepthRange.near"), - gl::depth_range_far ("gl_DepthRange.far"), - gl::depth_range_diff ("gl_DepthRange.diff"); - - uniform_4f gl::clip_plane[2] = { uniform_4f ("gl_ClipPlane[0]"), uniform_4f ("gl_ClipPlane[1]") }; - - uniform_4f gl::front_material_emission ("gl_FrontMaterialEmission"), - gl::front_material_ambient ("gl_FrontMaterialAmbient"), - gl::front_material_diffuse ("gl_FrontMaterialDiffuse"), - gl::front_material_specular ("gl_FrontMaterialSpecular"), - gl::front_material_shininess ("gl_FrontMaterialShininess"); - uniform_4f gl::back_material_emission ("gl_BackMaterialEmission"), - gl::back_material_ambient ("gl_BackMaterialAmbient"), - gl::back_material_diffuse ("gl_BackMaterialDiffuse"), - gl::back_material_specular ("gl_BackMaterialSpecular"), - gl::back_material_shininess ("gl_BackMaterialShininess"); - - uniform_4f gl::light_model_ambient ("gl_LightModel.ambient"); - uniform_4f gl::front_light_model_product_scene_color ("gl_FrontLightModelProduct.sceneColor"); - uniform_4f gl::back_light_model_product_scene_color ("gl_BackLightModelProduct.sceneColor"); + gluvar const fout::frag_color ("gl_FragColor"); + gluvar const fout::frag_depth ("gl_FragDepth"); + gluvar const fout::frag_data[2] = { gluvar ("gl_FragData[0]"), gluvar ("gl_FragData[1]") }; + + gluvar gl::model_view_matrix ("gl_ModelViewMatrix"), + gl::projection_matrix ("gl_ProjectionMatrix"), + gl::model_view_projection_matrix ("gl_ModelViewProjectionMatrix"), + gl::texture_matrix[8] = + { + gluvar ("gl_TextureMatrix[0]"), gluvar ("gl_TextureMatrix[1]"), + gluvar ("gl_TextureMatrix[2]"), gluvar ("gl_TextureMatrix[3]"), + gluvar ("gl_TextureMatrix[4]"), gluvar ("gl_TextureMatrix[5]"), + gluvar ("gl_TextureMatrix[6]"), gluvar ("gl_TextureMatrix[7]"), + }; + gluvar gl::model_view_matrix_inverse ("gl_ModelViewMatrixInverse"), + gl::projection_matrix_inverse ("gl_ProjectionMatrixInverse"), + gl::model_view_projection_matrix_inverse ("gl_ModelViewProjectionMatrixInverse"), + gl::texture_matrix_inverse[8] = + { + gluvar ("gl_TextureMatrixInverse[0]"), gluvar ("gl_TextureMatrixInverse[1]"), + gluvar ("gl_TextureMatrixInverse[2]"), gluvar ("gl_TextureMatrixInverse[3]"), + gluvar ("gl_TextureMatrixInverse[4]"), gluvar ("gl_TextureMatrixInverse[5]"), + gluvar ("gl_TextureMatrixInverse[6]"), gluvar ("gl_TextureMatrixInverse[7]"), + }; + gluvar gl::model_view_matrix_transpose ("gl_ModelViewMatrixTranspose"), + gl::projection_matrix_transpose ("gl_ProjectionMatrixTranspose"), + gl::model_view_projection_matrix_transpose ("gl_ModelViewProjectionMatrixTranspose"), + gl::texture_matrix_transpose[8] = + { + gluvar ("gl_TextureMatrixTranspose[0]"), gluvar ("gl_TextureMatrixTranspose[1]"), + gluvar ("gl_TextureMatrixTranspose[2]"), gluvar ("gl_TextureMatrixTranspose[3]"), + gluvar ("gl_TextureMatrixTranspose[4]"), gluvar ("gl_TextureMatrixTranspose[5]"), + gluvar ("gl_TextureMatrixTranspose[6]"), gluvar ("gl_TextureMatrixTranspose[7]"), + }; + gluvar gl::model_view_matrix_inverse_transpose ("gl_ModelViewMatrixInverseTranspose"), + gl::projection_matrix_inverse_transpose ("gl_ProjectionMatrixInverseTranspose"), + gl::model_view_projection_matrix_inverse_transpose ("gl_ModelViewProjectionMatrixInverseTranspose"), + gl::texture_matrix_inverse_transpose[8] = + { + gluvar ("gl_TextureMatrixInverseTranspose[0]"), gluvar ("gl_TextureMatrixInverseTranspose[1]"), + gluvar ("gl_TextureMatrixInverseTranspose[2]"), gluvar ("gl_TextureMatrixInverseTranspose[3]"), + gluvar ("gl_TextureMatrixInverseTranspose[4]"), gluvar ("gl_TextureMatrixInverseTranspose[5]"), + gluvar ("gl_TextureMatrixInverseTranspose[6]"), gluvar ("gl_TextureMatrixInverseTranspose[7]"), + }; + + gluvar gl::normal_matrix ("gl_NormalMatrix"); + + gluvar gl::normal_scale ("gl_NormalScale"); + gluvar gl::depth_range_near ("gl_DepthRange.near"), + gl::depth_range_far ("gl_DepthRange.far"), + gl::depth_range_diff ("gl_DepthRange.diff"); + + gluvar gl::clip_plane[2] = { gluvar ("gl_ClipPlane[0]"), gluvar ("gl_ClipPlane[1]") }; + + gluvar gl::front_material_emission ("gl_FrontMaterialEmission"), + gl::front_material_ambient ("gl_FrontMaterialAmbient"), + gl::front_material_diffuse ("gl_FrontMaterialDiffuse"), + gl::front_material_specular ("gl_FrontMaterialSpecular"), + gl::front_material_shininess ("gl_FrontMaterialShininess"); + gluvar gl::back_material_emission ("gl_BackMaterialEmission"), + gl::back_material_ambient ("gl_BackMaterialAmbient"), + gl::back_material_diffuse ("gl_BackMaterialDiffuse"), + gl::back_material_specular ("gl_BackMaterialSpecular"), + gl::back_material_shininess ("gl_BackMaterialShininess"); + + gluvar gl::light_model_ambient ("gl_LightModel.ambient"); + gluvar gl::front_light_model_product_scene_color ("gl_FrontLightModelProduct.sceneColor"); + gluvar gl::back_light_model_product_scene_color ("gl_BackLightModelProduct.sceneColor"); }