Change some class names

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

diff --git a/source/texture.cpp b/source/texture.cpp
index b528ca30f5b6ccaee0ac81c0e78e86226f345a1a..1d2ece8074410ded753c621f4c4dd43418e2694d 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,4 +1,6 @@
+#include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_shadow.h>
+#include <msp/gl/extensions/arb_texture_swizzle.h>
 #include <msp/gl/extensions/ext_framebuffer_object.h>
 #include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/gl/extensions/ext_texture_filter_anisotropic.h>
@@ -48,9 +50,17 @@ void operator>>(const LexicalConverter &c, TextureWrap &tw)
 }
 
 
+int Texture::swizzle_orders[] =
+{
+       GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA,
+       GL_RED, GL_RED, GL_RED, GL_ONE,
+       GL_RED, GL_RED, GL_RED, GL_GREEN
+};
+
 Texture::Texture(GLenum t, ResourceManager *m):
        id(0),
        target(t),
+       ifmt(RGB),
        min_filter(NEAREST_MIPMAP_LINEAR),
        mag_filter(LINEAR),
        wrap_s(REPEAT),
@@ -63,6 +73,8 @@ Texture::Texture(GLenum t, ResourceManager *m):
 {
        if(m)
                set_manager(m);
+       else if(ARB_direct_state_access)
+               glCreateTextures(target, 1, &id);
        else
                glGenTextures(1, &id);
 }
@@ -81,9 +93,44 @@ DataType Texture::get_alloc_type(PixelFormat fmt)
        return (get_base_pixelformat(fmt)==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
 }
 
+void Texture::set_internal_format(PixelFormat fmt)
+{
+       if(!get_component_size(fmt) && OES_required_internalformat)
+               fmt = get_default_sized_pixelformat(fmt);
+
+       FormatSwizzle swiz = NO_SWIZZLE;
+       if(ARB_texture_rg && ARB_texture_swizzle)
+       {
+               if(fmt==LUMINANCE8 || fmt==SLUMINANCE8)
+               {
+                       fmt = R8;
+                       swiz = R_TO_LUMINANCE;
+               }
+               else if(fmt==LUMINANCE8_ALPHA8 || fmt==SLUMINANCE8_ALPHA8)
+               {
+                       fmt = RG8;
+                       swiz = RG_TO_LUMINANCE_ALPHA;
+               }
+       }
+
+       require_pixelformat(fmt);
+       ifmt = fmt;
+       swizzle = swiz;
+       if(swizzle)
+               update_parameter(FORMAT_SWIZZLE);
+}
+
+PixelFormat Texture::get_upload_format(PixelFormat fmt) const
+{
+       if(fmt==LUMINANCE || fmt==LUMINANCE_ALPHA)
+               return get_base_pixelformat(ifmt);
+       else
+               return fmt;
+}
+
 void Texture::update_parameter(int mask) const
 {
-       if(TexUnit::current().get_texture()!=this)
+       if(!ARB_direct_state_access && TexUnit::current().get_texture()!=this)
        {
                TexUnit *unit = TexUnit::find_unit(this);
                if(!unit)
@@ -96,23 +143,56 @@ void Texture::update_parameter(int mask) const
        }
 
        if(mask&MIN_FILTER)
-               glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
+               set_parameter_i(GL_TEXTURE_MIN_FILTER, min_filter);
        if(mask&MAG_FILTER)
-               glTexParameteri(target, GL_TEXTURE_MAG_FILTER, mag_filter);
+               set_parameter_i(GL_TEXTURE_MAG_FILTER, mag_filter);
        if(mask&MAX_ANISOTROPY)
-               glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
+               set_parameter_f(GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
        if(mask&WRAP_S)
-               glTexParameteri(target, GL_TEXTURE_WRAP_S, wrap_s);
+               set_parameter_i(GL_TEXTURE_WRAP_S, wrap_s);
        if(mask&WRAP_T)
-               glTexParameteri(target, GL_TEXTURE_WRAP_T, wrap_t);
+               set_parameter_i(GL_TEXTURE_WRAP_T, wrap_t);
        if(mask&WRAP_R)
-               glTexParameteri(target, GL_TEXTURE_WRAP_R, wrap_r);
+               set_parameter_i(GL_TEXTURE_WRAP_R, wrap_r);
        if(mask&GENERATE_MIPMAP)
-               glTexParameteri(target, GL_GENERATE_MIPMAP, gen_mipmap);
+               set_parameter_i(GL_GENERATE_MIPMAP, gen_mipmap);
        if(mask&COMPARE)
-               glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
+               set_parameter_i(GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
        if(mask&COMPARE_FUNC)
-               glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func);
+               set_parameter_i(GL_TEXTURE_COMPARE_FUNC, cmp_func);
+       if(mask&FORMAT_SWIZZLE)
+       {
+               if(get_gl_api()==OPENGL_ES2)
+               {
+                       set_parameter_i(GL_TEXTURE_SWIZZLE_R, swizzle_orders[swizzle*4]);
+                       set_parameter_i(GL_TEXTURE_SWIZZLE_G, swizzle_orders[swizzle*4+1]);
+                       set_parameter_i(GL_TEXTURE_SWIZZLE_B, swizzle_orders[swizzle*4+2]);
+                       set_parameter_i(GL_TEXTURE_SWIZZLE_A, swizzle_orders[swizzle*4+3]);
+               }
+               else
+               {
+                       if(ARB_direct_state_access)
+                               glTextureParameteriv(id, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
+                       else
+                               glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
+               }
+       }
+}
+
+void Texture::set_parameter_i(GLenum param, int value) const
+{
+       if(ARB_direct_state_access)
+               glTextureParameteri(id, param, value);
+       else
+               glTexParameteri(target, param, value);
+}
+
+void Texture::set_parameter_f(GLenum param, float value) const
+{
+       if(ARB_direct_state_access)
+               glTextureParameterf(id, param, value);
+       else
+               glTexParameterf(target, param, value);
 }
 
 void Texture::set_min_filter(TextureFilter f)
@@ -170,22 +250,29 @@ void Texture::set_wrap_r(TextureWrap w)
        update_parameter(WRAP_R);
 }
 
+bool Texture::can_generate_mipmap()
+{
+       return (EXT_framebuffer_object || SGIS_generate_mipmap);
+}
+
 void Texture::set_generate_mipmap(bool gm)
 {
-       if(gm)
+       if(gm && !EXT_framebuffer_object)
                static Require _req(SGIS_generate_mipmap);
        gen_mipmap = gm;
-       if(get_gl_api()!=OPENGL_ES2)
+       if(!EXT_framebuffer_object)
                update_parameter(GENERATE_MIPMAP);
 }
 
 void Texture::auto_generate_mipmap()
 {
-       if(get_gl_api()==OPENGL_ES2)
+       // glGenerateMipmap is defined here
+       if(EXT_framebuffer_object)
        {
-               // glGenerateMipmap is defined here
-               static Require _req(EXT_framebuffer_object);
-               glGenerateMipmap(target);
+               if(ARB_direct_state_access)
+                       glGenerateTextureMipmap(id);
+               else
+                       glGenerateMipmap(target);
        }
 }