mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash with MSAA buffer generation when compiling in Debug on Windows

Browse Source 
Cleanup of logging behavior
This commit is contained in:
Alexander Bock
2017-12-30 20:24:05 -05:00
parent 96e065ef08
commit 6089449bba
8 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/OpenSpace/main.cpp
View File

@@ -629,9 +629,9 @@ int main_main(int argc, char** argv) {
}
// Main loop
LDEBUG("Starting rendering loop");
LINFO("Starting rendering loop");
SgctEngine->render();
LDEBUG("Ending rendering loop");
LINFO("Ending rendering loop");
cleanup(IsInitialized::Yes);

2
modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
View File

@@ -1056,7 +1056,7 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
absPath(_spriteTexturePath)
);
if (_spriteTexture) {
LDEBUG("Loaded texture from '" << absPath(_spriteTexturePath) << "'");
LINFO("Loaded texture from '" << absPath(_spriteTexturePath) << "'");
_spriteTexture->uploadTexture();
}
_spriteTexture->setFilter(

2
modules/digitaluniverse/rendering/renderableplanescloud.cpp
View File

@@ -920,7 +920,7 @@ bool RenderablePlanesCloud::loadTextures() {
ghoul::io::TextureReader::ref().loadTexture(pair.second)
));
if (p.second) {
LDEBUGC(
LINFOC(
"RenderablePlanesCloud",
"Loaded texture from '" << pair.second << "'"
);

2
modules/globebrowsing/cache/memoryawaretilecache.cpp vendored
View File

@@ -159,7 +159,7 @@ void MemoryAwareTileCache::assureTextureContainerExists(
}
void MemoryAwareTileCache::setSizeEstimated(size_t estimatedSize) {
LINFO("Resetting tile cache size");
LDEBUG("Resetting tile cache size");
ghoul_assert(_textureContainerMap.size() > 0, "Texture containers must exist.");
size_t sumTextureTypeSize = std::accumulate(

2
modules/touch/src/touchinteraction.cpp
View File

@@ -715,8 +715,6 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
LINFOC("Picking", "Picked node: " + _pickingSelected->name());
}
LINFOC("Picking", "============");
_selected = std::move(newSelected);
}

4
src/engine/openspaceengine.cpp
View File

@@ -876,7 +876,7 @@ void OpenSpaceEngine::loadFonts() {
continue;
}
LINFO("Registering font '" << font << "' with key '" << key << "'");
LDEBUG("Registering font '" << font << "' with key '" << key << "'");
bool success = _fontManager->registerFontPath(key, font);
if (!success) {
@@ -1194,7 +1194,7 @@ void OpenSpaceEngine::initializeGL() {
}
}
LINFO("Initializing Rendering Engine");
LDEBUG("Initializing Rendering Engine");
_renderEngine->initializeGL();
for (const auto& func : _moduleCallbacks.initializeGL) {

6
src/rendering/framebufferrenderer.cpp
View File

@@ -86,7 +86,7 @@ FramebufferRenderer::FramebufferRenderer()
FramebufferRenderer::~FramebufferRenderer() {}
void FramebufferRenderer::initialize() {
LINFO("Initializing FramebufferRenderer");
LDEBUG("Initializing FramebufferRenderer");
const GLfloat size = 1.0f;
const GLfloat vertex_data[] = {
@@ -590,7 +590,7 @@ void FramebufferRenderer::updateHDRData() {
}
void FramebufferRenderer::updateMSAASamplingPattern() {
LINFO("Updating MSAA Sampling Pattern");
LDEBUG("Updating MSAA Sampling Pattern");
const int GRIDSIZE = 32;
GLfloat step = 2.0f / static_cast<GLfloat>(GRIDSIZE);
@@ -1315,7 +1315,7 @@ void saveTextureToMemory(const GLenum color_buffer_attachment,
if (!memory.empty()) {
memory.clear();
}
memory.reserve(width * height * 3);
memory.resize(width * height * 3);
float *tempMemory = new float[width*height * 3];

2
src/rendering/loadingscreen.cpp
View File

@@ -43,7 +43,7 @@
namespace {
const float LoadingFontSize = 25.f;
const float MessageFontSize = 22.f;
const float ItemFontSize = 8.f;
const float ItemFontSize = 10.f;
const glm::vec2 LogoCenter = { 0.f, 0.525f }; // in NDC
const glm::vec2 LogoSize = { 0.275f, 0.275 }; // in NDC