Refactor VertexSetup format checking

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

diff --git a/source/core/sampler.cpp b/source/core/sampler.cpp
index 45db298064bce9ade85a978f52ed8bebd70d743a..5ea10c43f6657c13eb3d0fe88824602d09420988 100644 (file)
--- a/source/core/sampler.cpp
+++ b/source/core/sampler.cpp
@@ -7,7 +7,6 @@
 #include <msp/strings/format.h>
 #include "error.h"
 #include "sampler.h"
-#include "texture.h"
 
 using namespace std;
 
@@ -27,6 +26,8 @@ Sampler::Sampler():
        dirty_params(0)
 {
        Require _req(ARB_sampler_objects);
+       Require _req2(EXT_texture3D);
+       Require _req3(ARB_shadow);
        if(ARB_direct_state_access)
                glCreateSamplers(1, &id);
        else
@@ -92,8 +93,7 @@ void Sampler::set_wrap(TextureWrap w)
 {
        set_wrap_s(w);
        set_wrap_t(w);
-       if(EXT_texture3D)
-               set_wrap_r(w);
+       set_wrap_r(w);
 }
 
 void Sampler::set_wrap_s(TextureWrap w)
@@ -110,7 +110,6 @@ void Sampler::set_wrap_t(TextureWrap w)
 
 void Sampler::set_wrap_r(TextureWrap w)
 {
-       static Require _req(EXT_texture3D);
        wrap_r = w;
        dirty_params |= WRAP_R;
 }
@@ -129,7 +128,6 @@ void Sampler::disable_compare()
 
 void Sampler::set_compare(Predicate f)
 {
-       static Require _req(ARB_shadow);
        compare = true;
        cmp_func = f;
        dirty_params |= COMPARE;
@@ -218,7 +216,7 @@ bool is_mipmapped(TextureFilter filter)
                filter==LINEAR_MIPMAP_NEAREST || filter==LINEAR_MIPMAP_LINEAR);
 }
 
-GLenum get_gl_filter(TextureFilter filter)
+unsigned get_gl_filter(TextureFilter filter)
 {
        switch(filter)
        {
@@ -232,7 +230,7 @@ GLenum get_gl_filter(TextureFilter filter)
        }
 }
 
-GLenum get_gl_wrap(TextureWrap wrap)
+unsigned get_gl_wrap(TextureWrap wrap)
 {
        switch(wrap)
        {