Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 15:38:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

REverting all the changes from the brown branch not used

Browse source
This commit is contained in:
Sam Gateau 2019-02-11 20:13:37 -08:00
parent 9ad783135c
commit afb6c838eb
5 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -542,7 +542,7 @@ void OpenGLDisplayPlugin::renderFromTexture(gpu::Batch& batch, const gpu::Textur
batch.resetViewTransform(); batch.resetViewTransform();
batch.setViewportTransform(copyFboRect); batch.setViewportTransform(copyFboRect);
batch.setStateScissorRect(copyFboRect); batch.setStateScissorRect(copyFboRect);
// batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, {0.0f, 0.0f, 0.0f, 1.0f}); batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, {0.0f, 0.0f, 0.0f, 1.0f});
batch.blit(fbo, sourceRect, copyFbo, copyRect); batch.blit(fbo, sourceRect, copyFbo, copyRect);
} }
} }

1
libraries/gl/src/gl/GLHelpers.cpp
View file

@ -99,7 +99,6 @@ const QSurfaceFormat& getDefaultOpenGLSurfaceFormat() {
#else #else
format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile); format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
#endif #endif
if (gl::Context::enableDebugLogger()) { if (gl::Context::enableDebugLogger()) {
format.setOption(QSurfaceFormat::DebugContext); format.setOption(QSurfaceFormat::DebugContext);
} }

1
plugins/oculus/src/OculusDisplayPlugin.cpp
View file

@ -152,7 +152,6 @@ void OculusDisplayPlugin::hmdPresent() {
// taking ownership of the object // taking ownership of the object
auto fbo = getGLBackend()->getFramebufferID(_outputFramebuffer); auto fbo = getGLBackend()->getFramebufferID(_outputFramebuffer);
glNamedFramebufferTexture(fbo, GL_COLOR_ATTACHMENT0, curTexId, 0); glNamedFramebufferTexture(fbo, GL_COLOR_ATTACHMENT0, curTexId, 0);
auto viewport = ivec4(uvec2(), _outputFramebuffer->getSize());
render([&](gpu::Batch& batch) { render([&](gpu::Batch& batch) {
batch.enableStereo(false); batch.enableStereo(false);
batch.setFramebuffer(_outputFramebuffer); batch.setFramebuffer(_outputFramebuffer);

1
scripts/developer/utilities/lib/plotperf/Color.qml
View file

@ -23,7 +23,6 @@ Item {
height: 24 height: 24
property var _color: Qt.rgba(1.0, 1.0, 1.0, 1.0 ); property var _color: Qt.rgba(1.0, 1.0, 1.0, 1.0 );
property var _lcolor: Qt.vec4(1.0, 1.0, 1.0, 1.0 );
property var zoneWidth: width / 3; property var zoneWidth: width / 3;
property var hoveredOn: 0.0; property var hoveredOn: 0.0;
property var sliderHeight: height / 2; property var sliderHeight: height / 2;

1
scripts/developer/utilities/render/deferredLighting.qml
View file

@ -14,7 +14,6 @@ import QtQuick.Layouts 1.3
import stylesUit 1.0 import stylesUit 1.0
import controlsUit 1.0 as HifiControls import controlsUit 1.0 as HifiControls
import "configSlider" import "configSlider"
import "../lib/plotperf"
Rectangle { Rectangle {
HifiConstants { id: hifi;} HifiConstants { id: hifi;}