X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshadowmap.cpp;h=25b0d6d66f4345246f120b2087c9766fd71143d3;hb=6a4907898281b738111e0c6527cc46f8810dc123;hp=7a761e7ad2bf15c6e35a5576f645f2980ab441c7;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index 7a761e7a..25b0d6d6 100644
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -28,17 +28,14 @@ ShadowMap::ShadowMap(unsigned s, const Scene &c, const Light &l):
 	radius(1)
 {
 	depth_buf.set_min_filter(LINEAR);
+	depth_buf.set_compare_enabled(true);
+	depth_buf.set_compare_func(LEQUAL);
+	depth_buf.set_wrap(CLAMP_TO_EDGE);
 	depth_buf.storage(DEPTH_COMPONENT, size, size, 0);
 	depth_buf.image(0, DEPTH_COMPONENT, UNSIGNED_BYTE, 0);
-	depth_buf.parameter(GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE);
-	depth_buf.parameter(GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE);
-	depth_buf.parameter(GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
-	depth_buf.parameter(GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	depth_buf.parameter(GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 	fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
 	draw_buffer(NO_BUFFER);
 	Framebuffer::unbind();
-	Texture::unbind();
 }
 
 void ShadowMap::set_target(const Vector3 &t, float r)
@@ -146,8 +143,7 @@ void ShadowMap::prepare()
 
 void ShadowMap::cleanup()
 {
-	TexUnit::activate(unit);
-	Texture::unbind();
+	Texture::unbind_from(unit);
 	disable(GL_TEXTURE_GEN_S);
 	disable(GL_TEXTURE_GEN_T);
 	disable(GL_TEXTURE_GEN_R);