X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;h=b5b989a81c88a631abdfc2dbe2993196ac5e39c0;hb=6065f6622cc275dc0b20baaf7c267e71169d18f3;hp=0fc300e0a09e7b4659aefe3bb842228797f6f3b1;hpb=4e9fe48180c7b4646ac2591e172de61f7a693b32;p=libs%2Fgl.git

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 0fc300e0..b5b989a8 100644
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -1,6 +1,6 @@
-#include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
+#include <msp/gl/extensions/arb_vertex_buffer_object.h>
 #include <msp/graphics/imageloader.h>
 #include "buffer.h"
 #include "error.h"
@@ -118,13 +118,6 @@ void Texture2D::image(unsigned level, const void *data)
 	allocated |= 1<<level;
 }
 
-void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture2D::image");
-	image(level, data);
-}
-
 void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
 {
 	if(width==0 || height==0)
@@ -145,13 +138,6 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	}
 }
 
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture2D::sub_image");
-	sub_image(level, x, y, wd, ht, data);
-}
-
 void Texture2D::image(const Graphics::Image &img, unsigned lv)
 {
 	image(img, lv, false);
@@ -193,7 +179,7 @@ Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
 	return ldr;
 }
 
-UInt64 Texture2D::get_data_size() const
+uint64_t Texture2D::get_data_size() const
 {
 	return id ? width*height*get_pixel_size(format) : 0;
 }