|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-droid.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/context.cpp
^
|
| @@ -94,26 +94,15 @@
#include <private/qsgdefaultrectanglenode_p.h>
#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
-#endif
namespace CustomContext
{
-#if QT_VERSION >= 0x050200
RenderContext::RenderContext(QSGContext *ctx)
- : QSGRenderContext(ctx)
+ : RENDER_CONTEXT_CLASS_BASE(ctx)
{
#ifdef CUSTOMCONTEXT_DITHER
m_dither = qgetenv("CUSTOMCONTEXT_NO_DITHER").isEmpty();
@@ -147,7 +136,7 @@
shader = material->createShader();
compile(shader, material);
- QSGRenderContext::initialize(shader);
+ RENDER_CONTEXT_CLASS_BASE::initialize(shader);
m_materials[type] = shader;
#ifndef QSG_NO_RENDER_TIMING
@@ -158,10 +147,9 @@
return shader;
}
#endif //CUSTOMCONTEXT_OVERLAPRENDERER
-#endif //QT_VERSION >= 0x050200
Context::Context(QObject *parent)
- : QSGContext(parent)
+ : CONTEXT_CLASS_BASE(parent)
, m_sampleCount(0)
, m_useMultisampling(false)
#ifdef CUSTOMCONTEXT_HYBRISTEXTURE
@@ -214,22 +202,6 @@
m_defaultRectangleNodes = qEnvironmentVariableIsSet("CUSTOMCONTEXT_DEFAULT_RECTANGLENODES");
#endif
-#if QT_VERSION < 0x050200
-#ifdef CUSTOMCONTEXT_DITHER
- m_dither = qgetenv("CUSTOMCONTEXT_NO_DITHER").isEmpty();
- m_ditherProgram = 0;
-#endif
-
-#ifdef CUSTOMCONTEXT_OVERLAPRENDERER
- m_overlapRenderer = qgetenv("CUSTOMCONTEXT_NO_OVERLAPRENDERER").isEmpty();
- m_clipProgram = 0;
-#endif
-
-#ifdef CUSTOMCONTEXT_MATERIALPRELOAD
- m_materialPreloading = qgetenv("CUSTOMCONTEXT_NO_MATERIAL_PRELOADING").isEmpty();
-#endif
-#endif //QT_VERSION < 0x050200
-
#ifdef CUSTOMCONTEXT_DEBUG
qDebug("CustomContext created:");
qDebug(" - multisampling: %s, samples=%d", m_useMultisampling ? "yes" : "no", m_sampleCount);
@@ -261,18 +233,6 @@
qDebug(" - non preserved textures: %s", m_nonPreservedTexture ? "yes" : "no");
#endif
-#if QT_VERSION < 0x050200
-#ifdef CUSTOMCONTEXT_DITHER
- qDebug(" - ordered 2x2 dither: %s", m_dither ? "yes" : "no");
-#endif
-#ifdef CUSTOMCONTEXT_OVERLAPRENDERER
- qDebug(" - overlaprenderer: %s", m_overlapRenderer ? "yes" : "no");
-#endif
-#ifdef CUSTOMCONTEXT_MATERIALPRELOAD
- qDebug(" - material preload: %s", m_materialPreloading ? "yes" : "no");
-#endif
-#endif //QT_VERSION < 0x050200
-
#ifdef CUSTOMCONTEXT_NO_DFGLYPHS
qDebug(" - distance fields disabled");
#endif
@@ -302,15 +262,25 @@
#endif // CUSTOMCONTEXT_HYBRISTEXTURE
- QSGContext::renderContextInitialized(ctx);
+ CONTEXT_CLASS_BASE::renderContextInitialized(ctx);
}
-void CONTEXT_CLASS::initialize(QOpenGLContext *context)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+void RenderContext::initialize(const InitParams *inCtx)
{
+#elif QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+void RenderContext::initialize(void *inCtx)
+{
+ QOpenGLContext *context = static_cast<QOpenGLContext*>(inCtx);
+#else
+void RenderContext::initialize(QOpenGLContext *inCtx)
+{
+ QOpenGLContext *context = inCtx;
+#endif
#ifdef CUSTOMCONTEXT_DITHER
if (m_dither)
@@ -389,24 +359,14 @@
if (m_materialPreloading)
qDebug(" - Standard materials compiled in: %d ms", (int) prepareTimer.elapsed());
#endif
-#if QT_VERSION < 0x050200
- qDebug(" - OpenGL extensions: %s", glGetString(GL_EXTENSIONS));
- qDebug(" - OpenGL Vendor: %s", glGetString(GL_VENDOR));
- qDebug(" - OpenGL Version: %s", glGetString(GL_VERSION));
- qDebug(" - OpenGL Renderer: %s", glGetString(GL_RENDERER));
- qDebug(" - OpenGL Shading Language Version: %s", glGetString(GL_SHADING_LANGUAGE_VERSION));
- int textureSize;
- glGetIntegerv(GL_MAX_TEXTURE_SIZE, &textureSize);
- qDebug(" - GL Max Texture Size: %d", textureSize);
-#endif
#endif
- CONTEXT_CLASS_BASE::initialize(context);
+ RENDER_CONTEXT_CLASS_BASE::initialize(inCtx);
}
-void CONTEXT_CLASS::invalidate()
+void RenderContext::invalidate()
{
- CONTEXT_CLASS_BASE::invalidate();
+ RENDER_CONTEXT_CLASS_BASE::invalidate();
#ifdef CUSTOMCONTEXT_DITHER
delete m_ditherProgram;
@@ -438,8 +398,8 @@
}
#endif
-#if QT_VERSION >= 0x050600
-QSGTexture *CONTEXT_CLASS::createTexture(const QImage &image, uint flags) const
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+QSGTexture *RenderContext::createTexture(const QImage &image, uint flags) const
{
if (flags & QQuickWindow::TextureCanUseAtlas) {
#ifdef CUSTOMCONTEXT_ATLASTEXTURE
@@ -484,12 +444,12 @@
#endif
- return CONTEXT_CLASS_BASE::createTexture(image, flags);
+ return RENDER_CONTEXT_CLASS_BASE::createTexture(image, flags);
}
#else
-QSGTexture *CONTEXT_CLASS::createTexture(const QImage &image) const
+QSGTexture *RenderContext::createTexture(const QImage &image) const
{
#ifdef CUSTOMCONTEXT_ATLASTEXTURE
if (m_atlasTexture) {
@@ -504,10 +464,9 @@
return new MacTexture(image);
#endif
- return CONTEXT_CLASS_BASE::createTexture(image);
+ return RENDER_CONTEXT_CLASS_BASE::createTexture(image);
}
-#if QT_VERSION >= 0x050200
QSGTexture *RenderContext::createTextureNoAtlas(const QImage &image) const
{
#ifdef CUSTOMCONTEXT_EGLGRALLOCTEXTURE
@@ -537,17 +496,14 @@
}
#endif
- return CONTEXT_CLASS_BASE::createTextureNoAtlas(image);
+ return RENDER_CONTEXT_CLASS_BASE::createTextureNoAtlas(image);
}
-// Qt 5.2 branch
-#endif
-
// Qt 5.6 branch
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/context.h
^
|
| @@ -59,34 +59,53 @@
#include "threaduploadtexture.h"
#endif
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+#include <private/qsgdefaultcontext_p.h>
+#include <private/qsgdefaultrendercontext_p.h>
+#endif
-#if QT_VERSION >= 0x050200
struct QSGMaterialType;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+#define CONTEXT_CLASS_BASE QSGDefaultContext
+#define RENDER_CONTEXT_CLASS_BASE QSGDefaultRenderContext
+#define COMPILESHADER_METHOD compileShader
+#else
+#define CONTEXT_CLASS_BASE QSGContext
+#define RENDER_CONTEXT_CLASS_BASE QSGRenderContext
+#define COMPILESHADER_METHOD compile
#endif
namespace CustomContext
{
-#if QT_VERSION >= 0x050200
-class RenderContext : public QSGRenderContext
+class RenderContext : public RENDER_CONTEXT_CLASS_BASE
{
public:
RenderContext(QSGContext *ctx);
- void initialize(QOpenGLContext *context);
- void invalidate();
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+ void renderNextFrame(QSGRenderer *renderer, uint fbo);
+#else
void renderNextFrame(QSGRenderer *renderer, GLuint fbo);
+#endif
-#if QT_VERSION < 0x050600
- QSGTexture *createTexture(const QImage &image) const;
- QSGTexture *createTextureNoAtlas(const QImage &image) const;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ void initialize(const InitParams *inCtx);
+#elif QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+ void initialize(void *context);
#else
- QSGTexture *createTexture(const QImage &image, uint flags) const;
+ void initialize(QOpenGLContext *context);
#endif
+ void invalidate();
+
+ QSGTexture *createTexture(const QImage &image, uint flags) const;
+
QSGRenderer *createRenderer();
#ifdef PROGRAM_BINARY
- void compile(QSGMaterialShader *shader, QSGMaterial *material, const char *vertex = 0, const char *fragment = 0);
+ void COMPILESHADER_METHOD(QSGMaterialShader *shader, QSGMaterial *material, const char *vertex = 0, const char *fragment = 0);
#endif
#ifdef CUSTOMCONTEXT_DITHER
@@ -108,24 +127,15 @@
#endif
#endif
};
-#endif
-class Context : public QSGContext
+class Context : public CONTEXT_CLASS_BASE
{
Q_OBJECT
public:
explicit Context(QObject *parent = 0);
-#if QT_VERSION >= 0x050200
QSGRenderContext *createRenderContext() { return new RenderContext(this); }
void renderContextInitialized(QSGRenderContext *renderContext) Q_DECL_OVERRIDE;
-#else
- void initialize(QOpenGLContext *context);
- void invalidate();
- void renderNextFrame(QSGRenderer *renderer, GLuint fbo);
- QSGTexture *createTexture(const QImage &image) const;
- QSGRenderer *createRenderer();
-#endif
QAnimationDriver *createAnimationDriver(QObject *parent);
#ifdef CUSTOMCONTEXT_SURFACEFORMAT
@@ -156,40 +166,6 @@
uint m_useMultisampling : 1;
uint m_depthBuffer : 1;
-#if QT_VERSION < 0x50200
- friend class RenderContext;
-
-#ifdef CUSTOMCONTEXT_MATERIALPRELOAD
- bool m_materialPreloading;
-#endif
-
-#ifdef CUSTOMCONTEXT_DITHER
- bool m_dither;
- OrderedDither2x2 *m_ditherProgram;
-#endif
-
-#ifdef CUSTOMCONTEXT_OVERLAPRENDERER
- bool m_overlapRenderer;
- QOpenGLShaderProgram *m_clipProgram;
- int m_clipMatrixID;
-#endif
-
-#ifdef CUSTOMCONTEXT_ATLASTEXTURE
- TextureAtlasManager m_atlasManager;
- bool m_atlasTexture;
-#endif
-
-#ifdef CUSTOMCONTEXT_MACTEXTURE
- bool m_macTexture;
-#endif
-
-#ifdef CUSTOMCONTEXT_THREADUPLOADTEXTURE
- ThreadUploadTextureManager m_threadUploadManager;
- bool m_threadUploadTexture;
-#endif
-
-#endif // Qt < 5.2.0
-
#ifdef CUSTOMCONTEXT_NONPRESERVEDTEXTURE
bool m_nonPreservedTexture;
friend class NonPreservedTextureFactory;
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/customcontext.pro
^
|
| @@ -3,15 +3,7 @@
CONFIG += plugin
-contains(QT_VERSION, ^5\\.[2-9]\\..*) {
- message("Using Qt 5.2 or later")
- CONFIG += customcontext_qt520
-}
-
QT += gui-private core-private quick-private qml-private
-!customcontext_qt520:{
- QT += v8-private
-}
message("")
@@ -45,38 +37,6 @@
# Textures
#
-!customcontext_qt520:{
- atlastexture:{
- message("atlastexture .............: yes")
- DEFINES += CUSTOMCONTEXT_ATLASTEXTURE
- SOURCES += texture/atlastexture.cpp
- HEADERS += texture/atlastexture.h
- INCLUDEPATH += texture
- } else {
- message("atlastexture .............: no")
- }
-
- threaduploadtexture:{
- message("threaduploadtexture ......: yes")
- DEFINES += CUSTOMCONTEXT_THREADUPLOADTEXTURE
- SOURCES += texture/threaduploadtexture.cpp
- HEADERS += texture/threaduploadtexture.h
- INCLUDEPATH += texture
- } else {
- message("threaduploadtexture ......: no")
- }
-
- mactexture:{
- message("mactexture ...............: yes")
- DEFINES += CUSTOMCONTEXT_MACTEXTURE
- SOURCES += texture/mactexture.cpp
- HEADERS += texture/mactexture.h
- INCLUDEPATH += texture
- } else {
- message("mactexture ...............: no")
- }
-}
-
eglgralloctexture:{
message("eglgralloctexture ........: yes (remember: ANDROID_SDK_INCLUDE)")
DEFINES += CUSTOMCONTEXT_EGLGRALLOCTEXTURE
@@ -146,16 +106,14 @@
overlaprenderer:{
message("overlaprenderer ..........: yes")
- customcontext_qt520:{
- message(" *** WARNING: you probably want to be using the default renderer in Qt 5.2 and higher")
- message(" as it incorporates the optimizations of the overlaprenderer along with other optimizations ***")
-
- materialpreload:{
- message(" materialpreload ........: yes")
- DEFINES += CUSTOMCONTEXT_MATERIALPRELOAD
- } else {
- message(" materialpreload ........: no")
- }
+ message(" *** WARNING: you probably want to be using the default renderer in Qt 5.2 and higher")
+ message(" as it incorporates the optimizations of the overlaprenderer along with other optimizations ***")
+
+ materialpreload:{
+ message(" materialpreload ........: yes")
+ DEFINES += CUSTOMCONTEXT_MATERIALPRELOAD
+ } else {
+ message(" materialpreload ........: no")
}
DEFINES += CUSTOMCONTEXT_OVERLAPRENDERER
SOURCES += renderer/overlaprenderer.cpp
@@ -179,38 +137,16 @@
# Other stuff
#
-!customcontext_qt520:{
- materialpreload:{
- message("materialpreload ..........: yes")
- DEFINES += CUSTOMCONTEXT_MATERIALPRELOAD
- } else {
- message("materialpreload ..........: no")
- }
-
- nodfglyphs:{
- message("nodfglyphs ...............: yes")
- DEFINES += CUSTOMCONTEXT_NO_DFGLYPHS
- } else {
- message("nodfglyphs ...............: no")
- }
-
- msaa:{
- message("msaa .....................: yes")
- DEFINES += CUSTOMCONTEXT_MSAA
- } else {
- message("msaa .....................: no")
- }
+programbinary: {
+ message("programbinary ............: yes")
+ DEFINES += PROGRAM_BINARY
+ SOURCES += programbinary.cpp
+ LIBS += -lEGL
} else {
- programbinary: {
- message("programbinary ............: yes")
- DEFINES += PROGRAM_BINARY
- SOURCES += programbinary.cpp
- LIBS += -lEGL
- } else {
- message("programbinary ............: no")
- }
+ message("programbinary ............: no")
}
+
surfaceformat:{
message("surfaceformat ............: yes")
DEFINES += CUSTOMCONTEXT_SURFACEFORMAT
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/pluginmain.cpp
^
|
| @@ -60,6 +60,13 @@
return instance;
}
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+QSGContextFactoryInterface::Flags ContextPlugin::flags(const QString &key) const
+{
+ return 0; // should it be SupportsShaderEffectNode ?
+}
+#endif
+
QQuickTextureFactory *ContextPlugin::createTextureFactoryFromImage(const QImage &image)
{
return instance ? instance->createTextureFactory(image) : 0;
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/pluginmain.h
^
|
| @@ -60,6 +60,9 @@
QStringList keys() const;
QSGContext *create(const QString &key) const;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+ QSGContextFactoryInterface::Flags flags(const QString &key) const;
+#endif
QQuickTextureFactory *createTextureFactoryFromImage(const QImage &image);
static CustomContext::Context *instance;
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/programbinary.cpp
^
|
| @@ -161,7 +161,7 @@
void sanityCheck();
- void compileAndInsert(QSGRenderContext *rc, const QByteArray &key, QSGMaterialShader *s, QSGMaterial *m, const char *v, const char *f);
+ void compileAndInsert(RENDER_CONTEXT_CLASS_BASE *rc, const QByteArray &key, QSGMaterialShader *s, QSGMaterial *m, const char *v, const char *f);
private:
QCryptographicHash m_hash;
@@ -239,10 +239,10 @@
file.remove();
}
-void ProgramBinaryStore::compileAndInsert(QSGRenderContext *rc, const QByteArray &key, QSGMaterialShader *s, QSGMaterial *m, const char *v, const char *f)
+void ProgramBinaryStore::compileAndInsert(RENDER_CONTEXT_CLASS_BASE *rc, const QByteArray &key, QSGMaterialShader *s, QSGMaterial *m, const char *v, const char *f)
{
// Use the baseclass impl to do the actual compilation
- rc->QSGRenderContext::compile(s, m, v, f);
+ rc->RENDER_CONTEXT_CLASS_BASE::COMPILESHADER_METHOD(s, m, v, f);
QOpenGLShaderProgram *p = s->program();
if (p->isLinked()) {
ProgramBinary *b = new ProgramBinary;
@@ -264,7 +264,7 @@
}
}
-void RenderContext::compile(QSGMaterialShader *shader, QSGMaterial *material, const char *vertex, const char *fragment)
+void RenderContext::COMPILESHADER_METHOD(QSGMaterialShader *shader, QSGMaterial *material, const char *vertex, const char *fragment)
{
ProgramBinaryStore *store = ProgramBinaryStore::self();
if (!store->hasOpenGLES3())
@@ -272,7 +272,7 @@
// We cannot cache shaders which have custom compilation
if (material->flags() & QSGMaterial::CustomCompileStep) {
- QSGRenderContext::compile(shader, material, vertex, fragment);
+ RENDER_CONTEXT_CLASS_BASE::COMPILESHADER_METHOD(shader, material, vertex, fragment);
return;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/renderer/overlaprenderer.cpp
^
|
| @@ -751,11 +751,7 @@
}
}
-#if QT_VERSION >= 0x050200
Renderer::Renderer(QSGRenderContext *context)
-#else
-Renderer::Renderer(QSGContext *context)
-#endif
: QSGRenderer(context)
{
}
@@ -852,7 +848,6 @@
dirtyChildNodes_Transform(node);
}
-#if QT_VERSION >= 0x050200
QSGNode::DirtyState dirtyChain = flags & QSGNode::DirtyPropagationMask;
markNodeDirtyState(node, dirtyChain);
@@ -864,7 +859,6 @@
parent = parent->parent();
}
}
-#endif
}
void Renderer::setClipProgram(QOpenGLShaderProgram *program, int matrixID)
@@ -1759,31 +1753,24 @@
updates |= QSGMaterialShader::RenderState::DirtyOpacity;
m_current_determinant = bc->determinant;
-#if QT_VERSION < 0x050200
- QSGMaterialShader *shader = m_context->prepareMaterial(bc->material);
-#else
+
QSGMaterialShader *shader = static_cast<CustomContext::RenderContext*>(m_context)->prepareMaterial(bc->material);
-#endif
if (shader != currentShader) {
Q_ASSERT(shader->program()->isLinked());
if (currentShader) {
-#if QT_VERSION >= 0x050200
char const *const *attr = currentShader->attributeNames();
for (int j = 0; attr[j]; ++j) {
if (*attr[j])
currentShader->program()->disableAttributeArray(j);
}
-#endif
currentShader->deactivate();
}
-#if QT_VERSION >= 0x050200
shader->program()->bind();
char const *const *attr = shader->attributeNames();
for (int j = 0; attr[j]; ++j) {
if (*attr[j])
shader->program()->enableAttributeArray(j);
}
-#endif
shader->activate();
currentShader = shader;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/renderer/overlaprenderer.h
^
|
| @@ -326,11 +326,7 @@
{
Q_OBJECT
public:
-#if QT_VERSION >= 0x050200
Renderer(QSGRenderContext *context);
-#else
- Renderer(QSGContext *context);
-#endif
~Renderer();
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/renderer/qsgbasicclipmanager_p.h
^
|
| @@ -184,7 +184,7 @@
m_program = new QOpenGLShaderProgram();
QSGShaderSourceBuilder::initializeProgramFromFiles(
m_program,
-#if QT_VERSION >= 0x050600
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
QStringLiteral(":/qt-project.org/scenegraph/shaders/stencilclip.vert"),
QStringLiteral(":/qt-project.org/scenegraph/shaders/stencilclip.frag")
#else
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/texture/eglgralloctexture.cpp
^
|
| @@ -148,7 +148,11 @@
const int w = image.width();
if (simpleCopy) {
if (dbpl == image.bytesPerLine()) {
- memcpy(data, image.constBits(), image.byteCount());
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+ memcpy(data, image.constBits(), image.sizeInBytes());
+ #else
+ memcpy(data, image.constBits(), image.byteCount());
+ #endif
} else {
int bpl = qMin(dbpl, image.bytesPerLine());
for (int y=0; y<h; ++y)
@@ -318,7 +322,11 @@
int error;
while ((error = glGetError()) != GL_NO_ERROR)
- qDebug() << "Error after glEGLImageTargetTexture2DOES" << hex << error;
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ qDebug() << "Error after glEGLImageTargetTexture2DOES" << Qt::hex << error;
+ #else
+ qDebug() << "Error after glEGLImageTargetTexture2DOES" << hex << error;
+ #endif
if (Q_UNLIKELY(qsg_render_timing))
qDebug(" - eglgralloctexture(%dx%d) bind=%d ms", m_buffer->width, m_buffer->height, (int) qsg_renderer_timer.elapsed());
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/texture/hybristexture.cpp
^
|
| @@ -142,7 +142,11 @@
status = eglHybrisCreateNativeBuffer(width, height, usage, format, &stride, &buffer);
if (status != EGL_TRUE || !buffer) {
- qDebug() << "eglHybrisCreateNativeBuffer failed, error:" << hex << eglGetError();
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ qDebug() << "eglHybrisCreateNativeBuffer failed, error:" << Qt::hex << eglGetError();
+ #else
+ qDebug() << "eglHybrisCreateNativeBuffer failed, error:" << hex << eglGetError();
+ #endif
return;
}
@@ -152,7 +156,11 @@
status = eglHybrisLockNativeBuffer(buffer, HYBRIS_USAGE_SW_WRITE_RARELY, 0, 0, width, height, (void **) &data);
if (status != EGL_TRUE || data == 0) {
- qDebug() << "eglHybrisLockNativeBuffer failed, error:" << hex << eglGetError();
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ qDebug() << "eglHybrisLockNativeBuffer failed, error:" << Qt::hex << eglGetError();
+ #else
+ qDebug() << "eglHybrisLockNativeBuffer failed, error:" << hex << eglGetError();
+ #endif
release();
return;
}
@@ -171,7 +179,11 @@
const int w = image.width();
if (simpleCopy) {
if (dbpl == image.bytesPerLine()) {
- memcpy(data, image.constBits(), image.byteCount());
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+ memcpy(data, image.constBits(), image.sizeInBytes());
+ #else
+ memcpy(data, image.constBits(), image.byteCount());
+ #endif
} else {
int bpl = qMin(dbpl, image.bytesPerLine());
for (int y=0; y<h; ++y)
@@ -206,7 +218,11 @@
#endif
if (!eglHybrisUnlockNativeBuffer(buffer)) {
- qDebug() << "eglHybrisUnlockNativeBuffer failed, error:" << hex << eglGetError();
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ qDebug() << "eglHybrisUnlockNativeBuffer failed, error:" << Qt::hex << eglGetError();
+ #else
+ qDebug() << "eglHybrisUnlockNativeBuffer failed, error:" << hex << eglGetError();
+ #endif
release();
return;
}
@@ -222,7 +238,11 @@
0);
if (!eglImage) {
- qDebug() << "eglCreateImageKHR failed, error:" << hex << eglGetError();
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ qDebug() << "eglCreateImageKHR failed, error:" << Qt::hex << eglGetError();
+ #else
+ qDebug() << "eglCreateImageKHR failed, error:" << hex << eglGetError();
+ #endif
release();
return;
}
@@ -323,7 +343,11 @@
int error;
while ((error = glGetError()) != GL_NO_ERROR)
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ qDebug() << "Error after glEGLImageTargetTexture2DOES" << Qt::hex << error;
+ #else
qDebug() << "Error after glEGLImageTargetTexture2DOES" << hex << error;
+ #endif
if (Q_UNLIKELY(qsg_render_timing))
qDebug(" - Hybristexture(%dx%d) bind=%d ms", m_buffer->width, m_buffer->height, (int) qsg_renderer_timer.elapsed());
@@ -392,16 +416,25 @@
{
void *data = 0;
if (!eglHybrisLockNativeBuffer(m_buffer->buffer, HYBRIS_USAGE_SW_READ_RARELY, 0, 0, m_buffer->width, m_buffer->height, (void **) &data) || data == 0) {
- qDebug() << "HybrisTextureFactory::image(): lock failed, cannot get image data; error:" << hex << eglGetError();
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ qDebug() << "HybrisTextureFactory::image(): lock failed, cannot get image data; error:" << Qt::hex << eglGetError();
+ #else
+ qDebug() << "HybrisTextureFactory::image(): lock failed, cannot get image data; error:" << hex << eglGetError();
+ #endif
return QImage();
}
QImage content = QImage((const uchar *) data, m_buffer->width, m_buffer->height, m_buffer->stride * 4,
m_buffer->hasAlpha ? QImage::Format_ARGB32_Premultiplied
- : QImage::Format_RGB32).copy();
+ : QImage::Format_RGB32);
+ content = HYBRIS_PIXEL_FORMAT_RGBA_8888 == m_buffer->format ? content.rgbSwapped() : content.copy();
if (!eglHybrisUnlockNativeBuffer(m_buffer->buffer)) {
- qDebug() << "HybrisTextureFactory::image(): unlock failed; error:" << hex << eglGetError();
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ qDebug() << "HybrisTextureFactory::image(): unlock failed; error:" << Qt::hex << eglGetError();
+ #else
+ qDebug() << "HybrisTextureFactory::image(): unlock failed; error:" << hex << eglGetError();
+ #endif
return QImage();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.8.0.tar.bz2/customcontext/texture/nonpreservedtexture.cpp
^
|
| @@ -25,28 +25,12 @@
QSGTexture *NonPreservedTextureFactory::createTexture(QQuickWindow *window) const
{
-#if QT_VERSION >= 0x050200
Q_ASSERT(window);
QSGRenderContext *renderContext = static_cast<QQuickWindowPrivate *>(QObjectPrivate::get(window))->context;
Q_ASSERT(renderContext);
QSGTexture *texture = renderContext->createTexture(m_image);
m_image = QImage(); // remove the reference to the QImage
return texture;
-#else
- Q_UNUSED(window);
-#ifdef CUSTOMCONTEXT_ATLASTEXTURE
- if (m_context->m_atlasTexture) {
- QSGTexture *atlasedTexture = m_context->m_atlasManager.create(m_image);
- if (atlasedTexture)
- return atlasedTexture;
- }
-#endif //CUSTOMCONTEXT_ATLASTEXTURE
-
- QSGPlainTexture *t = new QSGPlainTexture();
- t->setImage(m_image);
- m_image = QImage();
- return t;
-#endif //QT_VERSION
}
} // end of namespace
|
