From ecd940e0e65d8a46b48fbdff743cd1c9cc006e04 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Fri, 27 Sep 2019 14:01:00 -0700 Subject: [PATCH] Addressing warnings --- libraries/graphics/src/graphics/Material.cpp | 3 ++- tools/gpu-frame-player/src/RenderThread.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/graphics/src/graphics/Material.cpp b/libraries/graphics/src/graphics/Material.cpp index 5fcf8ba06a..dffc52e29f 100755 --- a/libraries/graphics/src/graphics/Material.cpp +++ b/libraries/graphics/src/graphics/Material.cpp @@ -36,7 +36,8 @@ std::string MaterialKey::getOpacityMapModeName(OpacityMapMode mode) { bool MaterialKey::getOpacityMapModeFromName(const std::string& modeName, MaterialKey::OpacityMapMode& mode) { - for (mode = OPACITY_MAP_OPAQUE; mode <= OPACITY_MAP_BLEND; mode + 1) { + for (int i = OPACITY_MAP_OPAQUE; i <= OPACITY_MAP_BLEND; i++) { + mode = (MaterialKey::OpacityMapMode) i; if (modeName == getOpacityMapModeName(mode)) { return true; } diff --git a/tools/gpu-frame-player/src/RenderThread.cpp b/tools/gpu-frame-player/src/RenderThread.cpp index 6c0d3c7bba..2a54d186ee 100644 --- a/tools/gpu-frame-player/src/RenderThread.cpp +++ b/tools/gpu-frame-player/src/RenderThread.cpp @@ -182,7 +182,7 @@ void RenderThread::renderFrame(gpu::FramePointer& frame) { batch->setPipeline(_presentPipeline); batch->setFramebuffer(nullptr); batch->setResourceTexture(0, frame->framebuffer->getRenderBuffer(0)); - batch->setViewportTransform(ivec4(uvec2(0), ivec2(scale * fboSize.x, scale * fboSize.y))); + batch->setViewportTransform(ivec4(uvec2(0), ivec2(windowSize.width(), windowSize.height()))); batch->draw(gpu::TRIANGLE_STRIP, 4); } glDisable(GL_FRAMEBUFFER_SRGB);