X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=772f2d16e8b578fac2fbadbb6ef0f3da6f6f8954;hb=2ed67ce59027c34f0ae78118d82c70eb1577e949;hp=c367397fb76bb19d2392b17971b915b1a31ea9a8;hpb=84bc56b96c21c831104a22e0cbd0f3b72ab5d8c3;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index c367397f..772f2d16 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,65 +1,387 @@
-#include <msp/core/error.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_texture_swizzle.h>
+#include <msp/gl/extensions/ext_framebuffer_object.h>
+#include <msp/io/memory.h>
+#include "bindable.h"
+#include "error.h"
+#include "resourcemanager.h"
+#include "resources.h"
 #include "texture.h"
 #include "texunit.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
-void Texture::bind() const
+int Texture::swizzle_orders[] =
 {
-	if(!target)
-		throw InvalidState("Attempt to bind a texture without target");
+	GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA,
+	GL_RED, GL_RED, GL_RED, GL_ONE,
+	GL_RED, GL_RED, GL_RED, GL_GREEN
+};
 
-	const Texture *cur=TexUnit::current().get_texture();
-	if(cur && cur->target!=target)
-		glDisable(cur->target);
-	if(!cur || cur->target!=target)
-		glEnable(target);
-	glBindTexture(target, id);
-	TexUnit::current().set_texture(this);
+Texture::Texture(GLenum t, ResourceManager *m):
+	id(0),
+	target(t),
+	ifmt(RGB),
+	swizzle(NO_SWIZZLE),
+	auto_gen_mipmap(false),
+	default_sampler(*this)
+{
+	if(m)
+		set_manager(m);
+	else if(ARB_direct_state_access)
+		glCreateTextures(target, 1, &id);
+	else
+		glGenTextures(1, &id);
 }
 
-void Texture::parameter(GLenum param, int value)
+Texture::~Texture()
 {
-	maybe_bind();
+	while(TexUnit *unit = TexUnit::find_unit(this))
+		unbind_from(unit->get_index());
+
+	if(id)
+		glDeleteTextures(1, &id);
+}
 
-	glTexParameteri(target, param, value);
+DataType Texture::get_alloc_type(PixelFormat fmt)
+{
+	return (get_base_pixelformat(fmt)==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
 }
 
-void Texture::parameter(GLenum param, float value)
+void Texture::set_internal_format(PixelFormat fmt)
 {
-	maybe_bind();
+	FormatSwizzle swiz = NO_SWIZZLE;
+	switch(get_base_pixelformat(fmt))
+	{
+	case LUMINANCE:
+		fmt = RED;
+		swiz = R_TO_LUMINANCE;
+		break;
+	case LUMINANCE_ALPHA:
+		fmt = RG;
+		swiz = RG_TO_LUMINANCE_ALPHA;
+		break;
+	default:;
+	}
 
-	glTexParameterf(target, param, value);
+	if(!get_component_size(fmt) && OES_required_internalformat)
+		fmt = get_default_sized_pixelformat(fmt);
+
+	require_pixelformat(fmt);
+	if(swiz!=NO_SWIZZLE)
+		static Require _req(ARB_texture_swizzle);
+	ifmt = fmt;
+	swizzle = swiz;
 }
 
-Texture::~Texture()
+PixelFormat Texture::get_upload_format(PixelFormat fmt) const
 {
-	glDeleteTextures(1, &id);
+	if(fmt==LUMINANCE || fmt==LUMINANCE_ALPHA)
+		return get_base_pixelformat(ifmt);
+	else
+		return fmt;
 }
 
-void Texture::unbind()
+void Texture::apply_swizzle()
 {
-	const Texture *cur=TexUnit::current().get_texture();
-	if(!cur)
+	if(swizzle==NO_SWIZZLE)
 		return;
 
-	glBindTexture(cur->target, 0);
-	glDisable(cur->target);
-	TexUnit::current().set_texture(0);
+	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
+{
+	if(ARB_direct_state_access)
+		glTextureParameteri(id, param, value);
+	else
+		glTexParameteri(target, param, value);
+}
+
+void Texture::set_min_filter(TextureFilter f)
+{
+	default_sampler.set_min_filter(f);
+}
+
+void Texture::set_mag_filter(TextureFilter f)
+{
+	default_sampler.set_mag_filter(f);
+}
+
+void Texture::set_filter(TextureFilter f)
+{
+	default_sampler.set_filter(f);
+}
+
+void Texture::set_max_anisotropy(float a)
+{
+	default_sampler.set_max_anisotropy(a);
+}
+
+void Texture::set_wrap(TextureWrap w)
+{
+	default_sampler.set_wrap(w);
+}
+
+void Texture::set_wrap_s(TextureWrap w)
+{
+	default_sampler.set_wrap_s(w);
+}
+
+void Texture::set_wrap_t(TextureWrap w)
+{
+	default_sampler.set_wrap_t(w);
+}
+
+void Texture::set_wrap_r(TextureWrap w)
+{
+	default_sampler.set_wrap_r(w);
+}
+
+bool Texture::can_generate_mipmap()
+{
+	return EXT_framebuffer_object;
+}
+
+void Texture::generate_mipmap()
+{
+	// glGenerateMipmap is defined here
+	static Require _req(EXT_framebuffer_object);
+
+	if(ARB_direct_state_access)
+		glGenerateTextureMipmap(id);
+	else
+	{
+		BindRestore _bind(this);
+		glGenerateMipmap(target);
+	}
+}
+
+void Texture::set_auto_generate_mipmap(bool gm)
+{
+	if(gm)
+		static Require _req(EXT_framebuffer_object);
+
+	auto_gen_mipmap = gm;
+}
+
+void Texture::set_compare_enabled(bool c)
+{
+	if(c)
+		default_sampler.set_compare(default_sampler.get_compare_function());
+	else
+		default_sampler.disable_compare();
+}
+
+void Texture::set_compare_func(Predicate f)
+{
+	default_sampler.set_compare(f);
+}
+
+void Texture::load_image(const string &fn, bool srgb)
+{
+	load_image(fn, 0, srgb);
+}
+
+void Texture::load_image(const string &fn, unsigned lv, bool srgb)
+{
+	Graphics::Image img;
+	img.load_file(fn);
+
+	image(img, lv, srgb);
+}
+
+void Texture::image(const Graphics::Image &img, bool srgb)
+{
+	image(img, 0, srgb);
+}
+
+void Texture::bind_to(unsigned i) const
+{
+	if(!id)
+	{
+		if(manager)
+			manager->resource_used(*this);
+		if(!id)
+		{
+			unbind_from(i);
+			return;
+		}
+	}
+
+	TexUnit &unit = TexUnit::get_unit(i);
+	if(unit.set_texture(this))
+	{
+		if(manager)
+			manager->resource_used(*this);
+
+		if(ARB_direct_state_access)
+			glBindTextureUnit(i, id);
+		else
+		{
+			unit.bind();
+			glBindTexture(target, id);
+		}
+
+		default_sampler.bind_to(i);
+	}
+}
+
+const Texture *Texture::current(unsigned i)
+{
+	return TexUnit::get_unit(i).get_texture();
+}
+
+void Texture::unbind_from(unsigned i)
+{
+	TexUnit &unit = TexUnit::get_unit(i);
+	const Texture *cur = unit.get_texture();
+	if(unit.set_texture(0))
+	{
+		if(ARB_direct_state_access)
+			glBindTextureUnit(i, 0);
+		else
+		{
+			unit.bind();
+			glBindTexture(cur->target, 0);
+		}
+	}
+}
+
+
+Texture::Loader::Loader(Texture &t):
+	DataFile::CollectionObjectLoader<Texture>(t, 0)
+{
+	init();
+}
+
+Texture::Loader::Loader(Texture &t, Collection &c):
+	DataFile::CollectionObjectLoader<Texture>(t, &c)
+{
+	init();
+}
+
+void Texture::Loader::init()
+{
+	levels = 0;
+	if(Resources *res = dynamic_cast<Resources *>(coll))
+		srgb = res->get_srgb_conversion();
+	else
+		srgb = false;
+
+	add("external_image", &Loader::external_image);
+	add("filter", &Loader::filter);
+	add("generate_mipmap", &Loader::generate_mipmap);
+	add("image_data", &Loader::image_data);
+	add("mag_filter", &Loader::mag_filter);
+	add("max_anisotropy", &Loader::max_anisotropy);
+	add("min_filter", &Loader::min_filter);
+	add("mipmap_levels", &Loader::mipmap_levels);
+	add("sampler",    &Loader::sampler);
+	add("wrap",       &Loader::wrap);
+	add("wrap_r",     &Loader::wrap_r);
+	add("wrap_s",     &Loader::wrap_s);
+	add("wrap_t",     &Loader::wrap_t);
+}
+
+unsigned Texture::Loader::get_levels() const
+{
+	return (is_mipmapped(obj.default_sampler.get_min_filter()) ? levels : 1);
+}
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+void Texture::Loader::external_image(const 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);
+
+	obj.image(img, get_levels(), srgb);
+}
+
+void Texture::Loader::filter(TextureFilter f)
+{
+	obj.set_filter(f);
+}
+
+void Texture::Loader::generate_mipmap(bool gm)
+{
+	obj.set_auto_generate_mipmap(gm);
+}
+
+void Texture::Loader::image_data(const string &data)
+{
+	Graphics::Image img;
+	IO::Memory mem(data.data(), data.size());
+	img.load_io(mem);
+
+	obj.image(img, get_levels(), srgb);
+}
+
+void Texture::Loader::mag_filter(TextureFilter f)
+{
+	obj.set_mag_filter(f);
+}
+
+void Texture::Loader::max_anisotropy(float a)
+{
+	obj.set_max_anisotropy(a);
+}
+
+void Texture::Loader::min_filter(TextureFilter f)
+{
+	obj.set_min_filter(f);
+}
+
+void Texture::Loader::mipmap_levels(unsigned l)
+{
+	levels = l;
+}
+
+void Texture::Loader::sampler()
+{
+	load_sub(obj.default_sampler);
+}
+
+void Texture::Loader::wrap(TextureWrap w)
+{
+	obj.set_wrap(w);
+}
+
+void Texture::Loader::wrap_r(TextureWrap w)
+{
+	obj.set_wrap_r(w);
 }
 
-Texture::Texture():
-	target(0)
+void Texture::Loader::wrap_s(TextureWrap w)
 {
-	glGenTextures(1, &id);
+	obj.set_wrap_s(w);
 }
 
-void Texture::maybe_bind() const
+void Texture::Loader::wrap_t(TextureWrap w)
 {
-	if(TexUnit::current().get_texture()!=this)
-		bind();
+	obj.set_wrap_t(w);
 }
+#pragma GCC diagnostic pop
 
 } // namespace GL
 } // namespace Msp