Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.0:Update
plasma-framework
0002-Revert-windowthumbnail-Use-mipmap-texture-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0002-Revert-windowthumbnail-Use-mipmap-texture-filtering.patch of Package plasma-framework
From 505295ce4b4887625295cdb70891949e28e087e8 Mon Sep 17 00:00:00 2001 From: David Edmundson <kde@davidedmundson.co.uk> Date: Thu, 3 May 2018 23:14:24 +0100 Subject: [PATCH 2/2] Revert "windowthumbnail: Use mipmap texture filtering" This reverts commit 612494e2b2e9265d33ce148332d5f490b024a3bd. This caused a huge regression for some drivers breaking functionality completely. Better to revert for now, and try again when we have it fully working. See 393241 --- src/declarativeimports/core/windowthumbnail.cpp | 130 +----------------------- src/declarativeimports/core/windowthumbnail.h | 3 - 2 files changed, 5 insertions(+), 128 deletions(-) diff --git a/src/declarativeimports/core/windowthumbnail.cpp b/src/declarativeimports/core/windowthumbnail.cpp index 906455d96..f9e955479 100644 --- a/src/declarativeimports/core/windowthumbnail.cpp +++ b/src/declarativeimports/core/windowthumbnail.cpp @@ -23,13 +23,9 @@ #include <QGuiApplication> #include <QIcon> #include <QOpenGLContext> -#include <QOpenGLFunctions> -#include <QOpenGLExtraFunctions> #include <QQuickWindow> #include <QRunnable> -#include <cmath> - // X11 #if HAVE_XCB_COMPOSITE #include <QX11Info> @@ -57,9 +53,6 @@ namespace Plasma class DiscardGlxPixmapRunnable : public QRunnable { public: DiscardGlxPixmapRunnable( - uint, - uint, - uint, uint, QFunctionPointer, xcb_pixmap_t @@ -67,20 +60,13 @@ public: void run() Q_DECL_OVERRIDE; private: uint m_texture; - uint m_mipmaps; - uint m_readFb; - uint m_drawFb; QFunctionPointer m_releaseTexImage; xcb_pixmap_t m_glxPixmap; }; -DiscardGlxPixmapRunnable::DiscardGlxPixmapRunnable(uint texture, uint mipmaps, uint readFb, uint drawFb, - QFunctionPointer deleteFunction, xcb_pixmap_t pixmap) +DiscardGlxPixmapRunnable::DiscardGlxPixmapRunnable(uint texture, QFunctionPointer deleteFunction, xcb_pixmap_t pixmap) : QRunnable(), m_texture(texture), - m_mipmaps(mipmaps), - m_readFb(readFb), - m_drawFb(drawFb), m_releaseTexImage(deleteFunction), m_glxPixmap(pixmap) {} @@ -91,12 +77,7 @@ void DiscardGlxPixmapRunnable::run() Display *d = QX11Info::display(); ((glXReleaseTexImageEXT_func)(m_releaseTexImage))(d, m_glxPixmap, GLX_FRONT_LEFT_EXT); glXDestroyPixmap(d, m_glxPixmap); - - GLuint textures[] = { m_texture, m_mipmaps }; - GLuint framebuffers[] = { m_readFb, m_drawFb }; - - glDeleteTextures(2, textures); - QOpenGLContext::currentContext()->functions()->glDeleteFramebuffers(2, framebuffers); + glDeleteTextures(1, &m_texture); } } #endif //HAVE_GLX @@ -133,27 +114,6 @@ void DiscardEglPixmapRunnable::run() #endif//HAVE_EGL #endif //HAVE_XCB_COMPOSITE -// QSGSimpleTextureNode does not support mipmap filtering, so this is the -// only way to prevent it from setting TEXTURE_MIN_FILTER to LINEAR. -class ThumbnailTexture : public QSGTexture -{ -public: - ThumbnailTexture(int texture, const QSize &size) : m_texture(texture), m_size(size) {} - void bind() override final { glBindTexture(GL_TEXTURE_2D, m_texture); } - bool hasAlphaChannel() const override final { return true; } - bool hasMipmaps() const override final { return true; } - int textureId() const override final { return m_texture; } - QSize textureSize() const override final { return m_size; } - -private: - int m_texture; - QSize m_size; -}; - - -// ------------------------------------------------------------------ - - WindowTextureNode::WindowTextureNode() : QSGSimpleTextureNode() { @@ -185,9 +145,6 @@ WindowThumbnail::WindowThumbnail(QQuickItem *parent) , m_damage(XCB_NONE) , m_pixmap(XCB_PIXMAP_NONE) , m_texture(0) - , m_mipmaps(0) - , m_readFb(0) - , m_drawFb(0) #if HAVE_GLX , m_glxPixmap(XCB_PIXMAP_NONE) , m_bindTexImage(nullptr) @@ -277,9 +234,6 @@ void WindowThumbnail::releaseResources() #if HAVE_GLX if (m_glxPixmap != XCB_PIXMAP_NONE) { window()->scheduleRenderJob(new DiscardGlxPixmapRunnable(m_texture, - m_mipmaps, - m_readFb, - m_drawFb, m_releaseTexImage, m_glxPixmap), m_renderStage); @@ -431,22 +385,6 @@ bool WindowThumbnail::windowToTextureGLX(WindowTextureNode *textureNode) if (!m_bindTexImage || !m_releaseTexImage) { return false; } - - QOpenGLContext *ctx = QOpenGLContext::currentContext(); - - QOpenGLFunctions *funcs = ctx->functions(); - QOpenGLExtraFunctions *extraFuncs = ctx->extraFunctions(); - - static bool haveTextureStorage = !ctx->isOpenGLES() && - ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_storage")); - - // Save the GL state - GLuint prevReadFb = 0, prevDrawFb = 0, prevTex2D = 0, prevScissorTest = 0; - funcs->glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, (GLint *) &prevReadFb); - funcs->glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, (GLint *) &prevDrawFb); - funcs->glGetIntegerv(GL_TEXTURE_BINDING_2D, (GLint *) &prevTex2D); - funcs->glGetIntegerv(GL_SCISSOR_TEST, (GLint *) &prevScissorTest); - if (m_glxPixmap == XCB_PIXMAP_NONE) { xcb_connection_t *c = QX11Info::connection(); auto attrCookie = xcb_get_window_attributes_unchecked(c, m_winId); @@ -469,64 +407,10 @@ bool WindowThumbnail::windowToTextureGLX(WindowTextureNode *textureNode) return false; } - const uint32_t width = geo->width; - const uint32_t height = geo->height; - const uint32_t levels = std::log2(std::min(width, height)) + 1; - - funcs->glBindTexture(GL_TEXTURE_2D, m_mipmaps); - funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, levels - 1); - - if (haveTextureStorage) - extraFuncs->glTexStorage2D(GL_TEXTURE_2D, levels, GL_RGBA8, width, height); - else - funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr); - - GLuint framebuffers[2]; - funcs->glGenFramebuffers(2, framebuffers); - - m_readFb = framebuffers[0]; - m_drawFb = framebuffers[1]; - - ThumbnailTexture *texture = new ThumbnailTexture(m_mipmaps, QSize(width, height)); - textureNode->reset(texture); + textureNode->reset(window()->createTextureFromId(m_texture, QSize(geo->width, geo->height), QQuickWindow::TextureCanUseAtlas)); } - - funcs->glBindTexture(GL_TEXTURE_2D, m_texture); + textureNode->texture()->bind(); bindGLXTexture(); - - const QSize size = textureNode->texture()->textureSize(); - - // Blit the window texture to the mipmap texture - funcs->glBindFramebuffer(GL_READ_FRAMEBUFFER, m_readFb); - funcs->glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_drawFb); - - funcs->glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0); - funcs->glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_mipmaps, 0); - - if (prevScissorTest) - glDisable(GL_SCISSOR_TEST); - - extraFuncs->glBlitFramebuffer(0, 0, size.width(), size.height(), - 0, 0, size.width(), size.height(), - GL_COLOR_BUFFER_BIT, GL_NEAREST); - - // Regenerate the miplevels - funcs->glBindTexture(GL_TEXTURE_2D, m_mipmaps); - funcs->glGenerateMipmap(GL_TEXTURE_2D); - - // Restore the GL state - funcs->glBindFramebuffer(GL_READ_FRAMEBUFFER, prevReadFb); - funcs->glBindFramebuffer(GL_DRAW_FRAMEBUFFER, prevDrawFb); - - funcs->glBindTexture(GL_TEXTURE_2D, prevTex2D); - - if (prevScissorTest) - glEnable(GL_SCISSOR_TEST); - return true; } return false; @@ -917,11 +801,7 @@ bool WindowThumbnail::loadGLXTexture() return false; } - GLuint textures[2]; - glGenTextures(2, textures); - - m_texture = textures[0]; - m_mipmaps = textures[1]; + glGenTextures(1, &m_texture); const int attrs[] = { GLX_TEXTURE_FORMAT_EXT, info->textureFormat, diff --git a/src/declarativeimports/core/windowthumbnail.h b/src/declarativeimports/core/windowthumbnail.h index be2eab6a2..bd667af58 100644 --- a/src/declarativeimports/core/windowthumbnail.h +++ b/src/declarativeimports/core/windowthumbnail.h @@ -126,9 +126,6 @@ private: /*The following must *only* be used from the render thread*/ uint m_texture; - uint m_mipmaps; - uint m_readFb; - uint m_drawFb; #if HAVE_GLX bool windowToTextureGLX(WindowTextureNode *textureNode); void resolveGLXFunctions(); -- 2.16.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
