Rework PixelComponents and PixelFormat to use custom values

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

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 71c736f04da4ecb7971d22461434169445614f6b..feff9f9883f3f1b39921193fd75eb4c4e5effde4 100644 (file)
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -2,7 +2,6 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/msp_texture1d.h>
-#include "bindable.h"
 #include "error.h"
 #include "texture1d.h"
 
@@ -43,21 +42,37 @@ void Texture1D::allocate(unsigned level)
                throw invalid_operation("Texture1D::allocate");
        if(level>=levels)
                throw invalid_argument("Texture1D::allocate");
+
+       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 Texture1D::allocate_(unsigned level)
+{
        if(allocated&(1<<level))
                return;
 
        if(ARB_texture_storage)
        {
-               Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+               GLenum fmt = get_gl_pixelformat(storage_fmt);
                if(ARB_direct_state_access)
-                       glTextureStorage1D(id, levels, storage_fmt, width);
+                       glTextureStorage1D(id, levels, fmt, width);
                else
-                       glTexStorage1D(target, levels, storage_fmt, width);
+                       glTexStorage1D(target, levels, fmt, width);
                apply_swizzle();
                allocated |= (1<<levels)-1;
        }
        else
-               image(level, 0);
+               image_(level, 0);
 }
 
 void Texture1D::image(unsigned level, const void *data)
@@ -67,29 +82,37 @@ void Texture1D::image(unsigned level, const void *data)
        if(level>=levels)
                throw out_of_range("Texture1D::image");
 
-       unsigned w = get_level_size(level);
-
        if(ARB_texture_storage)
-               return sub_image(level, 0, w, data);
+               return sub_image(level, 0, get_level_size(level), data);
+
+       glActiveTexture(GL_TEXTURE0);
+       glBindTexture(target, id);
+
+       image_(level, data);
+
+       if(auto_gen_mipmap && level==0)
+       {
+               generate_mipmap_();
+               allocated |= (1<<levels)-1;
+       }
 
-       BindRestore _bind(this);
+       glBindTexture(target, 0);
+}
 
+void Texture1D::image_(unsigned level, const void *data)
+{
        if(!allocated)
        {
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
                apply_swizzle();
        }
 
-       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));
-       glTexImage1D(target, level, storage_fmt, w, 0, comp, type, data);
+       glTexImage1D(target, level, fmt, get_level_size(level), 0, comp, type, data);
 
        allocated |= 1<<level;
-       if(auto_gen_mipmap && level==0)
-       {
-               generate_mipmap();
-               allocated |= (1<<levels)-1;
-       }
 }
 
 void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -106,10 +129,16 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
        if(level>=levels)
                throw out_of_range("Texture1D::sub_image");
 
-       Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
-       allocate(level);
+       bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
+       if(!direct)
+       {
+               glActiveTexture(GL_TEXTURE0);
+               glBindTexture(target, id);
+       }
+
+       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)
                glTextureSubImage1D(id, level, x, wd, comp, type, data);
@@ -117,7 +146,10 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
                glTexSubImage1D(target, level, x, wd, comp, type, data);
 
        if(auto_gen_mipmap && level==0)
-               generate_mipmap();
+               generate_mipmap_();
+
+       if(!direct)
+               glBindTexture(target, 0);
 }
 
 void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)