From db30e9c45f6c8d62df76954afcc6f4335baa529c Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 15 Jan 2018 09:47:31 -0800
Subject: [PATCH] Fixing PR builds
---
android/app/build.gradle | 2 +-
.../display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp | 2 +-
libraries/render-utils/src/RenderForwardTask.cpp | 1 -
tests/gl/src/main.cpp | 2 --
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 779a382536..1cff708c3b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 26
- buildToolsVersion '27.0.3'
+ //buildToolsVersion '27.0.3'
defaultConfig {
applicationId "io.highfidelity.hifiinterface"
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 06f1b24790..40dcf1b8c7 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -172,7 +172,7 @@ public:
_context->makeCurrent();
CHECK_GL_ERROR();
#if defined(Q_OS_MAC)
- newPlugin->swapBuffers()
+ newPlugin->swapBuffers();
#endif
gl::setSwapInterval(wantVsync ? 1 : 0);
#if defined(Q_OS_MAC)
diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp
index d9845f3e80..498807df39 100755
--- a/libraries/render-utils/src/RenderForwardTask.cpp
+++ b/libraries/render-utils/src/RenderForwardTask.cpp
@@ -166,7 +166,6 @@ enum ForwardShader_BufferSlot {
void PrepareForward::run(const RenderContextPointer& renderContext, const Inputs& inputs) {
RenderArgs* args = renderContext->args;
- const auto& lightingModel = inputs;
gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
args->_batch = &batch;
diff --git a/tests/gl/src/main.cpp b/tests/gl/src/main.cpp
index 613c4f4b7a..beb0367610 100644
--- a/tests/gl/src/main.cpp
+++ b/tests/gl/src/main.cpp
@@ -30,8 +30,6 @@ int main(int argc, char** argv) {
}
glClearColor(1.0, 0.0, 1.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
- auto err = glGetError();
-
window->swapBuffers();
window->doneCurrent();
});