Have Object provide an identity matrix from get_matrix

[libs/gl.git] / source / texture2d.cpp

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 4d6e32f5550cd6f48ee68c71d957278b7ffe355e..45c2e665d056973ee4ecdb41eb6033dd831c2b5b 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,3 +1,5 @@
+#include <msp/core/raii.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include "bindable.h"
 #include "buffer.h"
@@ -34,7 +36,6 @@ public:
 
 Texture2D::Texture2D(ResourceManager *m):
        Texture(GL_TEXTURE_2D, m),
-       ifmt(RGB),
        width(0),
        height(0),
        allocated(0)
@@ -45,33 +46,40 @@ Texture2D::~Texture2D()
        set_manager(0);
 }
 
-void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 {
        if(width>0)
                throw invalid_operation("Texture2D::storage");
        if(wd==0 || ht==0)
                throw invalid_argument("Texture2D::storage");
 
-       if(MSP_sized_internal_formats)
-               fmt = get_sized_pixelformat(fmt);
-       require_pixelformat(fmt);
-
-       ifmt = fmt;
+       set_internal_format(fmt);
        width = wd;
        height = ht;
+       levels = get_n_levels();
+       if(lv>0)
+               levels = min(levels, lv);
 }
 
 void Texture2D::allocate(unsigned level)
 {
+       if(width==0 || height==0)
+               throw invalid_operation("Texture2D::allocate");
+       if(level>=levels)
+               throw invalid_argument("Texture2D::allocate");
        if(allocated&(1<<level))
                return;
 
        if(ARB_texture_storage)
        {
-               BindRestore _bind(this);
-               unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
-               glTexStorage2D(target, n_levels, ifmt, width, height);
-               allocated |= (1<<n_levels)-1;
+               if(ARB_direct_state_access)
+                       glTextureStorage2D(id, levels, ifmt, width, height);
+               else
+               {
+                       BindRestore _bind(this);
+                       glTexStorage2D(target, levels, ifmt, width, height);
+               }
+               allocated |= (1<<levels)-1;
        }
        else
        {
@@ -89,11 +97,11 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
        unsigned h = height;
        get_level_size(level, w, h);
 
-       BindRestore _bind(this);
        if(ARB_texture_storage)
                return sub_image(level, 0, 0, w, h, fmt, type, data);
 
-       glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
+       BindRestore _bind(this);
+       glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
@@ -108,10 +116,14 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
        if(width==0 || height==0)
                throw invalid_operation("Texture2D::sub_image");
 
+       Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
-       BindRestore _bind(this);
-       glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+       fmt = get_upload_format(fmt);
+       if(ARB_direct_state_access)
+               glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
+       else
+               glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 
        if(gen_mipmap && level==0)
                auto_generate_mipmap();
@@ -128,7 +140,10 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
        unsigned h = img.get_height();
        PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(width==0)
-               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h);
+       {
+               unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, l);
+       }
        else if(w!=width || h!=height)
                throw incompatible_data("Texture2D::image");
 
@@ -166,7 +181,7 @@ Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res)
 
 UInt64 Texture2D::get_data_size() const
 {
-       return id ? width*height*get_component_count(ifmt) : 0;
+       return id ? width*height*get_pixel_size(ifmt) : 0;
 }
 
 void Texture2D::unload()