X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexunit.cpp;h=ba3e7ca6208e3716029027dcdb253b7203221f15;hb=refs%2Ftags%2F0.9;hp=91a33ecc378d966644e11aaf90c11524ffbc1bd0;hpb=f098a871fc6dc7b61a5aca5581fa327e4124c036;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 91a33ecc..ba3e7ca6 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -5,10 +5,10 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#define GL_GLEXT_PROTOTYPES
-#include <GL/gl.h>
-#include <GL/glext.h>
+#include "extension.h"
+#include "gl.h"
 #include "texunit.h"
+#include "version_1_3.h"
 
 using namespace std;
 
@@ -17,7 +17,8 @@ namespace GL {
 
 TexUnit::TexUnit():
 	texture(0)
-{ }
+{
+}
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -31,7 +32,11 @@ TexUnit &TexUnit::activate(unsigned n)
 	if(units.size()<=n)
 		units.resize(n+1);
 
-	glActiveTextureARB(GL_TEXTURE0+n);
+	if(cur_unit!=&units[n] && (cur_unit || n))
+	{
+		require_version(1, 3);
+		glActiveTexture(GL_TEXTURE0+n);
+	}
 	cur_unit=&units[n];
 
 	return units[n];