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

Merge pull request #14106 from jherico/fix/mac_gl1

Browse source 
Fix some Mac rendering issues
This commit is contained in:
John Conklin II 2018-10-01 16:35:57 -07:00 committed by GitHub
commit 87b39f690c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/avatarapp/TransparencyMask.qml
View file

@ -24,6 +24,7 @@ Item {
fragmentShader: { fragmentShader: {
" "
#version 150 core
varying highp vec2 qt_TexCoord0; varying highp vec2 qt_TexCoord0;
uniform lowp sampler2D source; uniform lowp sampler2D source;
uniform lowp sampler2D mask; uniform lowp sampler2D mask;

2
libraries/qml/src/qml/impl/SharedObject.cpp
View file

@ -19,6 +19,7 @@
#include <NumericalConstants.h> #include <NumericalConstants.h>
#include <shared/NsightHelpers.h> #include <shared/NsightHelpers.h>
#include <gl/QOpenGLContextWrapper.h> #include <gl/QOpenGLContextWrapper.h>
#include <gl/GLHelpers.h>
#include "../OffscreenSurface.h" #include "../OffscreenSurface.h"
#include "../Logging.h" #include "../Logging.h"
@ -67,6 +68,7 @@ SharedObject::SharedObject() {
// so we wait until after its ctor to move object/context to this thread. // so we wait until after its ctor to move object/context to this thread.
QQuickWindow::setDefaultAlphaBuffer(true); QQuickWindow::setDefaultAlphaBuffer(true);
_quickWindow = new QQuickWindow(_renderControl); _quickWindow = new QQuickWindow(_renderControl);
_quickWindow->setFormat(getDefaultOpenGLSurfaceFormat());
_quickWindow->setColor(QColor(255, 255, 255, 0)); _quickWindow->setColor(QColor(255, 255, 255, 0));
_quickWindow->setClearBeforeRendering(true); _quickWindow->setClearBeforeRendering(true);