Fixing PR builds

This commit is contained in:
Brad Davis 2018-01-15 09:47:31 -08:00
parent bac3388693
commit db30e9c45f
4 changed files with 2 additions and 5 deletions

View file

@ -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"

View file

@ -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)

View file

@ -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;

View file

@ -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();
});