X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=703ea96c5fabfddb2cb8b33c65cb8056df205f16;hb=99e833421259dd90b164a9c49d63c936c343c65f;hp=7983cfb50e5c4272f76c2ceb9e1c3a5628639635;hpb=78840e775c62c1b6e3f550bf8be1f0b828df91aa;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index 7983cfb5..703ea96c 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -18,15 +18,17 @@ 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
+	GL_RED, GL_RED, GL_RED, GL_GREEN,
+	GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA
 };
 
 Texture::Texture(GLenum t, ResourceManager *m):
 	id(0),
 	target(t),
-	ifmt(RGB),
+	format(RGB8),
+	storage_fmt(RGB8),
+	swizzle(NO_SWIZZLE),
 	auto_gen_mipmap(false),
-	dirty_params(0),
 	default_sampler(*this)
 {
 	if(m)
@@ -46,82 +48,60 @@ Texture::~Texture()
 		glDeleteTextures(1, &id);
 }
 
-DataType Texture::get_alloc_type(PixelFormat fmt)
-{
-	return (get_base_pixelformat(fmt)==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
-}
-
-void Texture::set_internal_format(PixelFormat fmt)
+void Texture::set_format(PixelFormat fmt)
 {
+	PixelComponents comp = get_components(fmt);
+	PixelComponents st_comp = comp;
 	FormatSwizzle swiz = NO_SWIZZLE;
-	if(ARB_texture_rg && ARB_texture_swizzle)
+	switch(comp)
 	{
-		if(fmt==LUMINANCE)
-		{
-			fmt = RED;
-			swiz = R_TO_LUMINANCE;
-		}
-		else if(fmt==LUMINANCE_ALPHA)
-		{
-			fmt = RG;
-			swiz = RG_TO_LUMINANCE_ALPHA;
-		}
+	case LUMINANCE:
+		st_comp = RED;
+		swiz = R_TO_LUMINANCE;
+		break;
+	case LUMINANCE_ALPHA:
+		st_comp = RG;
+		swiz = RG_TO_LUMINANCE_ALPHA;
+		break;
+	case BGR:
+		st_comp = RGB;
+		swiz = RGB_TO_BGR;
+		break;
+	case BGRA:
+		st_comp = RGBA;
+		swiz = RGB_TO_BGR;
+		break;
+	default:;
 	}
 
-	if(!get_component_size(fmt) && OES_required_internalformat)
-		fmt = get_default_sized_pixelformat(fmt);
+	PixelFormat st_fmt = make_pixelformat(st_comp, get_component_type(fmt));
+	require_pixelformat(st_fmt);
+	if(swiz!=NO_SWIZZLE)
+		static Require _req(ARB_texture_swizzle);
 
-	require_pixelformat(fmt);
-	ifmt = fmt;
+	format = fmt;
+	storage_fmt = st_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
+void Texture::apply_swizzle()
 {
-	if(!id)
-	{
-		dirty_params |= mask;
+	if(swizzle==NO_SWIZZLE)
 		return;
-	}
 
-	if(!ARB_direct_state_access && TexUnit::current().get_texture()!=this)
+	if(get_gl_api()==OPENGL_ES2)
 	{
-		TexUnit *unit = TexUnit::find_unit(this);
-		if(!unit)
-		{
-			dirty_params |= mask;
-			return;
-		}
-
-		unit->bind();
+		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]);
 	}
-
-	if(mask&FORMAT_SWIZZLE)
+	else
 	{
-		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]);
-		}
+		if(ARB_direct_state_access)
+			glTextureParameteriv(id, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
 		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);
-		}
+			glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
 	}
 }
 
@@ -133,14 +113,6 @@ void Texture::set_parameter_i(GLenum param, int value) const
 		glTexParameteri(target, param, value);
 }
 
-void Texture::set_parameter_f(GLenum param, float value) const
-{
-	if(ARB_direct_state_access)
-		glTextureParameterf(id, param, value);
-	else
-		glTexParameterf(target, param, value);
-}
-
 void Texture::set_min_filter(TextureFilter f)
 {
 	default_sampler.set_min_filter(f);
@@ -266,12 +238,6 @@ void Texture::bind_to(unsigned i) const
 			glBindTexture(target, id);
 		}
 
-		if(dirty_params)
-		{
-			update_parameter(dirty_params);
-			dirty_params = 0;
-		}
-
 		default_sampler.bind_to(i);
 	}
 }
@@ -340,14 +306,18 @@ unsigned Texture::Loader::get_levels() const
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-void Texture::Loader::external_image(const string &fn)
+void Texture::Loader::load_external_image(Graphics::Image &img, const std::string &fn)
 {
-	Graphics::Image img;
 	RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
 	if(!io)
 		throw IO::file_not_found(fn);
 	img.load_io(*io);
+}
 
+void Texture::Loader::external_image(const string &fn)
+{
+	Graphics::Image img;
+	load_external_image(img, fn);
 	obj.image(img, get_levels(), srgb);
 }