Changeset 10926 for OpenSceneGraph/trunk/src/osg/State.cpp

Timestamp:

01/07/10 17:49:12 (3 years ago)

Author:

robert

Message:

From Lilith Bryant, "As discussed previously on the users list. Fixes the redundant calls to
glActiveTexture on every State::apply after more than one texunits have been
used.

This is against 2.9.6 (I think SVN head is the same)

Quick Synopsis:

New functions:

State::applyModeOnTexUnit
State::applyAttributeOnTexUnit
State::applyModeMapOnTexUnit
State::applyAttributeMapOnTexUnit
State::applyModeListOnTexUnit
State::applyAttributeListOnTexUnit

All copies of the normal versions, but they also set the active tex unit if
absolutely necessary (i.e. only if they call something OpenGL).

State::apply (*2)
State::applyTextureAttribute

Changed to call the above functions and no longer call setActiveTextureUnit
themselves.

State::setActiveTextureUnit

Made inline, so the benefit of having applyModeOnTexUnit (etc) inline
is retained.
"

Files:

• OpenSceneGraph/trunk/src/osg/State.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osg/State.cpp

@@ -502 +502 @@
         for(unit=0;unit<unitMax;++unit)
         {
-            if (setActiveTextureUnit(unit))
-            {
-                if (unit<ds_textureModeList.size()) applyModeList(getOrCreateTextureModeMap(unit),ds_textureModeList[unit]);
-                else if (unit<_textureModeMapList.size()) applyModeMap(_textureModeMapList[unit]);
-
-                if (unit<ds_textureAttributeList.size()) applyAttributeList(getOrCreateTextureAttributeMap(unit),ds_textureAttributeList[unit]);
-                else if (unit<_textureAttributeMapList.size()) applyAttributeMap(_textureAttributeMapList[unit]);
-            }
+            if (unit<ds_textureModeList.size()) applyModeListOnTexUnit(unit,getOrCreateTextureModeMap(unit),ds_textureModeList[unit]);
+            else if (unit<_textureModeMapList.size()) applyModeMapOnTexUnit(unit,_textureModeMapList[unit]);
+
+            if (unit<ds_textureAttributeList.size()) applyAttributeListOnTexUnit(unit,getOrCreateTextureAttributeMap(unit),ds_textureAttributeList[unit]);
+            else if (unit<_textureAttributeMapList.size()) applyAttributeMapOnTexUnit(unit,_textureAttributeMapList[unit]);
         }
 
@@ -539 +536 @@
     for(unit=0;unit<unitMax;++unit)
     {
-        if (setActiveTextureUnit(unit))
-        {
-            if (unit<_textureModeMapList.size()) applyModeMap(_textureModeMapList[unit]);
-            if (unit<_textureAttributeMapList.size()) applyAttributeMap(_textureAttributeMapList[unit]);
-        }
+        if (unit<_textureModeMapList.size()) applyModeMapOnTexUnit(unit,_textureModeMapList[unit]);
+        if (unit<_textureAttributeMapList.size()) applyAttributeMapOnTexUnit(unit,_textureAttributeMapList[unit]);
     }
 
@@ -849 +843 @@
             _glClientActiveTexture(GL_TEXTURE0+unit);
             _currentClientActiveTextureUnit = unit;
-        }
-        else
-        {
-            return unit==0;
-        }
-    }
-    return true;
-}
-
-
-/** set the current texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
-  * note, only updates values that change.*/
-bool State::setActiveTextureUnit( unsigned int unit )
-{
-    if (unit!=_currentActiveTextureUnit)
-    {
-        if (_glActiveTexture && unit < (unsigned int)(maximum(_glMaxTextureCoords,_glMaxTextureUnits)) )
-        {
-            _glActiveTexture(GL_TEXTURE0+unit);
-            _currentActiveTextureUnit = unit;
         }
         else