diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 47ace7b93c..19b431c6cd 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -126,14 +126,15 @@ bool OpenGLDisplayPlugin::eventFilter(QObject* receiver, QEvent* event) { void OpenGLDisplayPlugin::display( GLuint finalTexture, const glm::uvec2& sceneSize) { using namespace oglplus; - uvec2 size = getRecommendedRenderSize(); Context::Viewport(size.x, size.y); - glClearColor(1, 0, 1, 1); - Context::Clear().ColorBuffer(); - - _program->Bind(); glBindTexture(GL_TEXTURE_2D, finalTexture); + drawUnitQuad(); +} + +void OpenGLDisplayPlugin::drawUnitQuad() { + using namespace oglplus; + _program->Bind(); _vertexBuffer->Bind(Buffer::Target::Array); glEnableVertexAttribArray(_positionAttribute); glVertexAttribPointer(_positionAttribute, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, 0); @@ -144,4 +145,4 @@ void OpenGLDisplayPlugin::display( glDisableVertexAttribArray(_texCoordAttribute); glBindBuffer(GL_ARRAY_BUFFER, 0); glUseProgram(0); -} +} \ No newline at end of file diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h index 8c6557d3cd..583d1ebc2d 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h @@ -35,7 +35,7 @@ protected: // Needs to be called by the activate method after the GL context has been created to // initialize OpenGL context settings needed by the plugin virtual void customizeContext(PluginContainer * container); - + virtual void drawUnitQuad(); virtual void makeCurrent() = 0; virtual void doneCurrent() = 0; virtual void swapBuffers() = 0; diff --git a/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_6_DisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_6_DisplayPlugin.cpp index 92e1a3821b..c3bcc1c4c9 100644 --- a/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_6_DisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_6_DisplayPlugin.cpp @@ -245,13 +245,8 @@ void Oculus_0_6_DisplayPlugin::display(GLuint finalTexture, const glm::uvec2& sc _sceneFbo->Bound([&] { auto size = _sceneFbo->size; Context::Viewport(size.x, size.y); - - _program->Bind(); - Mat4Uniform(*_program, "Projection").Set(mat4()); - Mat4Uniform(*_program, "ModelView").Set(mat4()); glBindTexture(GL_TEXTURE_2D, finalTexture); - _plane->Use(); - _plane->Draw(); + drawUnitQuad(); }); ovrLayerEyeFov& sceneLayer = getSceneLayer();