X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=97a73d9e6f59c81b3f8ca5f85f55219a02476da7;hb=93fa68debcd6e416a1b20f43077f7a79525aaecb;hp=81373c97b8793bb99f66c5669e6bc7f761c5d7d9;hpb=e1672476c5a258ff67fe1fcb47dd9a40b89169cb;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index 81373c97..97a73d9e 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,7 +1,9 @@
 #include <msp/gl/extensions/arb_shadow.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>
 #include <msp/gl/extensions/sgis_generate_mipmap.h>
+#include <msp/io/memory.h>
 #include <msp/strings/format.h>
 #include "error.h"
 #include "resourcemanager.h"
@@ -74,6 +76,11 @@ Texture::~Texture()
 		glDeleteTextures(1, &id);
 }
 
+DataType Texture::get_alloc_type(PixelFormat fmt)
+{
+	return (fmt==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
+}
+
 void Texture::update_parameter(int mask) const
 {
 	if(TexUnit::current().get_texture()!=this)
@@ -168,12 +175,24 @@ void Texture::set_generate_mipmap(bool gm)
 	if(gm)
 		static Require _req(SGIS_generate_mipmap);
 	gen_mipmap = gm;
-	update_parameter(GENERATE_MIPMAP);
+	if(get_gl_api()!=OPENGL_ES2)
+		update_parameter(GENERATE_MIPMAP);
+}
+
+void Texture::auto_generate_mipmap()
+{
+	if(get_gl_api()==OPENGL_ES2)
+	{
+		// glGenerateMipmap is defined here
+		static Require _req(EXT_framebuffer_object);
+		glGenerateMipmap(target);
+	}
 }
 
 void Texture::set_compare_enabled(bool c)
 {
-	static Require _req(ARB_shadow);
+	if(c)
+		static Require _req(ARB_shadow);
 	compare = c;
 	update_parameter(COMPARE);
 }
@@ -185,6 +204,14 @@ void Texture::set_compare_func(Predicate f)
 	update_parameter(COMPARE_FUNC);
 }
 
+void Texture::load_image(const string &fn, bool srgb)
+{
+	Graphics::Image img;
+	img.load_file(fn);
+
+	image(img, srgb);
+}
+
 void Texture::bind_to(unsigned i) const
 {
 	if(!id)
@@ -261,9 +288,11 @@ void Texture::Loader::init()
 	else
 		srgb = false;
 
+	add("external_image", &Loader::external_image);
 	add("filter", &Loader::filter);
 	add("max_anisotropy", &Loader::max_anisotropy);
 	add("generate_mipmap", &Loader::generate_mipmap);
+	add("image_data", &Loader::image_data);
 	add("mag_filter", &Loader::mag_filter);
 	add("min_filter", &Loader::min_filter);
 	add("wrap",       &Loader::wrap);
@@ -272,6 +301,15 @@ void Texture::Loader::init()
 	add("wrap_t",     &Loader::wrap_t);
 }
 
+void Texture::Loader::external_image(const string &fn)
+{
+	Graphics::Image img;
+	RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
+	img.load_io(*io);
+
+	obj.image(img, srgb);
+}
+
 void Texture::Loader::filter(TextureFilter f)
 {
 	obj.set_filter(f);
@@ -282,6 +320,15 @@ void Texture::Loader::generate_mipmap(bool gm)
 	obj.set_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, srgb);
+}
+
 void Texture::Loader::mag_filter(TextureFilter f)
 {
 	obj.set_mag_filter(f);