X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=0a5f9bf3a4c4a971489b59d5134204c5c66caa92;hb=d7e7f87d173156aa12694ce54d688c40a2eabe2e;hp=4d71e3b9492674a3a3e0f1712d6d45d526c679bb;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 4d71e3b9..0a5f9bf3 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,8 +1,8 @@
 #include <stdexcept>
-#include "extension.h"
+#include "arb_multitexture.h"
+#include "arb_vertex_shader.h"
 #include "gl.h"
 #include "texunit.h"
-#include "version_1_3.h"
 
 using namespace std;
 
@@ -15,7 +15,9 @@ TexUnit *TexUnit::cur_unit = 0;
 TexUnit::TexUnit():
 	texture(0),
 	texenv(0)
-{ }
+{
+	fill(texgen, texgen+4, static_cast<const TexGen *>(0));
+}
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -31,14 +33,30 @@ bool TexUnit::set_texenv(const TexEnv *env)
 	return result;
 }
 
+bool TexUnit::set_texgen(unsigned i, const TexGen *gen)
+{
+	if(i>=4)
+		throw out_of_range("TexUnit::set_texgen");
+	bool result = (texgen[i]!=gen);
+	texgen[i] = gen;
+	return result;
+}
+
+const TexGen *TexUnit::get_texgen(unsigned i)
+{
+	if(i>=4)
+		throw out_of_range("TexUnit::get_texgen");
+	return texgen[i];
+}
+
 unsigned TexUnit::get_n_units()
 {
 	static int count = -1;
 	if(count<0)
 	{
-		if(is_version_at_least(2, 0) || is_supported("ARB_vertex_shader"))
+		if(ARB_vertex_shader)
 			glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &count);
-		else if(is_version_at_least(1, 3))
+		else if(ARB_multitexture)
 			glGetIntegerv(GL_MAX_TEXTURE_UNITS, &count);
 		else
 			count = 1;
@@ -48,6 +66,8 @@ unsigned TexUnit::get_n_units()
 
 TexUnit &TexUnit::activate(unsigned n)
 {
+	if(n>0)
+		static Require _req(ARB_multitexture);
 	if(n>=get_n_units())
 		throw out_of_range("TexUnit::activate");