X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=820dd10fd90318c64278ae9b0aed66cf227d8743;hp=185ed7feea582b53194e7a7a61183845b576f065;hb=7af837734a28a14b3e24a421187d12ecd16572d0;hpb=34a4efa81946066d32c1374318dcc0b74ae486a9

diff --git a/source/texture.cpp b/source/texture.cpp
index 185ed7fe..820dd10f 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)
@@ -292,7 +301,7 @@ void Texture::load_image(const string &fn, bool srgb)
 	image(img, srgb);
 }
 
-void Texture::bind_to(unsigned i) const
+void Texture::bind_to(unsigned i, bool legacy) const
 {
 	if(!id)
 	{
@@ -305,22 +314,30 @@ void Texture::bind_to(unsigned i) const
 		}
 	}
 
+	legacy = (legacy && is_legacy_target(target));
+
 	TexUnit &unit = TexUnit::get_unit(i);
 	const Texture *old = unit.get_texture();
-	if(unit.set_texture(this))
+	bool old_legacy = unit.get_texture_legacy();
+	if(unit.set_texture(this, legacy))
 	{
 		if(manager)
 			manager->resource_used(*this);
 
-		unit.bind();
-		if(unit.supports_legacy())
+		if(ARB_direct_state_access && !old_legacy && (!unit.supports_legacy() || !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 && old_legacy)
+					glDisable(old->target);
+				if((!old || old->target!=target) && legacy)
+					glEnable(target);
+			}
+			glBindTexture(target, id);
 		}
-		glBindTexture(target, id);
 
 		if(dirty_params)
 		{
@@ -339,15 +356,26 @@ void Texture::unbind_from(unsigned i)
 {
 	TexUnit &unit = TexUnit::get_unit(i);
 	const Texture *cur = unit.get_texture();
+	bool legacy = unit.get_texture_legacy();
 	if(unit.set_texture(0))
 	{
-		unit.bind();
-		glBindTexture(cur->target, 0);
-		if(unit.supports_legacy())
-			glDisable(cur->target);
+		if(ARB_direct_state_access && !legacy)
+			glBindTextureUnit(i, 0);
+		else
+		{
+			unit.bind();
+			glBindTexture(cur->target, 0);
+			if(unit.supports_legacy() && legacy)
+				glDisable(cur->target);
+		}
 	}
 }
 
+bool Texture::is_legacy_target(GLenum target)
+{
+	return target<GL_TEXTURE_1D_ARRAY;
+}
+
 
 Texture::Loader::Loader(Texture &t):
 	DataFile::CollectionObjectLoader<Texture>(t, 0)