X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=4d3dac037291137856d28a77926e9517ac9475de;hb=4a577ddc946bd279d7bc4942a2ce4c46c7ef5d35;hp=de75420973134b3d0aa1d2e2275365778b407915;hpb=8e51e1e7089d79359ec584bb4292b6cb2ecfd495;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index de754209..4d3dac03 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,4 +1,3 @@
-#include <msp/io/memory.h>
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
@@ -51,6 +50,9 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 		throw invalid_operation("Texture2D::storage");
 	if(wd==0 || ht==0)
 		throw invalid_argument("Texture2D::storage");
+
+	if(MSP_sized_internal_formats)
+		fmt = get_sized_pixelformat(fmt);
 	require_pixelformat(fmt);
 
 	ifmt = fmt;
@@ -63,7 +65,8 @@ void Texture2D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	image(level, base_fmt, get_alloc_type(base_fmt), 0);
 }
 
 void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -98,14 +101,6 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 }
 
-void Texture2D::load_image(const string &fn, bool srgb)
-{
-	Graphics::Image img;
-	img.load_file(fn);
-
-	image(img, srgb);
-}
-
 void Texture2D::image(const Graphics::Image &img, bool srgb)
 {
 	image(img, srgb, false);
@@ -117,12 +112,7 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
 	unsigned h = img.get_height();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-	{
-		PixelFormat f = storage_pixelformat_from_graphics(img.get_format());
-		if(srgb)
-			f = get_srgb_pixelformat(f);
-		storage(f, w, h);
-	}
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h);
 	else if(w!=width || h!=height)
 		throw incompatible_data("Texture2D::image");
 
@@ -179,19 +169,8 @@ Texture2D::Loader::Loader(Texture2D &t, Collection &c):
 
 void Texture2D::Loader::init()
 {
-	add("image_data", &Loader::image_data);
 	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
-	add("storage", &Loader::storage_b);
-}
-
-void Texture2D::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 Texture2D::Loader::raw_data(const string &data)
@@ -206,11 +185,6 @@ void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 	obj.storage(fmt, w, h);
 }
 
-void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
-{
-	storage(fmt, w, h);
-}
-
 
 Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
 	texture(t),