Initialize Texture's format to an invalid value

[libs/gl.git] / source / core / texture.cpp

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index 5c82dbe535d91a3036c4eed0f0f3e4d93a2e2fdb..877e4d10c38f6ab60d64fd7166e4e56d5d1f2674 100644 (file)
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -13,7 +13,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 +26,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)
@@ -147,11 +147,6 @@ void Texture::generate_mipmap()
        }
 }
 
-void Texture::load_image(const string &fn, bool)
-{
-       load_image(fn, 0U);
-}
-
 void Texture::load_image(const string &fn, unsigned lv)
 {
        Graphics::Image img;
@@ -160,11 +155,6 @@ void Texture::load_image(const string &fn, unsigned lv)
        image(img, lv);
 }
 
-void Texture::image(const Graphics::Image &img, bool)
-{
-       image(img, 0U);
-}
-
 void Texture::set_debug_name(const string &name)
 {
 #ifdef DEBUG