X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=bda7599143a11bf05abcf330a58eca6895c3da67;hb=a4ec5410595ddf37bfbc0e85ad87d31a9cbf94f1;hp=fd0fe31423db1c6f76413f818f493eb661167b02;hpb=84bc56b96c21c831104a22e0cbd0f3b72ab5d8c3;p=libs%2Fgl.git diff --git a/source/texunit.cpp b/source/texunit.cpp index fd0fe314..bda75991 100644 --- a/source/texunit.cpp +++ b/source/texunit.cpp @@ -1,7 +1,14 @@ -#define GL_GLEXT_PROTOTYPES -#include -#include +/* $Id$ + +This file is part of libmspgl +Copyright © 2007 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,9 @@ namespace GL { TexUnit::TexUnit(): texture(0) -{ } +{ + require_version(1, 3); +} bool TexUnit::set_texture(const Texture *tex) { @@ -24,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];