X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=d8fe22ed14542fe8ce93fe670daeed566f122448;hb=e1672476c5a258ff67fe1fcb47dd9a40b89169cb;hp=4dcdaf5ef8969070ccd19001cab0f40e374bde47;hpb=41264797bc55f27411555b3c217a80c791154afc;p=libs%2Fgl.git

diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp
index 4dcdaf5e..d8fe22ed 100644
--- a/source/programbuilder.cpp
+++ b/source/programbuilder.cpp
@@ -58,7 +58,8 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
 	{ FRAGMENT, "rgb_surface", "vec3", "rgb_lit_surface", "l" },
 	{ FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb", "!s" },
 	{ FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb*l_shadow", "s" },
-	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse", "!m" },
+	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse", "!m!t" },
+	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse*tex_sample.rgb", "!mt" },
 	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse", "m!p" },
 	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse+rgb_surface_specular", "mp" },
 
@@ -105,8 +106,7 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
 	{ FRAGMENT, "tex_sample", "vec4", "texture2D(texture, texture_coord)", 0 },
 
 	{ VERTEX, "gl_Position", "vec4", "projection_matrix*eye_vertex", 0 },
-	{ VERTEX, "shd_vertex", "vec3", "vec3(dot(eye_vertex, gl_EyePlaneS[shadow_unit]), dot(eye_vertex, gl_EyePlaneT[shadow_unit]), dot(eye_vertex, gl_EyePlaneR[shadow_unit]))", "g" },
-	{ VERTEX, "shd_vertex", "vec3", "(shd_eye_matrix*eye_vertex).xyz", "!g" },
+	{ VERTEX, "shd_vertex", "vec3", "(shd_eye_matrix*eye_vertex).xyz", 0 },
 	{ VERTEX, "tbn_sky_dir", "vec3", "eye_sky_dir*eye_tbn_matrix", "n" },
 	{ VERTEX, "tbn_light_dir[i]", "vec3", "eye_light_dir[i]*eye_tbn_matrix", 0 },
 	{ VERTEX, "eye_light_dir[i]", "vec3", "normalize(eye_light_position[i].xyz-eye_vertex.xyz*eye_light_position[i].w)", 0 },
@@ -127,20 +127,19 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
 	{ ATTRIBUTE, "tangent", "vec3", 0, 0 },
 	{ ATTRIBUTE, "binormal", "vec3", 0, 0 },
 
-	{ UNIFORM, "ShadowMap::shadow_unit", "int", 0, 0 },
 	{ UNIFORM, "texture", "sampler2D", 0, 0 },
 	{ UNIFORM, "shadow", "sampler2DShadow", 0, 0 },
 	{ UNIFORM, "ShadowMap::shadow_darkness", "float", 0, 0 },
 	{ UNIFORM, "normalmap", "sampler2D", 0, 0 },
 	{ UNIFORM, "environment", "samplerCube", 0, 0 },
 	{ UNIFORM, "EnvMap::env_eye_matrix", "mat3", 0, 0 },
-	{ UNIFORM, "EnvMap::reflectivity", "float", 0, 0 },
-	{ UNIFORM, "eye_obj_matrix", "mat4", "gl_ModelViewMatrix", 0 },
-	{ UNIFORM, "eye_obj_normal_matrix", "mat3", "gl_NormalMatrix", 0 },
-	{ UNIFORM, "projection_matrix", "mat4", "gl_ProjectionMatrix", 0 },
+	{ UNIFORM, "Material::reflectivity", "float", 0, 0 },
+	{ UNIFORM, "Transform::eye_obj_matrix", "mat4", "gl_ModelViewMatrix", 0 },
+	{ UNIFORM, "Transform::eye_obj_normal_matrix", "mat3", "gl_NormalMatrix", 0 },
+	{ UNIFORM, "Transform::projection_matrix", "mat4", "gl_ProjectionMatrix", 0 },
 	{ UNIFORM, "ShadowMap::shd_eye_matrix", "mat4", 0, 0 },
 	{ UNIFORM, "Lighting::light_sources", "LightSourceParameters[MAX_LIGHTS]", "gl_LightSource[i]", 0 },
-	{ UNIFORM, "Lighting::ambient_color", "vec4", 0, 0 },
+	{ UNIFORM, "Lighting::ambient_color", "vec4", "gl_LightModel.ambient", 0 },
 	{ UNIFORM, "Lighting::sky_color", "vec4", 0, 0 },
 	{ UNIFORM, "Lighting::eye_sky_dir", "vec3", 0, 0 },
 	{ UNIFORM, "Lighting::horizon_limit", "float", 0, 0 },
@@ -346,7 +345,10 @@ void ProgramBuilder::add_shaders(Program &prog) const
 
 	if(!features.legacy)
 	{
-		prog.bind_fragment_data(0, "frag_color");
+		// OpenGL ES does not support binding fragment shader outputs
+		if(get_gl_api()!=OPENGL_ES2)
+			prog.bind_fragment_data(0, "frag_color");
+
 		prog.bind_attribute(VERTEX4, "vertex");
 		if(features.lighting)
 			prog.bind_attribute(NORMAL3, "normal");
@@ -370,9 +372,17 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 
 	if(!features.legacy)
 	{
-		source += "#version 130\n";
-		if(use_blocks)
-			source += "#extension GL_ARB_uniform_buffer_object: require\n";
+		if(get_gl_api()==OPENGL_ES2)
+		{
+			if(use_blocks)
+				source += "#version 300 es\n";
+		}
+		else
+		{
+			source += "#version 130\n";
+			if(use_blocks)
+				source += "#extension GL_ARB_uniform_buffer_object: require\n";
+		}
 	}
 
 	set<const VariableDefinition *> declared_types;