X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=8ca8e336c0d18dc3f0efb08b31914824570f36c4;hb=3137e87b72823bc4227d4382c157867b19aacb49;hp=ea1f30d2aea724cc9e9b10e2bcdf531accc48bb7;hpb=70b3d2475f229809b59d559ffaf4f95e8ea58f28;p=libs%2Fgl.git

diff --git a/source/program.cpp b/source/program.cpp
index ea1f30d2..8ca8e336 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -1,4 +1,6 @@
 #include <algorithm>
+#include <msp/core/hash.h>
+#include <msp/strings/format.h>
 #include "arb_shader_objects.h"
 #include "arb_vertex_shader.h"
 #include "error.h"
@@ -71,20 +73,27 @@ const char *standard_fragment_src[] =
 	/* XXX This is incorrect with normal mapping, since the vectors are in TBN
 	space but environment map is expected to be in eye space */
 	"e",   "\tvec4 reflection = textureCube(environment, n_normal*(dot(n_normal, v_eye_dir)*2.0)-v_eye_dir);\n",
-	 0,    "\tgl_FragColor = ",
-	"!t!l!m", "vec4(1.0, 1.0, 1.0, 1.0)",
-	"t",     "texture2D(texture, v_texcoord)",
+	"t",   "\tvec4 tex_sample = texture2D(texture, v_texcoord);\n",
+	 0,    "\tgl_FragColor.rgb = ",
+	"!t!l!m", "vec3(1.0)",
+	"t",     "tex_sample.rgb",
 	"l|mt",  "*",
-	"!lm",   "v_color",
+	"!lm",   "v_color.rgb",
 	"l",     "((l_diffuse",
-	"lm",    "*gl_FrontLightProduct[0].diffuse",
+	"lm",    "*gl_FrontLightProduct[0].diffuse.rgb",
 	"p",     "+l_specular",
-	"pm",    "*gl_FrontLightProduct[0].specular",
+	"pm",    "*gl_FrontLightProduct[0].specular.rgb",
 	"l",     ")",
 	"s",     "*l_shadow",
-	"lm",    "+gl_FrontLightModelProduct.sceneColor",
+	"lm",    "+gl_FrontLightModelProduct.sceneColor.rgb",
 	"l",     ")",
-	"e",     "+reflection*reflectivity",
+	"e",     "+reflection.rgb*reflectivity",
+	 0,      ";\n",
+	 0,    "\tgl_FragColor.a = ",
+	"!m",    "1.0",
+	"!lm",   "v_color.a",
+	"lm",    "gl_FrontMaterial.diffuse.a",
+	"t",     "*tex_sample.a",
 	 0,      ";\n",
 	 0,    "}\n",
 	0, 0
@@ -128,7 +137,7 @@ void Program::init()
 
 Program::~Program()
 {
-	for(list<Shader *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
+	for(ShaderList::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
 		delete *i;
 	glDeleteObjectARB(id);
 }
@@ -151,7 +160,7 @@ void Program::attach_shader_owned(Shader *shader)
 
 void Program::detach_shader(Shader &shader)
 {
-	list<Shader *>::iterator i = remove(shaders.begin(), shaders.end(), &shader);
+	ShaderList::iterator i = remove(shaders.begin(), shaders.end(), &shader);
 	if(i!=shaders.end())
 	{
 		shaders.erase(i, shaders.end());
@@ -213,7 +222,7 @@ void Program::bind_attribute(unsigned index, const string &name)
 
 void Program::link()
 {
-	for(list<Shader *>::iterator i=shaders.begin(); i!=shaders.end(); ++i)
+	for(ShaderList::iterator i=shaders.begin(); i!=shaders.end(); ++i)
 		if(!(*i)->is_compiled())
 			(*i)->compile();
 
@@ -239,6 +248,16 @@ void Program::link()
 			uniforms[name] = info;
 		}
 	}
+
+	string layout_descriptor;
+	for(map<string, UniformInfo>::const_iterator i = uniforms.begin(); i!=uniforms.end(); ++i)
+		if(i->second.location>=0)
+		{
+			if(!layout_descriptor.empty())
+				layout_descriptor += '\n';
+			layout_descriptor += format("%d:%s:%x", i->second.location, i->second.name, i->second.type);
+		}
+	uniform_layout_hash = hash32(layout_descriptor);
 }
 
 string Program::get_info_log() const
@@ -252,20 +271,9 @@ string Program::get_info_log() const
 	return log;
 }
 
-void Program::bind() const
-{
-	if(!linked)
-		throw invalid_operation("Program::bind");
-
-	if(!set_current(this))
-		return;
-
-	glUseProgramObjectARB(id);
-}
-
 int Program::get_uniform_location(const string &n) const
 {
-	map<string, UniformInfo>::const_iterator i = uniforms.find(n);
+	UniformMap::const_iterator i = uniforms.find(n);
 	if(i==uniforms.end())
 	{
 		if(n[n.size()-1]==']')
@@ -288,6 +296,17 @@ int Program::get_uniform_location(const string &n) const
 	return i->second.location;
 }
 
+void Program::bind() const
+{
+	if(!linked)
+		throw invalid_operation("Program::bind");
+
+	if(!set_current(this))
+		return;
+
+	glUseProgramObjectARB(id);
+}
+
 void Program::unbind()
 {
 	if(!set_current(0))