bye, bye QskTextureNode
This commit is contained in:
Uwe Rathmann
parent
54b55c0324
commit
c3c0b2cd33
|
|
@ -1,393 +0,0 @@
|
|||
#include "QskTextureNode.h"
|
||||
#include "QskFunctions.h"
|
||||
|
||||
#include <qopenglfunctions.h>
|
||||
#include <qsggeometry.h>
|
||||
#include <qsgmaterial.h>
|
||||
#include <qquickwindow.h>
|
||||
|
||||
QSK_QT_PRIVATE_BEGIN
|
||||
#include <private/qsgnode_p.h>
|
||||
QSK_QT_PRIVATE_END
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
|
||||
|
||||
#include <qsgtexture.h>
|
||||
#include <qsgtexturematerial.h>
|
||||
#include <qsgtexture_platform.h>
|
||||
|
||||
QSK_QT_PRIVATE_BEGIN
|
||||
#include <private/qrhi_p.h>
|
||||
#include <private/qrhigles2_p_p.h>
|
||||
QSK_QT_PRIVATE_END
|
||||
|
||||
static void qskUpdateGLTextureId( QRhiTexture* rhiTexture, uint textureId )
|
||||
{
|
||||
// hack time: we do not want to create a new QSGTexture object for each texture
|
||||
|
||||
class Texture : public QRhiTexture
|
||||
{
|
||||
public:
|
||||
GLuint texture;
|
||||
// ...
|
||||
};
|
||||
|
||||
GLuint id = rhiTexture->nativeTexture().object;
|
||||
|
||||
if ( id )
|
||||
{
|
||||
auto funcs = QOpenGLContext::currentContext()->functions();
|
||||
funcs->glDeleteTextures( 1, &id );
|
||||
}
|
||||
|
||||
auto glTexture = static_cast< Texture* >( rhiTexture );
|
||||
glTexture->texture = textureId;
|
||||
|
||||
Q_ASSERT( rhiTexture->nativeTexture().object == textureId );
|
||||
}
|
||||
|
||||
using TextureMaterial = QSGTextureMaterial;
|
||||
using OpaqueTextureMaterial = QSGOpaqueTextureMaterial;
|
||||
|
||||
static inline void qskDeleteTexture( const TextureMaterial& material )
|
||||
{
|
||||
delete material.texture();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
||||
|
||||
namespace
|
||||
{
|
||||
class MaterialShader final : public QSGMaterialShader
|
||||
{
|
||||
public:
|
||||
MaterialShader( bool isOpaque );
|
||||
|
||||
char const* const* attributeNames() const override;
|
||||
void updateState( const RenderState&, QSGMaterial*, QSGMaterial* ) override;
|
||||
|
||||
protected:
|
||||
void initialize() override;
|
||||
|
||||
private:
|
||||
int m_matrixId = -1;
|
||||
int m_opacityId = -1;
|
||||
|
||||
const bool m_isOpaque : 1;
|
||||
};
|
||||
|
||||
class Material : public QSGMaterial
|
||||
{
|
||||
public:
|
||||
Material( bool isOpaque );
|
||||
|
||||
QSGMaterialType* type() const override;
|
||||
QSGMaterialShader* createShader() const override;
|
||||
|
||||
void setTextureId( uint );
|
||||
uint textureId() const;
|
||||
|
||||
int compare( const QSGMaterial* ) const override;
|
||||
|
||||
private:
|
||||
uint m_textureId = 0;
|
||||
const bool m_isOpaque : 1;
|
||||
};
|
||||
|
||||
class TextureMaterial final : public Material
|
||||
{
|
||||
public:
|
||||
TextureMaterial()
|
||||
: Material( false )
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
class OpaqueTextureMaterial final : public Material
|
||||
{
|
||||
public:
|
||||
OpaqueTextureMaterial()
|
||||
: Material( true )
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
MaterialShader::MaterialShader( bool isOpaque )
|
||||
: m_isOpaque( isOpaque )
|
||||
{
|
||||
setShaderSourceFile( QOpenGLShader::Vertex,
|
||||
QStringLiteral( ":/qt-project.org/scenegraph/shaders/opaquetexture.vert" ) );
|
||||
|
||||
const auto fragmentShaderFile = m_isOpaque
|
||||
? QStringLiteral( ":/qt-project.org/scenegraph/shaders/opaquetexture.frag" )
|
||||
: QStringLiteral( ":/qt-project.org/scenegraph/shaders/texture.frag" );
|
||||
|
||||
setShaderSourceFile( QOpenGLShader::Fragment, fragmentShaderFile );
|
||||
}
|
||||
|
||||
char const* const* MaterialShader::attributeNames() const
|
||||
{
|
||||
static char const* const attr[] = { "qt_VertexPosition", "qt_VertexTexCoord", 0 };
|
||||
return attr;
|
||||
}
|
||||
|
||||
void MaterialShader::updateState(
|
||||
const RenderState& state, QSGMaterial* newMaterial, QSGMaterial* oldMaterial )
|
||||
{
|
||||
if ( !m_isOpaque && state.isOpacityDirty() )
|
||||
program()->setUniformValue( m_opacityId, state.opacity() );
|
||||
|
||||
auto* materialOld = static_cast< Material* >( oldMaterial );
|
||||
auto* materialNew = static_cast< Material* >( newMaterial );
|
||||
|
||||
if ( ( materialOld == nullptr ) ||
|
||||
( materialOld->textureId() != materialNew->textureId() ) )
|
||||
{
|
||||
auto funcs = QOpenGLContext::currentContext()->functions();
|
||||
funcs->glBindTexture( GL_TEXTURE_2D, materialNew->textureId() );
|
||||
}
|
||||
|
||||
if ( state.isMatrixDirty() )
|
||||
program()->setUniformValue( m_matrixId, state.combinedMatrix() );
|
||||
}
|
||||
|
||||
void MaterialShader::initialize()
|
||||
{
|
||||
m_matrixId = program()->uniformLocation( "qt_Matrix" );
|
||||
|
||||
if ( !m_isOpaque )
|
||||
m_opacityId = program()->uniformLocation( "opacity" );
|
||||
}
|
||||
|
||||
Material::Material( bool isOpaque )
|
||||
: m_isOpaque( isOpaque )
|
||||
{
|
||||
setFlag( Blending, true ); // alpha blending
|
||||
}
|
||||
|
||||
void Material::setTextureId( uint id )
|
||||
{
|
||||
m_textureId = id;
|
||||
}
|
||||
|
||||
uint Material::textureId() const
|
||||
{
|
||||
return m_textureId;
|
||||
}
|
||||
|
||||
QSGMaterialType* Material::type() const
|
||||
{
|
||||
if ( m_isOpaque )
|
||||
{
|
||||
static QSGMaterialType typeOpaque;
|
||||
return &typeOpaque;
|
||||
}
|
||||
else
|
||||
{
|
||||
static QSGMaterialType type;
|
||||
return &type;
|
||||
}
|
||||
}
|
||||
|
||||
QSGMaterialShader* Material::createShader() const
|
||||
{
|
||||
return new MaterialShader( m_isOpaque );
|
||||
}
|
||||
|
||||
int Material::compare( const QSGMaterial* other ) const
|
||||
{
|
||||
const auto otherMaterial = static_cast< const Material* >( other );
|
||||
|
||||
if ( m_textureId == otherMaterial->m_textureId )
|
||||
return 0;
|
||||
|
||||
return ( m_textureId > otherMaterial->m_textureId ) ? 1 : -1;
|
||||
}
|
||||
}
|
||||
|
||||
static inline void qskDeleteTexture( const TextureMaterial& material )
|
||||
{
|
||||
if ( material.textureId() > 0 )
|
||||
{
|
||||
/*
|
||||
In certain environments we have the effect, that at
|
||||
program termination the context is already gone
|
||||
*/
|
||||
if ( auto context = QOpenGLContext::currentContext() )
|
||||
{
|
||||
GLuint id = material.textureId();
|
||||
|
||||
auto funcs = context->functions();
|
||||
funcs->glDeleteTextures( 1, &id );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
class QskTextureNodePrivate final : public QSGGeometryNodePrivate
|
||||
{
|
||||
public:
|
||||
QskTextureNodePrivate()
|
||||
: geometry( QSGGeometry::defaultAttributes_TexturedPoint2D(), 4 )
|
||||
{
|
||||
}
|
||||
|
||||
void setTextureId( QQuickWindow*, uint id );
|
||||
|
||||
void updateTextureGeometry()
|
||||
{
|
||||
QRectF r( 0, 0, 1, 1 );
|
||||
|
||||
if ( this->mirrored & Qt::Horizontal )
|
||||
{
|
||||
r.setLeft( 1 );
|
||||
r.setRight( 0 );
|
||||
}
|
||||
|
||||
if ( mirrored & Qt::Vertical )
|
||||
{
|
||||
r.setTop( 1 );
|
||||
r.setBottom( 0 );
|
||||
}
|
||||
|
||||
QSGGeometry::updateTexturedRectGeometry( &geometry, rect, r );
|
||||
}
|
||||
|
||||
QSGGeometry geometry;
|
||||
|
||||
OpaqueTextureMaterial opaqueMaterial;
|
||||
TextureMaterial material;
|
||||
|
||||
QRectF rect;
|
||||
Qt::Orientations mirrored;
|
||||
};
|
||||
|
||||
QskTextureNode::QskTextureNode()
|
||||
: QSGGeometryNode( *new QskTextureNodePrivate )
|
||||
{
|
||||
Q_D( QskTextureNode );
|
||||
|
||||
setGeometry( &d->geometry );
|
||||
|
||||
setMaterial( &d->material );
|
||||
setOpaqueMaterial( &d->opaqueMaterial );
|
||||
}
|
||||
|
||||
QskTextureNode::~QskTextureNode()
|
||||
{
|
||||
Q_D( const QskTextureNode );
|
||||
qskDeleteTexture( d->material );
|
||||
}
|
||||
|
||||
void QskTextureNode::setTexture( QQuickWindow* window,
|
||||
const QRectF& rect, uint textureId,
|
||||
Qt::Orientations mirrored )
|
||||
{
|
||||
Q_D( QskTextureNode );
|
||||
|
||||
if ( ( d->rect != rect ) || ( d->mirrored != mirrored ) )
|
||||
{
|
||||
d->rect = rect;
|
||||
d->mirrored = mirrored;
|
||||
|
||||
d->updateTextureGeometry();
|
||||
markDirty( DirtyGeometry );
|
||||
}
|
||||
|
||||
if ( textureId != this->textureId() )
|
||||
{
|
||||
d->setTextureId( window, textureId );
|
||||
markDirty( DirtyMaterial );
|
||||
}
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
||||
|
||||
void QskTextureNodePrivate::setTextureId( QQuickWindow*, uint textureId )
|
||||
{
|
||||
qskDeleteTexture( this->material );
|
||||
|
||||
this->material.setTextureId( textureId );
|
||||
this->opaqueMaterial.setTextureId( textureId );
|
||||
}
|
||||
|
||||
uint QskTextureNode::textureId() const
|
||||
{
|
||||
Q_D( const QskTextureNode );
|
||||
return d->material.textureId();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
|
||||
|
||||
void QskTextureNodePrivate::setTextureId( QQuickWindow* window, uint textureId )
|
||||
{
|
||||
auto texture = this->material.texture();
|
||||
|
||||
if ( texture )
|
||||
{
|
||||
// we do not want to create a new QSGTexture object only
|
||||
// to replace the textureId
|
||||
|
||||
switch( window->rendererInterface()->graphicsApi() )
|
||||
{
|
||||
case QSGRendererInterface::OpenGL:
|
||||
{
|
||||
qskUpdateGLTextureId( texture->rhiTexture(), textureId );
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
delete texture;
|
||||
texture = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( textureId > 0 && texture == nullptr )
|
||||
{
|
||||
texture = QNativeInterface::QSGOpenGLTexture::fromNative(
|
||||
static_cast< GLuint >( textureId ), window,
|
||||
this->rect.size().toSize(), QQuickWindow::TextureHasAlphaChannel );
|
||||
|
||||
}
|
||||
|
||||
this->material.setTexture( texture );
|
||||
this->opaqueMaterial.setTexture( texture );
|
||||
}
|
||||
|
||||
uint QskTextureNode::textureId() const
|
||||
{
|
||||
Q_D( const QskTextureNode );
|
||||
|
||||
if ( auto texture = d->material.texture() )
|
||||
{
|
||||
const auto nativeTexture = texture->rhiTexture()->nativeTexture();
|
||||
return nativeTexture.object;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
bool QskTextureNode::isNull() const
|
||||
{
|
||||
return textureId() == 0;
|
||||
}
|
||||
|
||||
QRectF QskTextureNode::rect() const
|
||||
{
|
||||
Q_D( const QskTextureNode );
|
||||
return d->rect;
|
||||
}
|
||||
|
||||
Qt::Orientations QskTextureNode::mirrored() const
|
||||
{
|
||||
Q_D( const QskTextureNode );
|
||||
return d->mirrored;
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
/******************************************************************************
|
||||
* QSkinny - Copyright (C) 2016 Uwe Rathmann
|
||||
* This file may be used under the terms of the QSkinny License, Version 1.0
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef QSK_TEXTURE_NODE_H
|
||||
#define QSK_TEXTURE_NODE_H
|
||||
|
||||
#include "QskGlobal.h"
|
||||
|
||||
#include <qnamespace.h>
|
||||
#include <qsgnode.h>
|
||||
|
||||
class QQuickWindow;
|
||||
class QskTextureNodePrivate;
|
||||
|
||||
class QSK_EXPORT QskTextureNode : public QSGGeometryNode
|
||||
{
|
||||
public:
|
||||
QskTextureNode();
|
||||
~QskTextureNode() override;
|
||||
|
||||
bool isNull() const;
|
||||
|
||||
void setTexture( QQuickWindow*, const QRectF&, uint id,
|
||||
Qt::Orientations mirrored = Qt::Orientations() );
|
||||
|
||||
uint textureId() const;
|
||||
QRectF rect() const;
|
||||
Qt::Orientations mirrored() const;
|
||||
|
||||
private:
|
||||
Q_DECLARE_PRIVATE( QskTextureNode )
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -111,7 +111,6 @@ HEADERS += \
|
|||
nodes/QskSGNode.h \
|
||||
nodes/QskTextNode.h \
|
||||
nodes/QskTextRenderer.h \
|
||||
nodes/QskTextureNode.h \
|
||||
nodes/QskTextureRenderer.h \
|
||||
nodes/QskTickmarksNode.h \
|
||||
nodes/QskVertex.h
|
||||
|
|
@ -132,7 +131,6 @@ SOURCES += \
|
|||
nodes/QskSGNode.cpp \
|
||||
nodes/QskTextNode.cpp \
|
||||
nodes/QskTextRenderer.cpp \
|
||||
nodes/QskTextureNode.cpp \
|
||||
nodes/QskTextureRenderer.cpp \
|
||||
nodes/QskTickmarksNode.cpp \
|
||||
nodes/QskVertex.cpp
|
||||
|
|
|
|||
Loading…
Reference in New Issue