X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=c27e850676b83153de81ef09b4d76282e481e091;hb=e6077f9f25b794c174e1017c2c0763e77a6fddda;hp=bbda89b622f78b51038b8e8fd6123274d24a4e14;hpb=6065f6622cc275dc0b20baaf7c267e71169d18f3;p=libs%2Fgl.git

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index bbda89b6..c27e8506 100644
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -5,7 +5,6 @@
 #include <msp/io/memory.h>
 #include "error.h"
 #include "resourcemanager.h"
-#include "resources.h"
 #include "texture.h"
 
 using namespace std;
@@ -13,7 +12,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-int Texture::swizzle_orders[] =
+const int Texture::swizzle_orders[] =
 {
 	GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA,
 	GL_RED, GL_RED, GL_RED, GL_ONE,
@@ -26,8 +25,8 @@ Texture *Texture::scratch_binding = 0;
 Texture::Texture(GLenum t, ResourceManager *m):
 	id(0),
 	target(t),
-	format(RGB8),
-	storage_fmt(RGB8),
+	format(NO_PIXELFORMAT),
+	storage_fmt(format),
 	swizzle(NO_SWIZZLE),
 	use_srgb_format(false),
 	auto_gen_mipmap(false)
@@ -109,7 +108,7 @@ void Texture::apply_swizzle()
 	if(swizzle==NO_SWIZZLE)
 		return;
 
-	if(get_gl_api()==OPENGL_ES2)
+	if(get_backend_api()==OPENGL_ES)
 	{
 		set_parameter_i(GL_TEXTURE_SWIZZLE_R, swizzle_orders[swizzle*4]);
 		set_parameter_i(GL_TEXTURE_SWIZZLE_G, swizzle_orders[swizzle*4+1]);
@@ -125,7 +124,7 @@ void Texture::apply_swizzle()
 	}
 }
 
-void Texture::set_parameter_i(GLenum param, int value) const
+void Texture::set_parameter_i(unsigned param, int value) const
 {
 	if(ARB_direct_state_access)
 		glTextureParameteri(id, param, value);