From 73e3236e9e3971efa3c5079df079c25bbefa2ba7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 9 Aug 2015 19:56:58 +0300 Subject: Show error message in log if selected texture compression not supported. --- src/graphicsmanager.cpp | 10 ++++++++-- src/graphicsmanager.h | 2 ++ src/render/graphics.cpp | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index 71fdb7ca3..94c34a154 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -650,7 +650,7 @@ bool GraphicsManager::supportExtension(const std::string &ext) const return mExtensions.find(ext) != mExtensions.end(); } -void GraphicsManager::updateTextureFormat() const +void GraphicsManager::updateTextureCompressionFormat() const { const int compressionFormat = config.getIntValue("compresstextures"); // using extensions if can @@ -716,12 +716,18 @@ void GraphicsManager::updateTextureFormat() const } } delete []formats; + if (compressionFormat) + logger->log1("no correct compression format found"); } else { - logger->log1("no correct compression format found"); + if (compressionFormat) + logger->log1("no correct compression format found"); } +} +void GraphicsManager::updateTextureFormat() const +{ const int renderer = settings.options.renderer; // using default formats diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h index f2c0e6507..1fe682d27 100644 --- a/src/graphicsmanager.h +++ b/src/graphicsmanager.h @@ -98,6 +98,8 @@ class GraphicsManager final void updateTextureFormat() const; + void updateTextureCompressionFormat() const; + bool checkGLVersion(const int major, const int minor) const A_WARN_UNUSED; diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp index 463cac8f1..1e2e7884d 100644 --- a/src/render/graphics.cpp +++ b/src/render/graphics.cpp @@ -302,6 +302,7 @@ bool Graphics::setOpenGLMode() graphicsManager.initOpenGL(); initArrays(graphicsManager.getMaxVertices()); + graphicsManager.updateTextureCompressionFormat(); graphicsManager.updateTextureFormat(); updateMemoryInfo(); -- cgit v1.2.3-70-g09d2