Hi Lilith, Thanks for the changes, I've now reviewed and tested them and so far so good. I've now merged and submitted your changes to svn/trunk. Since the changes are quite extensive to the handling of texture state there is always a chance that something been missed and bugs introduced for some usage models, so we'll need to watch how the code fares out with testing out in the wider community.
Thanks, Robert. On Wed, Dec 23, 2009 at 2:20 AM, Lilith Bryant <[email protected]> wrote: > 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. > > This is what I have implemented for my local use, Feel free to commit it > if you want. > > > > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
