Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 09:19:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing PR builds

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion '27.0.3' //buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
applicationId "io.highfidelity.hifiinterface" applicationId "io.highfidelity.hifiinterface"

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -172,7 +172,7 @@ public:
_context->makeCurrent(); _context->makeCurrent();
CHECK_GL_ERROR(); CHECK_GL_ERROR();
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
newPlugin->swapBuffers() newPlugin->swapBuffers();
#endif #endif
gl::setSwapInterval(wantVsync ? 1 : 0); gl::setSwapInterval(wantVsync ? 1 : 0);
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)

1
libraries/render-utils/src/RenderForwardTask.cpp
View file

@ -166,7 +166,6 @@ enum ForwardShader_BufferSlot {
void PrepareForward::run(const RenderContextPointer& renderContext, const Inputs& inputs) { void PrepareForward::run(const RenderContextPointer& renderContext, const Inputs& inputs) {
RenderArgs* args = renderContext->args; RenderArgs* args = renderContext->args;
const auto& lightingModel = inputs;
gpu::doInBatch(args->_context, [&](gpu::Batch& batch) { gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
args->_batch = &batch; args->_batch = &batch;

2
tests/gl/src/main.cpp
View file

@ -30,8 +30,6 @@ int main(int argc, char** argv) {
} }
glClearColor(1.0, 0.0, 1.0, 1.0); glClearColor(1.0, 0.0, 1.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
auto err = glGetError();
window->swapBuffers(); window->swapBuffers();
window->doneCurrent(); window->doneCurrent();
}); });