X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=820dd10fd90318c64278ae9b0aed66cf227d8743;hp=21fc7a6ae9bb41711cf079795e752196c4a2e014;hb=3c46227c280bc4cd8a4487c648f2f080d5b4f7ea;hpb=cdf928f03f4d8383b8fa978abc4c255a850ec061

diff --git a/source/texture.cpp b/source/texture.cpp
index 21fc7a6a..820dd10f 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,5 +1,6 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_shadow.h>
+#include <msp/gl/extensions/arb_texture_swizzle.h>
 #include <msp/gl/extensions/ext_framebuffer_object.h>
 #include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/gl/extensions/ext_texture_filter_anisotropic.h>
@@ -49,12 +50,20 @@ void operator>>(const LexicalConverter &c, TextureWrap &tw)
 }
 
 
+int Texture::swizzle_orders[] =
+{
+	GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA,
+	GL_RED, GL_RED, GL_RED, GL_ONE,
+	GL_RED, GL_RED, GL_RED, GL_GREEN
+};
+
 Texture::Texture(GLenum t, ResourceManager *m):
 	id(0),
 	target(t),
 	ifmt(RGB),
 	min_filter(NEAREST_MIPMAP_LINEAR),
 	mag_filter(LINEAR),
+	max_anisotropy(1.0f),
 	wrap_s(REPEAT),
 	wrap_t(REPEAT),
 	wrap_r(REPEAT),
@@ -87,11 +96,37 @@ DataType Texture::get_alloc_type(PixelFormat fmt)
 
 void Texture::set_internal_format(PixelFormat fmt)
 {
-	if(MSP_sized_internal_formats)
-		fmt = get_sized_pixelformat(fmt);
+	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)
+	{
+		if(fmt==LUMINANCE8 || fmt==SLUMINANCE8)
+		{
+			fmt = R8;
+			swiz = R_TO_LUMINANCE;
+		}
+		else if(fmt==LUMINANCE8_ALPHA8 || fmt==SLUMINANCE8_ALPHA8)
+		{
+			fmt = RG8;
+			swiz = RG_TO_LUMINANCE_ALPHA;
+		}
+	}
 
 	require_pixelformat(fmt);
 	ifmt = fmt;
+	swizzle = swiz;
+	if(swizzle)
+		update_parameter(FORMAT_SWIZZLE);
+}
+
+PixelFormat Texture::get_upload_format(PixelFormat fmt) const
+{
+	if(fmt==LUMINANCE || fmt==LUMINANCE_ALPHA)
+		return get_base_pixelformat(ifmt);
+	else
+		return fmt;
 }
 
 void Texture::update_parameter(int mask) const
@@ -126,6 +161,23 @@ void Texture::update_parameter(int mask) const
 		set_parameter_i(GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
 	if(mask&COMPARE_FUNC)
 		set_parameter_i(GL_TEXTURE_COMPARE_FUNC, cmp_func);
+	if(mask&FORMAT_SWIZZLE)
+	{
+		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
+		{
+			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);
+		}
+	}
 }
 
 void Texture::set_parameter_i(GLenum param, int value) const
@@ -169,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)
@@ -199,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)
@@ -243,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)
 	{
@@ -256,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)
 		{
@@ -290,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)