X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fpbrmaterial.cpp;h=ebd3321f2268a05054c05f086c035e5b88fdb39a;hb=6d2e2a0bb28496a8c25b441009bdd2a1a1e72d81;hp=5dc1b55c67f83b80779ae3e19f61dfe6523f845c;hpb=ce3658993ce2f6b7527a04a36a5e1af349c6f2e9;p=libs%2Fgl.git

diff --git a/source/materials/pbrmaterial.cpp b/source/materials/pbrmaterial.cpp
index 5dc1b55c..ebd3321f 100644
--- a/source/materials/pbrmaterial.cpp
+++ b/source/materials/pbrmaterial.cpp
@@ -36,7 +36,7 @@ const Texture2D &PbrMaterial::get_or_create_fresnel_lookup()
 {
 	Resources &resources = Resources::get_global();
 
-	static const string name = "_pbr_fresnel_lookup.tex2d";
+	static const string name = "_pbr_fresnel_lookup.tex";
 	Texture2D *fresnel_lookup = resources.find<Texture2D>(name);
 	if(fresnel_lookup)
 		return *fresnel_lookup;
@@ -52,12 +52,14 @@ const Texture2D &PbrMaterial::get_or_create_fresnel_lookup()
 	shdata.uniform("roughness", 0.0f);
 
 	const Mesh &mesh = resources.get<Mesh>("_fullscreen_quad.mesh");
-	Framebuffer fresnel_lookup_fbo;
-	fresnel_lookup_fbo.attach(COLOR_ATTACHMENT0, *fresnel_lookup);
+	Framebuffer fresnel_lookup_fbo((COLOR_ATTACHMENT,RG8));
+	fresnel_lookup_fbo.attach(COLOR_ATTACHMENT, *fresnel_lookup);
 	Renderer renderer;
+	renderer.begin();
 	renderer.set_framebuffer(&fresnel_lookup_fbo);
 	renderer.set_shader_program(&shprog, &shdata);
 	mesh.draw(renderer);
+	renderer.end();
 
 	return *fresnel_lookup;
 }
@@ -160,12 +162,6 @@ void PbrMaterial::set_emission_map(const Texture *tex)
 
 DataFile::Loader::ActionMap PbrMaterial::Loader::shared_actions;
 
-PbrMaterial::Loader::Loader(PbrMaterial &m):
-	DerivedObjectLoader<PbrMaterial, Material::PropertyLoader<PbrMaterial> >(m)
-{
-	set_actions(shared_actions);
-}
-
 PbrMaterial::Loader::Loader(PbrMaterial &m, Collection &c):
 	DerivedObjectLoader<PbrMaterial, Material::PropertyLoader<PbrMaterial> >(m, c)
 {