AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rhi: QRhiGles2 use proper texture target for multisampled textures

Browse Source 
Change-Id: I6e92a66f2758599626e7bdfbb2e149bb69192479
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Paul Lemire 2020-08-12 16:10:07 +02:00
parent f107713452
commit 77a985a876
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/rhi/qrhigles2.cpp
View File

@ -297,6 +297,10 @@ QT_BEGIN_NAMESPACE
#define GL_MAP_READ_BIT 0x0001 #define GL_MAP_READ_BIT 0x0001
#endif #endif
#ifndef GL_TEXTURE_2D_MULTISAMPLE
#define GL_TEXTURE_2D_MULTISAMPLE 0x9100
#endif
/*! /*!
Constructs a new QRhiGles2InitParams. Constructs a new QRhiGles2InitParams.
@ -528,6 +532,13 @@ bool QRhiGles2::create(QRhi::Flags flags)
caps.uintAttributes = caps.ctxMajor >= 3; // 3.0 or ES 3.0 caps.uintAttributes = caps.ctxMajor >= 3; // 3.0 or ES 3.0
caps.screenSpaceDerivatives = f->hasOpenGLExtension(QOpenGLExtensions::StandardDerivatives); caps.screenSpaceDerivatives = f->hasOpenGLExtension(QOpenGLExtensions::StandardDerivatives);
// TO DO: We could also check for ARB_texture_multisample but it is not
// currently in QOpenGLExtensions
// 3.0 or ES 3.1
caps.multisampledTexture = caps.gles
? (caps.ctxMajor > 3 || (caps.ctxMajor >= 3 && caps.ctxMinor >= 1))
: (caps.ctxMajor >= 3);
if (!caps.gles) { if (!caps.gles) {
f->glEnable(GL_VERTEX_PROGRAM_POINT_SIZE); f->glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
f->glEnable(GL_POINT_SPRITE); f->glEnable(GL_POINT_SPRITE);
@ -850,7 +861,7 @@ bool QRhiGles2::isFeatureSupported(QRhi::Feature feature) const
{ {
switch (feature) { switch (feature) {
case QRhi::MultisampleTexture: case QRhi::MultisampleTexture:
return false; return caps.multisampledTexture;
case QRhi::MultisampleRenderBuffer: case QRhi::MultisampleRenderBuffer:
return caps.msaaRenderBuffer; return caps.msaaRenderBuffer;
case QRhi::DebugMarkers: case QRhi::DebugMarkers:
@ -3810,7 +3821,8 @@ bool QGles2Texture::prepareCreate(QSize *adjustedSize)
const bool hasMipMaps = m_flags.testFlag(MipMapped); const bool hasMipMaps = m_flags.testFlag(MipMapped);
const bool isCompressed = rhiD->isCompressedFormat(m_format); const bool isCompressed = rhiD->isCompressedFormat(m_format);
target = isCube ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D; target = isCube ? GL_TEXTURE_CUBE_MAP
: m_sampleCount > 1 ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D;
mipLevelCount = hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1; mipLevelCount = hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1;
gltype = GL_UNSIGNED_BYTE; gltype = GL_UNSIGNED_BYTE;
@ -4119,7 +4131,8 @@ bool QGles2TextureRenderTarget::create()
} }
} else { } else {
QGles2Texture *depthTexD = QRHI_RES(QGles2Texture, m_desc.depthTexture()); QGles2Texture *depthTexD = QRHI_RES(QGles2Texture, m_desc.depthTexture());
rhiD->f->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, depthTexD->texture, 0); rhiD->f->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, depthTexD->target,
depthTexD->texture, 0);
if (d.colorAttCount == 0) { if (d.colorAttCount == 0) {
d.pixelSize = depthTexD->pixelSize(); d.pixelSize = depthTexD->pixelSize();
d.sampleCount = 1; d.sampleCount = 1;

2
src/gui/rhi/qrhigles2_p_p.h
View File

@ -844,6 +844,7 @@ public:
maxTextureSize(2048), maxTextureSize(2048),
maxDrawBuffers(4), maxDrawBuffers(4),
msaaRenderBuffer(false), msaaRenderBuffer(false),
multisampledTexture(false),
npotTextureFull(true), npotTextureFull(true),
gles(false), gles(false),
fixedIndexPrimitiveRestart(false), fixedIndexPrimitiveRestart(false),
@ -879,6 +880,7 @@ public:
// Multisample fb and blit are supported (GLES 3.0 or OpenGL 3.x). Not // Multisample fb and blit are supported (GLES 3.0 or OpenGL 3.x). Not
// the same as multisample textures! // the same as multisample textures!
uint msaaRenderBuffer : 1; uint msaaRenderBuffer : 1;
uint multisampledTexture : 1;
uint npotTextureFull : 1; uint npotTextureFull : 1;
uint gles : 1; uint gles : 1;
uint fixedIndexPrimitiveRestart : 1; uint fixedIndexPrimitiveRestart : 1;