Windows compatibility:

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 91a33ecc378d966644e11aaf90c11524ffbc1bd0..bda7599143a11bf05abcf330a58eca6895c3da67 100644 (file)
--- 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,9 @@ namespace GL {
 
 TexUnit::TexUnit():
        texture(0)
-{ }
+{
+       require_version(1, 3);
+}
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -31,7 +33,7 @@ TexUnit &TexUnit::activate(unsigned n)
        if(units.size()<=n)
                units.resize(n+1);
 
-       glActiveTextureARB(GL_TEXTURE0+n);
+       glActiveTexture(GL_TEXTURE0+n);
        cur_unit=&units[n];
 
        return units[n];