X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=a2c6c8eb62725c21ce21553cf30926b01fe127e8;hb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;hp=5c7f61029c3c736eb3245e99b559b29c7e79f2aa;hpb=a92362ad19b65f66b98e0dc4d034da5e4eb5cf36;p=libs%2Fgl.git

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 5c7f6102..a2c6c8eb 100644
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -5,7 +5,6 @@
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
-#include "bindable.h"
 #include "error.h"
 #include "texturecube.h"
 
@@ -81,34 +80,23 @@ void TextureCube::allocate(unsigned level)
 	if(allocated&(64<<level))
 		return;
 
-	bool direct = ARB_texture_storage && ARB_direct_state_access;
-	if(!direct)
-	{
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(target, id);
-	}
-
-	allocate_(level);
-
-	if(!direct)
-		glBindTexture(target, 0);
-}
-
-void TextureCube::allocate_(unsigned level)
-{
 	if(ARB_texture_storage)
 	{
+		GLenum fmt = get_gl_pixelformat(storage_fmt);
 		if(ARB_direct_state_access)
-			glTextureStorage2D(id, levels, storage_fmt, size, size);
+			glTextureStorage2D(id, levels, fmt, size, size);
 		else
-			glTexStorage2D(target, levels, storage_fmt, size, size);
+		{
+			bind_scratch();
+			glTexStorage2D(target, levels, fmt, size, size);
+		}
 		apply_swizzle();
 		allocated |= (64<<levels)-1;
 	}
 	else
 	{
 		for(unsigned i=0; i<6; ++i)
-			image_(enumerate_faces(i), level, 0);
+			image(enumerate_faces(i), level, 0);
 	}
 }
 
@@ -119,50 +107,40 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 	if(level>=levels)
 		throw out_of_range("TextureCube::image");
 
+	unsigned lsz = get_level_size(level);
+
 	if(ARB_texture_storage)
-	{
-		unsigned lsz = get_level_size(level);
 		return sub_image(face, level, 0, 0, lsz, lsz, data);
-	}
 
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(target, id);
-
-	image_(face, level, data);
-
-	if(auto_gen_mipmap && level==0 && (allocated&63)==63)
-	{
-		generate_mipmap_();
-		allocated |= (64<<levels)-1;
-	}
-
-	glBindTexture(target, 0);
-}
-
-void TextureCube::image_(TextureCubeFace face, unsigned level, const void *data)
-{
 	if(!allocated)
 	{
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
 		apply_swizzle();
 	}
 
-	unsigned lsz = get_level_size(level);
-	PixelComponents comp = get_components(storage_fmt);
+	GLenum fmt = get_gl_pixelformat(storage_fmt);
+	GLenum comp = get_gl_components(get_components(storage_fmt));
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
-	glTexImage2D(face, level, storage_fmt, lsz, lsz, 0, comp, type, data);
+	glTexImage2D(face, level, fmt, lsz, lsz, 0, comp, type, data);
 
 	if(level==0)
 	{
 		allocated |= 1<<get_face_index(face);
 		if((allocated&63)==63)
+		{
 			allocated |= 64;
+			if(auto_gen_mipmap && level==0 && (allocated&63)==63)
+			{
+				generate_mipmap();
+				allocated |= (64<<levels)-1;
+			}
+		}
 	}
 	else if(!(allocated&(64<<level)))
 	{
 		for(unsigned i=0; i<6; ++i)
 			if(enumerate_faces(i)!=face)
-				glTexImage2D(enumerate_faces(i), level, storage_fmt, lsz, lsz, 0, comp, type, 0);
+				glTexImage2D(enumerate_faces(i), level, fmt, lsz, lsz, 0, comp, type, 0);
 
 		allocated |= 64<<level;
 	}
@@ -182,27 +160,20 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 	if(level>=levels)
 		throw out_of_range("TextureCube::sub_image");
 
-	bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
-	if(!direct)
-	{
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(target, id);
-	}
-
-	allocate_(level);
+	allocate(level);
 
-	PixelComponents comp = get_components(storage_fmt);
+	GLenum comp = get_gl_components(get_components(storage_fmt));
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
 	if(ARB_direct_state_access)
 		glTextureSubImage3D(id, level, x, y, get_face_index(face), wd, ht, 1, comp, type, data);
 	else
+	{
+		bind_scratch();
 		glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
+	}
 
 	if(auto_gen_mipmap && level==0)
-		generate_mipmap_();
-
-	if(!direct)
-		glBindTexture(target, 0);
+		generate_mipmap();
 }
 
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)