From 3e3a585b921e2a8747ec5b0baa0cabb392da244c Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 30 Jan 2018 21:54:29 -0800 Subject: [PATCH] Fixing compile warnings --- .../src/model-networking/TextureCache.cpp | 2 -- tools/ktx-tool/src/main.cpp | 12 +----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp index 07eaede6f1..1bf5947536 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.cpp +++ b/libraries/model-networking/src/model-networking/TextureCache.cpp @@ -64,8 +64,6 @@ static const QUrl HMD_PREVIEW_FRAME_URL("resource://hmdPreviewFrame"); static const float SKYBOX_LOAD_PRIORITY { 10.0f }; // Make sure skybox loads first static const float HIGH_MIPS_LOAD_PRIORITY { 9.0f }; // Make sure high mips loads after skybox but before models -#pragma optimize("", off) - TextureCache::TextureCache() { _ktxCache->initialize(); #if defined(DISABLE_KTX_CACHE) diff --git a/tools/ktx-tool/src/main.cpp b/tools/ktx-tool/src/main.cpp index 7c88b1aef8..49ffc0df60 100644 --- a/tools/ktx-tool/src/main.cpp +++ b/tools/ktx-tool/src/main.cpp @@ -7,12 +7,6 @@ #include #include -#include -#include -#include -#include -#include - #include #include #include @@ -56,16 +50,12 @@ void stripKtxKeyValues(const std::string& sourceFile, const std::string& destFil auto newStorageSize = ktx::KTX::evalStorageSize(ktx->_header, ktx->_images); storage::FileStorage::create(destFile.c_str(), newStorageSize, nullptr); storage::FileStorage destStorage(destFile.c_str()); - auto writtenSize = ktx::KTX::write(destStorage.mutableData(), newStorageSize, ktx->_header, ktx->_images); + ktx::KTX::write(destStorage.mutableData(), newStorageSize, ktx->_header, ktx->_images); } - - - const QDir SOURCE_FOLDER{ PathUtils::projectRootPath() + "/interface/resources/meshes/mannequin" }; const QDir DEST_FOLDER{ PathUtils::projectRootPath() + "/interface/resources/meshes/mannequin/+gles" }; -const gli::gl GL(gli::gl::PROFILE_GL33); void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {