X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=b19e791727c0e9f6d006c7a51eb58d3b0d634ed2;hb=6afbace895a7bbcf216ab8e48280ea0303ab5892;hp=d581598a6c190e2caf46c59d11140d403c30e79b;hpb=777f5f37f2d89ef2a787a77d74372b643968740e;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index d581598a..b19e7917 100644
--- 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("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");