Run a tighter ship with extensions

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

diff --git a/source/texture.cpp b/source/texture.cpp
index cf08ac6371ceeacad9f362a49b3970d887e3398f..187c2533acbea6fc9e30c33370ffb99ca2a15a18 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,3 +1,5 @@
+#include <msp/gl/extensions/arb_shadow.h>
+#include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/gl/extensions/ext_texture_filter_anisotropic.h>
 #include <msp/gl/extensions/sgis_generate_mipmap.h>
 #include <msp/strings/format.h>
@@ -99,7 +101,7 @@ void Texture::update_parameter(int mask) const
        if(mask&WRAP_R)
                glTexParameteri(target, GL_TEXTURE_WRAP_R, wrap_r);
        if(mask&GENERATE_MIPMAP)
-               glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, gen_mipmap);
+               glTexParameteri(target, GL_GENERATE_MIPMAP, gen_mipmap);
        if(mask&COMPARE)
                glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
        if(mask&COMPARE_FUNC)
@@ -138,7 +140,8 @@ void Texture::set_wrap(TextureWrap w)
 {
        set_wrap_s(w);
        set_wrap_t(w);
-       set_wrap_r(w);
+       if(EXT_texture3D)
+               set_wrap_r(w);
 }
 
 void Texture::set_wrap_s(TextureWrap w)
@@ -155,6 +158,7 @@ void Texture::set_wrap_t(TextureWrap w)
 
 void Texture::set_wrap_r(TextureWrap w)
 {
+       static Require _req(EXT_texture3D);
        wrap_r = w;
        update_parameter(WRAP_R);
 }
@@ -169,12 +173,14 @@ void Texture::set_generate_mipmap(bool gm)
 
 void Texture::set_compare_enabled(bool c)
 {
+       static Require _req(ARB_shadow);
        compare = c;
        update_parameter(COMPARE);
 }
 
 void Texture::set_compare_func(Predicate f)
 {
+       static Require _req(ARB_shadow);
        cmp_func = f;
        update_parameter(COMPARE_FUNC);
 }