mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Intermediate commit: Pre gpu layer refactorization

Browse Source
This commit is contained in:
Erik Broberg
2016-10-21 15:19:59 +02:00
parent 1df163a3b9
commit bfbd331cdf
6 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/chunk/chunkrenderer.cpp
+11 -6
View File
@@ -218,12 +218,13 @@ namespace globebrowsing {
// Go through all the categories
for (size_t category = 0; category < LayeredTextures::NUM_TEXTURE_CATEGORIES; category++) {
LayerGroup& layerGroup = _layerManager->layerGroup(category);
GPULayerGroup& gpuLayerGroup = programUniformHandler->_gpuLayerGroups[category];
GPULayerGroup* gpuLayerGroup = programUniformHandler->gpuLayerGroup(category);
int pileSize = layerGroup.levelBlendingEnabled ? 3 : 1;
gpuLayerGroup->setValue(programObject, layerGroup, tileIndex, pileSize);
int i = 0;
for (const Layer& layer : layerGroup.activeLayers()) {
int pileSize = layerGroup.levelBlendingEnabled ? 3 : 1;
gpuLayerGroup.setValue(programObject, layerGroup, tileIndex, pileSize);
setLayerSettingsUniforms(
programObject,
programUniformHandler,
@@ -357,8 +358,8 @@ namespace globebrowsing {
// render
_grid->geometry().drawUsingActiveProgram();
for (auto& layerGroup : _globalProgramUniformHandler->_gpuLayerGroups) {
layerGroup.deactivate();
for (int i = 0; i < LayeredTextures::NUM_TEXTURE_CATEGORIES; ++i) {
_globalProgramUniformHandler->gpuLayerGroup(i)->deactivate();
}
// disable shader
@@ -443,6 +444,10 @@ namespace globebrowsing {
// render
_grid->geometry().drawUsingActiveProgram();
for (int i = 0; i < LayeredTextures::NUM_TEXTURE_CATEGORIES; ++i) {
_localProgramUniformHandler->gpuLayerGroup(i)->deactivate();
}
// disable shader
programObject->deactivate();