X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexunit.cpp;h=1155fa96286be0ab199280e61ea909115545df30;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=fd0fe31423db1c6f76413f818f493eb661167b02;hpb=84bc56b96c21c831104a22e0cbd0f3b72ab5d8c3;p=libs%2Fgl.git diff --git a/source/texunit.cpp b/source/texunit.cpp index fd0fe314..1155fa96 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-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,12 +17,20 @@ namespace GL { TexUnit::TexUnit(): texture(0) -{ } +{ +} bool TexUnit::set_texture(const Texture *tex) { - bool result=(tex!=texture); - texture=tex; + bool result = (tex!=texture); + texture = tex; + return result; +} + +bool TexUnit::set_texenv(const TexEnv *env) +{ + bool result = (texenv!=env); + texenv = env; return result; } @@ -24,8 +39,12 @@ TexUnit &TexUnit::activate(unsigned n) if(units.size()<=n) units.resize(n+1); - glActiveTextureARB(GL_TEXTURE0+n); - cur_unit=&units[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]; } @@ -38,7 +57,7 @@ TexUnit &TexUnit::current() } vector TexUnit::units; -TexUnit *TexUnit::cur_unit=0; +TexUnit *TexUnit::cur_unit = 0; } // namespace GL } // namespace Msp