Changes - SailfishOS Open Build Service

Changes of Revision 16

[-] [+]	Changed	_service:tar_git:qtscenegraph-adaptation.changes
@@ -1,5 +1,4 @@ -* Fri Sep 15 2017 sledge <sledgeas@gmail.com> - 0.7 -- [customcontext] Adapt for Qt 5.8 +* Fri Sep 15 2017 sledge <sledgeas@gmail.com> - 0.7.2 - [customcontext] Make hybris textures work on devices without BGRA. MER#1760 * Thu May 19 2016 Gunnar Sletta <gunnar.sletta@jollamobile.com> - 0.6.6
[-] [+]	Changed	_service:tar_git:qtscenegraph-adaptation-droid.spec ^
@@ -1,6 +1,6 @@ Name: qtscenegraph-adaptation Summary: Scenegraph adaptation from playground -Version: 0.7.1 +Version: 0.7.2 Release: 1%{?dist} Group: Qt/Qt License: LGPLv2.1 with exception or GPLv3
[-] [+]	Changed	_service ^
@@ -6,7 +6,7 @@ <service name="tar_git"> <param name="url">https://git.merproject.org/mer-core/qtscenegraph-adaptation.git</param> <param name="branch">master</param> - <param name="revision">f9d9d210a1aebc6c02365d4d3c6470e16191b060</param> + <param name="revision">4254c35e3f0c05766ed75f310515047b20816156</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:qtscenegraph-adaptation-0.7.2.tar.bz2/customcontext/context.cpp ^
@@ -95,6 +95,14 @@ #endif #if QT_VERSION >= 0x050200 +#define CONTEXT_CLASS RenderContext +#define CONTEXT_CLASS_BASE QSGRenderContext +#else +#define CONTEXT_CLASS Context +#define CONTEXT_CLASS_BASE QSGContext +#endif + +#if QT_VERSION >= 0x050200 #ifndef QSG_NO_RENDERER_TIMING static bool qsg_render_timing = !qgetenv("QSG_RENDER_TIMING").isEmpty(); #endif @@ -105,7 +113,7 @@ #if QT_VERSION >= 0x050200 RenderContext::RenderContext(QSGContext ctx) - : RENDER_CONTEXT_CLASS_BASE(ctx) + : QSGRenderContext(ctx) { #ifdef CUSTOMCONTEXT_DITHER m_dither = qgetenv("CUSTOMCONTEXT_NO_DITHER").isEmpty(); @@ -139,7 +147,7 @@ shader = material->createShader(); compile(shader, material); - RENDER_CONTEXT_CLASS_BASE::initialize(shader); + QSGRenderContext::initialize(shader); m_materials[type] = shader; #ifndef QSG_NO_RENDER_TIMING @@ -153,7 +161,7 @@ #endif //QT_VERSION >= 0x050200 Context::Context(QObject parent) - : CONTEXT_CLASS_BASE(parent) + : QSGContext(parent) , m_sampleCount(0) , m_useMultisampling(false) #ifdef CUSTOMCONTEXT_HYBRISTEXTURE @@ -294,22 +302,15 @@ #endif // CUSTOMCONTEXT_HYBRISTEXTURE - CONTEXT_CLASS_BASE::renderContextInitialized(ctx); + QSGContext::renderContextInitialized(ctx); } -#if QT_VERSION >= 0x050800 -void RENDER_CONTEXT_CLASS::initialize(void inCtx) +void CONTEXT_CLASS::initialize(QOpenGLContext context) { - QOpenGLContext context = static_cast<QOpenGLContext>(inCtx); -#else -void RENDER_CONTEXT_CLASS::initialize(QOpenGLContext inCtx) -{ - QOpenGLContext context = inCtx; -#endif #ifdef CUSTOMCONTEXT_DITHER if (m_dither) @@ -400,12 +401,12 @@ #endif #endif - RENDER_CONTEXT_CLASS_BASE::initialize(inCtx); + CONTEXT_CLASS_BASE::initialize(context); } -void RENDER_CONTEXT_CLASS::invalidate() +void CONTEXT_CLASS::invalidate() { - RENDER_CONTEXT_CLASS_BASE::invalidate(); + CONTEXT_CLASS_BASE::invalidate(); #ifdef CUSTOMCONTEXT_DITHER delete m_ditherProgram; @@ -438,7 +439,7 @@ #endif #if QT_VERSION >= 0x050600 -QSGTexture RENDER_CONTEXT_CLASS::createTexture(const QImage &image, uint flags) const +QSGTexture CONTEXT_CLASS::createTexture(const QImage &image, uint flags) const { if (flags & QQuickWindow::TextureCanUseAtlas) { #ifdef CUSTOMCONTEXT_ATLASTEXTURE @@ -483,12 +484,12 @@ #endif - return RENDER_CONTEXT_CLASS_BASE::createTexture(image, flags); + return CONTEXT_CLASS_BASE::createTexture(image, flags); } #else -QSGTexture RENDER_CONTEXT_CLASS::createTexture(const QImage &image) const +QSGTexture CONTEXT_CLASS::createTexture(const QImage &image) const { #ifdef CUSTOMCONTEXT_ATLASTEXTURE if (m_atlasTexture) { @@ -503,7 +504,7 @@ return new MacTexture(image); #endif - return RENDER_CONTEXT_CLASS_BASE::createTexture(image); + return CONTEXT_CLASS_BASE::createTexture(image); } #if QT_VERSION >= 0x050200 @@ -536,7 +537,7 @@ } #endif - return RENDER_CONTEXT_CLASS_BASE::createTextureNoAtlas(image); + return CONTEXT_CLASS_BASE::createTextureNoAtlas(image); } // Qt 5.2 branch @@ -546,7 +547,7 @@ #endif -QSGRenderer RENDER_CONTEXT_CLASS::createRenderer() +QSGRenderer CONTEXT_CLASS::createRenderer() { #ifdef CUSTOMCONTEXT_OVERLAPRENDERER if (m_overlapRenderer) { @@ -559,7 +560,7 @@ #ifdef CUSTOMCONTEXT_SIMPLERENDERER return new QSGSimpleRenderer::Renderer(this); #endif - return RENDER_CONTEXT_CLASS_BASE::createRenderer(); + return CONTEXT_CLASS_BASE::createRenderer(); } @@ -575,7 +576,7 @@ return new SwapListeningAnimationDriver(); #endif - return CONTEXT_CLASS_BASE::createAnimationDriver(parent); + return QSGContext::createAnimationDriver(parent); } @@ -615,13 +616,9 @@ -#if QT_VERSION >= 0x050800 -void RENDER_CONTEXT_CLASS::renderNextFrame(QSGRenderer renderer, uint fbo) -#else -void RENDER_CONTEXT_CLASS::renderNextFrame(QSGRenderer renderer, GLuint fbo) -#endif +void CONTEXT_CLASS::renderNextFrame(QSGRenderer renderer, GLuint fbo) { - RENDER_CONTEXT_CLASS_BASE::renderNextFrame(renderer, fbo); + CONTEXT_CLASS_BASE::renderNextFrame(renderer, fbo); #ifdef CUSTOMCONTEXT_DITHER if (m_dither) { @@ -656,12 +653,12 @@ QSGImageNode Context::createImageNode() { - return m_defaultImageNodes ? CONTEXT_CLASS_BASE::createImageNode() : new MSAAImageNode(); + return m_defaultImageNodes ? QSGContext::createImageNode() : new MSAAImageNode(); } QSGRectangleNode *Context::createRectangleNode() { - return m_defaultRectangleNodes ? CONTEXT_CLASS_BASE::createRectangleNode() : new MSAARectangleNode(); + return m_defaultRectangleNodes ? QSGContext::createRectangleNode() : new MSAARectangleNode(); } #endif
[-] [+]	Changed	_service:tar_git:qtscenegraph-adaptation-0.7.2.tar.bz2/customcontext/context.h ^
@@ -59,51 +59,22 @@ #include "threaduploadtexture.h" #endif -#if QT_VERSION >= 0x050800 -#include <private/qsgdefaultcontext_p.h> -#include <private/qsgdefaultrendercontext_p.h> -#endif #if QT_VERSION >= 0x050200 struct QSGMaterialType; #endif -#if QT_VERSION >= 0x050800 -#define CONTEXT_CLASS Context -#define CONTEXT_CLASS_BASE QSGDefaultContext -#define RENDER_CONTEXT_CLASS RenderContext -#define RENDER_CONTEXT_CLASS_BASE QSGDefaultRenderContext -#define COMPILESHADER_METHOD compileShader -#elif QT_VERSION >= 0x050200 -#define CONTEXT_CLASS Context -#define CONTEXT_CLASS_BASE QSGContext -#define RENDER_CONTEXT_CLASS RenderContext -#define RENDER_CONTEXT_CLASS_BASE QSGRenderContext -#define COMPILESHADER_METHOD compile -#else -#define CONTEXT_CLASS Context -#define CONTEXT_CLASS_BASE QSGContext -#define RENDER_CONTEXT_CLASS Context -#define RENDER_CONTEXT_CLASS_BASE QSGContext -#define COMPILESHADER_METHOD compile -#endif - namespace CustomContext { #if QT_VERSION >= 0x050200 -class RenderContext : public RENDER_CONTEXT_CLASS_BASE +class RenderContext : public QSGRenderContext { public: RenderContext(QSGContext ctx); - #if QT_VERSION < 0x050800 void initialize(QOpenGLContext context); - void renderNextFrame(QSGRenderer renderer, GLuint fbo); - #else - void initialize(void context); - void renderNextFrame(QSGRenderer renderer, uint fbo); - #endif void invalidate(); + void renderNextFrame(QSGRenderer renderer, GLuint fbo); #if QT_VERSION < 0x050600 QSGTexture createTexture(const QImage &image) const; @@ -115,7 +86,7 @@ QSGRenderer createRenderer(); #ifdef PROGRAM_BINARY - void COMPILESHADER_METHOD(QSGMaterialShader shader, QSGMaterial material, const char vertex = 0, const char fragment = 0); + void compile(QSGMaterialShader shader, QSGMaterial material, const char vertex = 0, const char fragment = 0); #endif #ifdef CUSTOMCONTEXT_DITHER @@ -139,7 +110,7 @@ }; #endif -class Context : public CONTEXT_CLASS_BASE +class Context : public QSGContext { Q_OBJECT public: @@ -152,7 +123,6 @@ void initialize(QOpenGLContext context); void invalidate(); void renderNextFrame(QSGRenderer renderer, GLuint fbo); - QSGTexture createTexture(const QImage &image) const; QSGRenderer createRenderer(); #endif
[-] [+]	Changed	_service:tar_git:qtscenegraph-adaptation-0.7.2.tar.bz2/customcontext/pluginmain.h ^
@@ -60,7 +60,6 @@ QStringList keys() const; QSGContext create(const QString &key) const; - QSGContextFactoryInterface::Flags flags(const QString &key) const; QQuickTextureFactory createTextureFactoryFromImage(const QImage &image); static CustomContext::Context *instance;
[-] [+]	Changed	_service:tar_git:qtscenegraph-adaptation-0.7.2.tar.bz2/customcontext/programbinary.cpp ^
@@ -151,7 +151,7 @@ void sanityCheck(); - void compileAndInsert(RENDER_CONTEXT_CLASS_BASE rc, const QByteArray &key, QSGMaterialShader s, QSGMaterial m, const char v, const char f); + void compileAndInsert(QSGRenderContext rc, const QByteArray &key, QSGMaterialShader s, QSGMaterial m, const char v, const char f); private: QCryptographicHash m_hash; @@ -227,10 +227,10 @@ file.remove(); } -void ProgramBinaryStore::compileAndInsert(RENDER_CONTEXT_CLASS_BASE rc, const QByteArray &key, QSGMaterialShader s, QSGMaterial m, const char v, const char f) +void ProgramBinaryStore::compileAndInsert(QSGRenderContext rc, const QByteArray &key, QSGMaterialShader s, QSGMaterial m, const char v, const char f) { // Use the baseclass impl to do the actual compilation - rc->RENDER_CONTEXT_CLASS_BASE::COMPILESHADER_METHOD(s, m, v, f); + rc->QSGRenderContext::compile(s, m, v, f); QOpenGLShaderProgram p = s->program(); if (p->isLinked()) { ProgramBinary b = new ProgramBinary; @@ -252,13 +252,13 @@ } } -void RenderContext::COMPILESHADER_METHOD(QSGMaterialShader shader, QSGMaterial material, const char vertex, const char fragment) +void RenderContext::compile(QSGMaterialShader shader, QSGMaterial material, const char vertex, const char fragment) { Q_ASSERT(QOpenGLContext::currentContext()->extensions().contains("GL_OES_get_program_binary")); // We cannot cache shaders which have custom compilation if (material->flags() & QSGMaterial::CustomCompileStep) { - RENDER_CONTEXT_CLASS_BASE::COMPILESHADER_METHOD(shader, material, vertex, fragment); + QSGRenderContext::compile(shader, material, vertex, fragment); return; }