Complete rewrite of extension handling

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 7eb89a98c0515219dfd66d2a8448e622f2226dac..b19e791727c0e9f6d006c7a51eb58d3b0d634ed2 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,8 +1,8 @@
 #include <stdexcept>
-#include "extension.h"
+#include "arb_multitexture.h"
+#include "arb_vertex_shader.h"
 #include "gl.h"
 #include "texunit.h"
-#include "version_1_3.h"
 
 using namespace std;
 
@@ -54,9 +54,9 @@ unsigned TexUnit::get_n_units()
        static int count = -1;
        if(count<0)
        {
-               if(is_version_at_least(2, 0) || is_supported("GL_ARB_vertex_shader"))
+               if(ARB_vertex_shader)
                        glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &count);
-               else if(is_version_at_least(1, 3))
+               else if(ARB_multitexture)
                        glGetIntegerv(GL_MAX_TEXTURE_UNITS, &count);
                else
                        count = 1;
@@ -66,6 +66,8 @@ unsigned TexUnit::get_n_units()
 
 TexUnit &TexUnit::activate(unsigned n)
 {
+       if(n>0)
+               static Require _req(ARB_multitexture);
        if(n>=get_n_units())
                throw out_of_range("TexUnit::activate");