Browse Source

Fix a few OpenGL problems in TVScreen that was causing the widget to be partially transparent and corrupted. Also fix a few hazzards

chirpmodem-v8.0.0
Jon Beniston 2 months ago
parent
commit
c91655cde9
  1. 1
      plugins/channelrx/demoddatv/datvideorender.cpp
  2. 1
      sdrgui/dsp/scopevisxy.cpp
  3. 79
      sdrgui/gui/glshadertvarray.cpp
  4. 67
      sdrgui/gui/tvscreen.cpp
  5. 7
      sdrgui/gui/tvscreen.h
  6. 23
      sdrgui/gui/tvscreenanalog.cpp
  7. 3
      sdrgui/gui/tvscreenanalog.h

1
plugins/channelrx/demoddatv/datvideorender.cpp

@ -522,7 +522,6 @@ bool DATVideoRender::renderStream() @@ -522,7 +522,6 @@ bool DATVideoRender::renderStream()
//Rendering device setup
resizeTVScreen(m_frame->width, m_frame->height);
update();
resetImage();
m_currentRenderWidth = m_frame->width;

1
sdrgui/dsp/scopevisxy.cpp

@ -85,7 +85,6 @@ void ScopeVisXY::feed(const SampleVector::const_iterator& cbegin, const SampleVe @@ -85,7 +85,6 @@ void ScopeVisXY::feed(const SampleVector::const_iterator& cbegin, const SampleVe
}
m_tvScreen->renderImage(0);
m_tvScreen->update();
std::this_thread::sleep_for(std::chrono::microseconds(5000));
m_tvScreen->resetImage(m_alphaReset);
drawGraticule();

79
sdrgui/gui/glshadertvarray.cpp

@ -21,6 +21,20 @@ @@ -21,6 +21,20 @@
#include "gui/glshadertvarray.h"
static const int nbVertices = 6;
static const GLfloat vertices[] =
// 2 3
// 1 4
//1 2 3 3 4 1
{ -1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, -1.0f, -1.0f, -1.0f };
static const GLfloat textureCoords[] =
// 1 4
// 2 3
//1 2 3 3 4 1
{ 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f };
const QString GLShaderTVArray::m_strVertexShaderSourceArray2 = QString(
"uniform highp mat4 uMatrix;\n"
"attribute highp vec4 vertex;\n"
@ -137,6 +151,7 @@ void GLShaderTVArray::initializeGL(int majorVersion, int minorVersion, int intCo @@ -137,6 +151,7 @@ void GLShaderTVArray::initializeGL(int majorVersion, int minorVersion, int intCo
}
m_objProgram->bindAttributeLocation("vertex", 0);
m_objProgram->bindAttributeLocation("texCoord", 1);
if (!m_objProgram->link())
{
@ -149,13 +164,25 @@ void GLShaderTVArray::initializeGL(int majorVersion, int minorVersion, int intCo @@ -149,13 +164,25 @@ void GLShaderTVArray::initializeGL(int majorVersion, int minorVersion, int intCo
m_objProgram->setUniformValue(m_textureLoc, 0);
if (m_vao)
{
// Geometry is constant, so upload it once and record it in the VAO
m_verticesBuf = new QOpenGLBuffer(QOpenGLBuffer::VertexBuffer);
m_verticesBuf->setUsagePattern(QOpenGLBuffer::DynamicDraw);
m_verticesBuf->setUsagePattern(QOpenGLBuffer::StaticDraw);
m_verticesBuf->create();
m_verticesBuf->bind();
m_verticesBuf->allocate(vertices, sizeof(vertices));
m_objProgram->enableAttributeArray(0);
m_objProgram->setAttributeBuffer(0, GL_FLOAT, 0, 2);
m_textureCoordsBuf = new QOpenGLBuffer(QOpenGLBuffer::VertexBuffer);
m_textureCoordsBuf->setUsagePattern(QOpenGLBuffer::DynamicDraw);
m_textureCoordsBuf->setUsagePattern(QOpenGLBuffer::StaticDraw);
m_textureCoordsBuf->create();
m_textureCoordsBuf->bind();
m_textureCoordsBuf->allocate(textureCoords, sizeof(textureCoords));
m_objProgram->enableAttributeArray(1);
m_objProgram->setAttributeBuffer(1, GL_FLOAT, 0, 2);
m_vao->release();
m_textureCoordsBuf->release();
}
m_objProgram->release();
}
@ -170,6 +197,7 @@ void GLShaderTVArray::initializeGL(int majorVersion, int minorVersion, int intCo @@ -170,6 +197,7 @@ void GLShaderTVArray::initializeGL(int majorVersion, int minorVersion, int intCo
}
//Image container
delete m_objImage;
m_objImage = new QImage(intCols, intRows, QImage::Format_RGBA8888);
m_objImage->fill(QColor(0, 0, 0));
@ -208,22 +236,9 @@ void GLShaderTVArray::RenderPixels(unsigned char *chrData) @@ -208,22 +236,9 @@ void GLShaderTVArray::RenderPixels(unsigned char *chrData)
QOpenGLFunctions *ptrF;
int intI;
int intJ;
int intNbVertices = 6;
QMatrix4x4 objQMatrix;
GLfloat arrVertices[] =
// 2 3
// 1 4
//1 2 3 3 4 1
{ -1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, -1.0f, -1.0f, -1.0f };
GLfloat arrTextureCoords[] =
// 1 4
// 2 3
//1 2 3 3 4 1
{ 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f };
QRgb *ptrLine;
int intVal;
@ -270,13 +285,23 @@ void GLShaderTVArray::RenderPixels(unsigned char *chrData) @@ -270,13 +285,23 @@ void GLShaderTVArray::RenderPixels(unsigned char *chrData)
if (m_blnAlphaReset)
{
ptrF->glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
ptrF->glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
ptrF->glClear(GL_COLOR_BUFFER_BIT);
m_blnAlphaReset = false;
}
if (m_blnAlphaBlend)
{
ptrF->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
// The image alpha controls the RGB trace fade, but the backing FBO
// itself must remain opaque, as QOpenGLWidget composites its alpha
// into the window. Keep the destination alpha (cleared to 1) as is.
ptrF->glBlendFuncSeparate(
GL_SRC_ALPHA,
GL_ONE_MINUS_SRC_ALPHA,
GL_ZERO,
GL_ONE
);
ptrF->glEnable(GL_BLEND);
}
else
@ -292,27 +317,17 @@ void GLShaderTVArray::RenderPixels(unsigned char *chrData) @@ -292,27 +317,17 @@ void GLShaderTVArray::RenderPixels(unsigned char *chrData)
if (m_vao)
{
m_vao->bind();
m_verticesBuf->bind();
m_verticesBuf->allocate(arrVertices, intNbVertices * 2 * sizeof(GL_FLOAT));
m_objProgram->enableAttributeArray(0);
m_objProgram->setAttributeBuffer(0, GL_FLOAT, 0, 2);
m_textureCoordsBuf->bind();
m_textureCoordsBuf->allocate(arrTextureCoords, intNbVertices * 2 * sizeof(GL_FLOAT));
m_objProgram->enableAttributeArray(1);
m_objProgram->setAttributeBuffer(1, GL_FLOAT, 0, 2);
}
else
{
ptrF->glEnableVertexAttribArray(0); // vertex
ptrF->glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, arrVertices);
ptrF->glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, vertices);
ptrF->glEnableVertexAttribArray(1); // texture coordinates
ptrF->glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 0, arrTextureCoords);
ptrF->glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 0, textureCoords);
}
ptrF->glDrawArrays(GL_TRIANGLES, 0, intNbVertices);
ptrF->glDrawArrays(GL_TRIANGLES, 0, nbVertices);
//cleanup
if (m_vao)
@ -334,7 +349,10 @@ void GLShaderTVArray::RenderPixels(unsigned char *chrData) @@ -334,7 +349,10 @@ void GLShaderTVArray::RenderPixels(unsigned char *chrData)
void GLShaderTVArray::ResetPixels()
{
if (m_objImage) {
m_objImage->fill(0);
// This image is copied directly to a QOpenGLWidget framebuffer when
// alpha blending is disabled. A value of 0 is transparent black in
// RGBA8888, which makes cleared constellation backgrounds transparent.
m_objImage->fill(qRgba(0, 0, 0, 255));
}
}
@ -419,4 +437,3 @@ bool GLShaderTVArray::SetDataColor(int intCol, QRgb objColor) @@ -419,4 +437,3 @@ bool GLShaderTVArray::SetDataColor(int intCol, QRgb objColor)
return blnRslt;
}

67
sdrgui/gui/tvscreen.cpp

@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
// Note: When this object is created, QWidget* is converted to bool
TVScreen::TVScreen(bool color, QWidget* parent) :
QOpenGLWidget(parent),
m_alphaBlend(false),
m_glShaderArray(color)
{
setAttribute(Qt::WA_OpaquePaintEvent);
@ -47,6 +48,7 @@ TVScreen::TVScreen(bool color, QWidget* parent) : @@ -47,6 +48,7 @@ TVScreen::TVScreen(bool color, QWidget* parent) :
m_lastData = nullptr;
m_dataChanged = false;
m_glContextInitialized = false;
m_framebufferNeedsPaint = true;
//Par défaut
m_askedCols = TV_COLS;
@ -64,6 +66,20 @@ void TVScreen::setColor(bool color) @@ -64,6 +66,20 @@ void TVScreen::setColor(bool color)
m_glShaderArray.setColor(color);
}
void TVScreen::setAlphaBlend(bool alphaBlend)
{
// Alpha blending is used to fade scope traces by drawing each frame over
// the previous one. QOpenGLWidget discards its framebuffer after paintGL()
// by default, which leaves undefined colours to blend with on the next
// frame. Preserve it while blending is enabled.
QMutexLocker mlock(&m_mutex);
setUpdateBehavior(alphaBlend ? QOpenGLWidget::PartialUpdate : QOpenGLWidget::NoPartialUpdate);
m_alphaBlend = alphaBlend;
// Framebuffer contents may have been invalidated with NoPartialUpdate
m_framebufferNeedsPaint = true;
m_glShaderArray.setAlphaBlend(alphaBlend);
}
QRgb* TVScreen::getRowBuffer(int row)
{
if (!m_glContextInitialized) {
@ -75,17 +91,27 @@ QRgb* TVScreen::getRowBuffer(int row) @@ -75,17 +91,27 @@ QRgb* TVScreen::getRowBuffer(int row)
void TVScreen::renderImage(unsigned char * data)
{
m_lastData = data;
m_dataChanged = true;
{
QMutexLocker mlock(&m_mutex);
m_lastData = data;
m_dataChanged.store(true, std::memory_order_release);
}
// renderImage() is normally called by a DSP worker. Schedule the repaint
// on the widget's thread instead of relying on QWidget::update() being
// called from that worker.
QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
}
void TVScreen::resetImage()
{
QMutexLocker mlock(&m_mutex);
m_glShaderArray.ResetPixels();
}
void TVScreen::resetImage(int alpha)
{
QMutexLocker mlock(&m_mutex);
m_glShaderArray.ResetPixels(alpha);
}
@ -97,6 +123,7 @@ void TVScreen::resizeTVScreen(int cols, int intRows) @@ -97,6 +123,7 @@ void TVScreen::resizeTVScreen(int cols, int intRows)
m_askedRows = intRows;
m_cols = cols;
m_rows = intRows;
m_framebufferNeedsPaint = true;
}
void TVScreen::getSize(int& cols, int& intRows) const
@ -162,6 +189,7 @@ void TVScreen::initializeGL() @@ -162,6 +189,7 @@ void TVScreen::initializeGL()
);
m_glContextInitialized = true;
m_framebufferNeedsPaint = true;
}
void TVScreen::resizeGL(int width, int height)
@ -169,15 +197,15 @@ void TVScreen::resizeGL(int width, int height) @@ -169,15 +197,15 @@ void TVScreen::resizeGL(int width, int height)
QMutexLocker mlock(&m_mutex);
QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
f->glViewport(0, 0, width, height);
m_framebufferNeedsPaint = true;
}
void TVScreen::paintGL()
{
if (!m_mutex.tryLock(2)) {
return;
}
m_dataChanged = false;
// Other threads only hold the mutex briefly, so wait for it rather than
// skipping the paint, which would leave Qt compositing a stale or
// invalidated framebuffer.
m_mutex.lock();
if ((m_askedCols != 0) && (m_askedRows != 0))
{
@ -192,7 +220,30 @@ void TVScreen::paintGL() @@ -192,7 +220,30 @@ void TVScreen::paintGL()
m_askedRows = 0;
}
if (m_framebufferNeedsPaint)
{
// QOpenGLWidget backing stores have an alpha channel. Initialize a new
// or resized one even when no constellation or video frame is ready,
// otherwise Qt can composite the uninitialized buffer as transparent.
QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
f->glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
f->glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
f->glClear(GL_COLOR_BUFFER_BIT);
}
// With PartialUpdate the previous framebuffer is deliberately retained.
// Do not blend the same fading image again for incidental repaints, such
// as mouse hover or moving another overlay over this widget.
const bool dataChanged = m_dataChanged.exchange(false, std::memory_order_acq_rel);
if (m_alphaBlend && !dataChanged && !m_framebufferNeedsPaint)
{
m_mutex.unlock();
return;
}
m_glShaderArray.RenderPixels(m_lastData);
m_framebufferNeedsPaint = false;
m_mutex.unlock();
}
@ -203,7 +254,7 @@ void TVScreen::mousePressEvent(QMouseEvent* event) @@ -203,7 +254,7 @@ void TVScreen::mousePressEvent(QMouseEvent* event)
void TVScreen::tick()
{
if (m_dataChanged) {
if (m_dataChanged.load(std::memory_order_acquire)) {
update();
}
}

7
sdrgui/gui/tvscreen.h

@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
#include <QRecursiveMutex>
#include <QFont>
#include <QMatrix4x4>
#include <atomic>
#include "dsp/dsptypes.h"
#include "glshadertextured.h"
#include "glshadertvarray.h"
@ -59,7 +60,7 @@ public: @@ -59,7 +60,7 @@ public:
bool selectRow(int line);
bool setDataColor(int col, int red, int green, int blue);
bool setDataColor(int col, int red, int green, int blue, int alpha);
void setAlphaBlend(bool alphaBlend) { m_glShaderArray.setAlphaBlend(alphaBlend); }
void setAlphaBlend(bool alphaBlend);
void setAlphaReset() { m_glShaderArray.setAlphaReset(); }
void connectTimer(const QTimer& timer);
@ -81,7 +82,9 @@ private: @@ -81,7 +82,9 @@ private:
// state
QTimer m_timer;
QRecursiveMutex m_mutex;
bool m_dataChanged;
bool m_alphaBlend;
bool m_framebufferNeedsPaint;
std::atomic_bool m_dataChanged;
GLShaderTVArray m_glShaderArray;

23
sdrgui/gui/tvscreenanalog.cpp

@ -73,7 +73,7 @@ static const char* fragmentShaderSource2 = @@ -73,7 +73,7 @@ static const char* fragmentShaderSource2 =
" float p12 = mix(p1, p2, fract(txs1));\n"
" float p34 = mix(p3, p4, fract(txs3));\n"
" float p = mix(p12, p34, fract(tys));\n"
" gl_FragColor = vec4(p);\n"
" gl_FragColor = vec4(p, p, p, 1.0);\n"
"}\n";
static const char* fragmentShaderSource =
@ -109,7 +109,7 @@ static const char* fragmentShaderSource = @@ -109,7 +109,7 @@ static const char* fragmentShaderSource =
" float p12 = mix(p1, p2, fract(txs1));\n"
" float p34 = mix(p3, p4, fract(txs3));\n"
" float p = mix(p12, p34, fract(tys));\n"
" fragColor = vec4(p);\n"
" fragColor = vec4(p, p, p, 1.0);\n"
"}\n";
TVScreenAnalog::TVScreenAnalog(QWidget *parent) :
@ -121,6 +121,7 @@ TVScreenAnalog::TVScreenAnalog(QWidget *parent) : @@ -121,6 +121,7 @@ TVScreenAnalog::TVScreenAnalog(QWidget *parent) :
m_imageTexture(nullptr),
m_lineShiftsTexture(nullptr)
{
setAttribute(Qt::WA_OpaquePaintEvent);
m_isDataChanged = false;
m_frontBuffer = new TVScreenAnalogBuffer(5, 1);
m_backBuffer = new TVScreenAnalogBuffer(5, 1);
@ -283,6 +284,8 @@ void TVScreenAnalog::initializeGL() @@ -283,6 +284,8 @@ void TVScreenAnalog::initializeGL()
void TVScreenAnalog::initializeTextures(TVScreenAnalogBuffer *buffer)
{
delete m_imageTexture;
delete m_lineShiftsTexture;
m_imageTexture = new QOpenGLTexture(QOpenGLTexture::Target2D);
m_lineShiftsTexture = new QOpenGLTexture(QOpenGLTexture::Target2D);
m_imageTexture->setSize(buffer->getWidth(), buffer->getHeight());
@ -308,13 +311,13 @@ TVScreenAnalogBuffer *TVScreenAnalog::swapBuffers() @@ -308,13 +311,13 @@ TVScreenAnalogBuffer *TVScreenAnalog::swapBuffers()
{
QMutexLocker lock(&m_buffersMutex);
std::swap(m_frontBuffer, m_backBuffer);
m_isDataChanged = true;
m_isDataChanged.store(true, std::memory_order_release);
return m_backBuffer;
}
void TVScreenAnalog::tick()
{
if (m_isDataChanged)
if (m_isDataChanged.load(std::memory_order_acquire))
{
update();
}
@ -322,7 +325,7 @@ void TVScreenAnalog::tick() @@ -322,7 +325,7 @@ void TVScreenAnalog::tick()
void TVScreenAnalog::paintGL()
{
m_isDataChanged = false;
m_isDataChanged.store(false, std::memory_order_release);
if (!m_shader)
{
@ -331,6 +334,8 @@ void TVScreenAnalog::paintGL() @@ -331,6 +334,8 @@ void TVScreenAnalog::paintGL()
return;
}
// Hold the buffers lock only while the front buffer is being read
QMutexLocker lock(&m_buffersMutex);
TVScreenAnalogBuffer *buffer = m_frontBuffer;
if (!m_imageTexture ||
@ -363,6 +368,8 @@ void TVScreenAnalog::paintGL() @@ -363,6 +368,8 @@ void TVScreenAnalog::paintGL()
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0,
1, buffer->getHeight(), GL_RGBA, GL_UNSIGNED_BYTE, buffer->getLineShiftData());
lock.unlock();
float rectHalfWidth = 1.0f + 4.0f / (imageWidth - 4.0f);
GLfloat vertices[] =
{
@ -416,4 +423,10 @@ void TVScreenAnalog::paintGL() @@ -416,4 +423,10 @@ void TVScreenAnalog::paintGL()
}
m_shader->release();
// Leave texture unit 0 active with nothing bound
glActiveTexture(GL_TEXTURE1);
m_lineShiftsTexture->release();
glActiveTexture(GL_TEXTURE0);
m_imageTexture->release();
}

3
sdrgui/gui/tvscreenanalog.h

@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
#include <QOpenGLShaderProgram>
#include <QOpenGLVertexArrayObject>
#include <QOpenGLBuffer>
#include <atomic>
class TVScreenAnalogBuffer
{
@ -119,7 +120,7 @@ class SDRGUI_API TVScreenAnalog : public QOpenGLWidget, protected QOpenGLFunctio @@ -119,7 +120,7 @@ class SDRGUI_API TVScreenAnalog : public QOpenGLWidget, protected QOpenGLFunctio
QTimer m_updateTimer;
bool m_isDataChanged;
std::atomic_bool m_isDataChanged;
int m_textureLoc1;
int m_textureLoc2;

Loading…
Cancel
Save