X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexture.cpp;h=f095fe98aadcb99500ecad562275027453d14dcf;hb=7a2427020ec6ead73258aeb326dfb7e0121520f9;hp=18746e5f2ecad265652b12804c2ec927e5d13fcd;hpb=1955e583d7eeeb0a2ff054d90c3694f575d9a08d;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index 18746e5f..f095fe98 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -63,6 +63,7 @@ Texture::Texture(GLenum t, ResourceManager *m):
 	ifmt(RGB),
 	min_filter(NEAREST_MIPMAP_LINEAR),
 	mag_filter(LINEAR),
+	max_anisotropy(1.0f),
 	wrap_s(REPEAT),
 	wrap_t(REPEAT),
 	wrap_r(REPEAT),
@@ -95,11 +96,8 @@ DataType Texture::get_alloc_type(PixelFormat fmt)
 
 void Texture::set_internal_format(PixelFormat fmt)
 {
-	if(!get_component_size(fmt) && MSP_sized_internal_formats)
-	{
-		unsigned size = (fmt==DEPTH_COMPONENT ? get_gl_api()==OPENGL_ES2 ? 2 : 4 : 1);
-		fmt = get_sized_pixelformat(fmt, size);
-	}
+	if(!get_component_size(fmt) && OES_required_internalformat)
+		fmt = get_default_sized_pixelformat(fmt);
 
 	FormatSwizzle swiz = NO_SWIZZLE;
 	if(ARB_texture_rg && ARB_texture_swizzle)
@@ -165,10 +163,20 @@ void Texture::update_parameter(int mask) const
 		set_parameter_i(GL_TEXTURE_COMPARE_FUNC, cmp_func);
 	if(mask&FORMAT_SWIZZLE)
 	{
-		if(ARB_direct_state_access)
-			glTextureParameteriv(id, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
+		if(get_gl_api()==OPENGL_ES2)
+		{
+			set_parameter_i(GL_TEXTURE_SWIZZLE_R, swizzle_orders[swizzle*4]);
+			set_parameter_i(GL_TEXTURE_SWIZZLE_G, swizzle_orders[swizzle*4+1]);
+			set_parameter_i(GL_TEXTURE_SWIZZLE_B, swizzle_orders[swizzle*4+2]);
+			set_parameter_i(GL_TEXTURE_SWIZZLE_A, swizzle_orders[swizzle*4+3]);
+		}
 		else
-			glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
+		{
+			if(ARB_direct_state_access)
+				glTextureParameteriv(id, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
+			else
+				glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
+		}
 	}
 }
 
@@ -213,7 +221,8 @@ void Texture::set_max_anisotropy(float a)
 	else if(a>1.0f)
 		static Require _req(EXT_texture_filter_anisotropic);
 	max_anisotropy = a;
-	update_parameter(MAX_ANISOTROPY);
+	if(EXT_texture_filter_anisotropic)
+		update_parameter(MAX_ANISOTROPY);
 }
 
 void Texture::set_wrap(TextureWrap w)
@@ -243,6 +252,11 @@ void Texture::set_wrap_r(TextureWrap w)
 	update_parameter(WRAP_R);
 }
 
+bool Texture::can_generate_mipmap()
+{
+	return (EXT_framebuffer_object || SGIS_generate_mipmap);
+}
+
 void Texture::set_generate_mipmap(bool gm)
 {
 	if(gm && !EXT_framebuffer_object)
@@ -307,15 +321,20 @@ void Texture::bind_to(unsigned i) const
 		if(manager)
 			manager->resource_used(*this);
 
-		unit.bind();
-		if(unit.supports_legacy())
+		if(ARB_direct_state_access && !unit.supports_legacy())
+			glBindTextureUnit(i, id);
+		else
 		{
-			if(old && old->target!=target)
-				glDisable(old->target);
-			if(!old || old->target!=target)
-				glEnable(target);
+			unit.bind();
+			if(unit.supports_legacy())
+			{
+				if(old && old->target!=target)
+					glDisable(old->target);
+				if((!old || old->target!=target))
+					glEnable(target);
+			}
+			glBindTexture(target, id);
 		}
-		glBindTexture(target, id);
 
 		if(dirty_params)
 		{
@@ -336,10 +355,15 @@ void Texture::unbind_from(unsigned i)
 	const Texture *cur = unit.get_texture();
 	if(unit.set_texture(0))
 	{
-		unit.bind();
-		glBindTexture(cur->target, 0);
-		if(unit.supports_legacy())
-			glDisable(cur->target);
+		if(ARB_direct_state_access && !unit.supports_legacy())
+			glBindTextureUnit(i, 0);
+		else
+		{
+			unit.bind();
+			glBindTexture(cur->target, 0);
+			if(unit.supports_legacy())
+				glDisable(cur->target);
+		}
 	}
 }