Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index fd0fe31423db1c6f76413f818f493eb661167b02..622599a213d2481acba6707e573286b0d4145f9d 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,7 +1,14 @@
-#define GL_GLEXT_PROTOTYPES
-#include <GL/gl.h>
-#include <GL/glext.h>
+/* $Id$
+
+This file is part of libmspgl
+Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include "extension.h"
+#include "gl.h"
 #include "texunit.h"
+#include "version_1_3.h"
 
 using namespace std;
 
@@ -10,7 +17,8 @@ namespace GL {
 
 TexUnit::TexUnit():
        texture(0)
-{ }
+{
+}
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -19,12 +27,23 @@ bool TexUnit::set_texture(const Texture *tex)
        return result;
 }
 
+bool TexUnit::set_texenv(const TexEnv *env)
+{
+       bool result=(texenv!=env);
+       texenv=env;
+       return result;
+}
+
 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))
+       {
+               static RequireVersion _ver(1, 3);
+               glActiveTexture(GL_TEXTURE0+n);
+       }
        cur_unit=&units[n];
 
        return units[n];