Check the flat qualifier from the correct member

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

diff --git a/source/core/sampler.cpp b/source/core/sampler.cpp
index 6658ef9ac75d05a8b1016a84afb6847404b196d7..4da13833330dac12eace04b145f9ffacd4a0510b 100644 (file)
--- a/source/core/sampler.cpp
+++ b/source/core/sampler.cpp
@@ -1,4 +1,5 @@
 #include <msp/strings/format.h>
+#include "device.h"
 #include "error.h"
 #include "sampler.h"
 
@@ -21,6 +22,8 @@ void Sampler::set_min_filter(TextureFilter f)
 
 void Sampler::set_mag_filter(TextureFilter f)
 {
+       if(is_mipmapped(f))
+               throw invalid_argument("Sampler::set_mag_filter");
        mag_filter = f;
        dirty_params |= MAG_FILTER;
 }
@@ -35,19 +38,14 @@ void Sampler::set_max_anisotropy(float a)
 {
        if(a<1.0f)
                throw invalid_argument("Sampler::set_max_anisotropy");
+       if(a>Device::get_current().get_info().limits.max_anisotropy)
+               throw out_of_range("Sampler::set_max_anisotropy");
        bool supported = check_anisotropic(a>1.0f);
        max_anisotropy = a;
        if(supported)
                dirty_params |= MAX_ANISOTROPY;
 }
 
-void Sampler::set_wrap(TextureWrap w)
-{
-       set_wrap_s(w);
-       set_wrap_t(w);
-       set_wrap_r(w);
-}
-
 void Sampler::set_wrap_s(TextureWrap w)
 {
        wrap_s = w;
@@ -66,6 +64,13 @@ void Sampler::set_wrap_r(TextureWrap w)
        dirty_params |= WRAP_R;
 }
 
+void Sampler::set_wrap(TextureWrap w)
+{
+       set_wrap_s(w);
+       set_wrap_t(w);
+       set_wrap_r(w);
+}
+
 void Sampler::set_border_color(const Color &c)
 {
        border_color = c;