Skip to content

Commit

Permalink
Fix an issue in which the --ico was trying to alter the internal form…
Browse files Browse the repository at this point in the history
…at of an immutable texture
  • Loading branch information
gwaldron committed Jan 29, 2024
1 parent 42b68ce commit 4f0436c
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/osgEarth/GLUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1880,9 +1880,6 @@ GLObjectsCompiler::compileAsync(
{
// no ICO available - just resolve the future immediately
result.resolve(node);
//Promise<osg::ref_ptr<osg::Node>> promise;
//result = promise; // .getFuture();
//promise.resolve(node);
}
}

Expand All @@ -1902,6 +1899,7 @@ GLObjectsCompiler::compileAsync(

// if there is an ICO available, schedule the GPU compilation
bool compileScheduled = false;

if (state != nullptr && !state->empty())
{
osg::ref_ptr<ICO> ico;
Expand All @@ -1922,9 +1920,6 @@ GLObjectsCompiler::compileAsync(
{
// no ICO available - just resolve the future immediately
result.resolve(node);
//Promise<osg::ref_ptr<osg::Node>> promise;
//result = promise; // .getFuture();
//promise.resolve(node);
}

return result;
Expand Down

0 comments on commit 4f0436c

Please sign in to comment.