Fix a stupid error with PixelStore parameter mask

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

diff --git a/source/texunit.cpp b/source/texunit.cpp
index fd36a4f15b5e77b7455af08ed4133f6e578c8c44..31c90777aad10eccd5a4e9d110de2a0846809f26 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,6 +1,7 @@
 #include <stdexcept>
 #include <msp/gl/extensions/arb_multitexture.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
+#include <msp/gl/extensions/msp_legacy_features.h>
 #include "gl.h"
 #include "misc.h"
 #include "texunit.h"
@@ -14,11 +15,9 @@ vector<TexUnit> TexUnit::units;
 TexUnit *TexUnit::cur_unit = 0;
 
 TexUnit::TexUnit():
-       texture(0),
-       texenv(0)
-{
-       fill(texgen, texgen+4, static_cast<const TexGen *>(0));
-}
+       legacy(false),
+       texture(0)
+{ }
 
 bool TexUnit::set_texture(const Texture *tex)
 {
@@ -27,29 +26,6 @@ bool TexUnit::set_texture(const Texture *tex)
        return result;
 }
 
-bool TexUnit::set_texenv(const TexEnv *env)
-{
-       bool result = (texenv!=env);
-       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];
-}
-
 void TexUnit::bind()
 {
        if(cur_unit!=this && (cur_unit || index))
@@ -63,7 +39,7 @@ unsigned TexUnit::get_n_units()
        if(count<0)
        {
                if(ARB_vertex_shader)
-                       count = get_i(GL_MAX_TEXTURE_IMAGE_UNITS);
+                       count = get_i(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS);
                else if(ARB_multitexture)
                        count = get_i(GL_MAX_TEXTURE_UNITS);
                else
@@ -72,6 +48,19 @@ unsigned TexUnit::get_n_units()
        return count;
 }
 
+unsigned TexUnit::get_n_legacy_units()
+{
+       static int count = -1;
+       if(count<0)
+       {
+               if(MSP_legacy_features)
+                       count = get_i(GL_MAX_TEXTURE_UNITS);
+               else
+                       count = 0;
+       }
+       return count;
+}
+
 TexUnit &TexUnit::get_unit(unsigned n)
 {
        if(n>0)
@@ -82,9 +71,13 @@ TexUnit &TexUnit::get_unit(unsigned n)
        if(units.size()<=n)
        {
                unsigned i = units.size();
+               unsigned n_legacy = get_n_legacy_units();
                units.resize(n+1, TexUnit());
                for(; i<units.size(); ++i)
+               {
                        units[i].index = i;
+                       units[i].legacy = (i<n_legacy);
+               }
        }
 
        return units[n];
@@ -105,13 +98,5 @@ TexUnit *TexUnit::find_unit(const Texture *tex)
        return 0;
 }
 
-TexUnit *TexUnit::find_unit(const TexEnv *env)
-{
-       for(vector<TexUnit>::iterator i=units.begin(); i!=units.end(); ++i)
-               if(i->texenv==env)
-                       return &*i;
-       return 0;
-}
-
 } // namespace GL
 } // namespace Msp