VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 01:39:05 -05:00
Code Issues Projects Releases Wiki Activity

Massive UI revamping (v7): GLShaderTVArray: updated make proper initialization list

Browse Source
This commit is contained in:
f4exb 2022-04-14 13:16:01 +02:00
parent 98a3a76ca1
commit 054d989040
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sdrgui/gui/glshadertvarray.cpp
View File

@ -37,24 +37,25 @@ const QString GLShaderTVArray::m_strFragmentShaderSourceColored = QString(
" gl_FragColor = texture2D(uTexture, texCoordVar);\n" " gl_FragColor = texture2D(uTexture, texCoordVar);\n"
"}\n"); "}\n");
GLShaderTVArray::GLShaderTVArray(bool blnColor) : m_blnColor(blnColor) GLShaderTVArray::GLShaderTVArray(bool blnColor) :
m_objProgram(nullptr),
m_matrixLoc(0),
m_textureLoc(0),
m_objImage(nullptr),
m_objTexture(nullptr),
m_intCols(0),
m_intRows(0),
m_objCurrentRow(nullptr),
m_blnInitialized(false),
m_blnColor(blnColor),
m_blnAlphaBlend(false),
m_blnAlphaReset(false)
{ {
m_blnAlphaBlend = false;
m_blnAlphaReset = false;
m_objProgram = nullptr;
m_objImage = nullptr;
m_objTexture = nullptr;
m_intCols = 0;
m_intRows = 0;
m_blnInitialized = false;
m_objCurrentRow = nullptr;
m_textureLoc = 0;
m_matrixLoc = 0;
} }
GLShaderTVArray::~GLShaderTVArray() GLShaderTVArray::~GLShaderTVArray()
{ {
qDebug("GLShaderTVArray::~GLShaderTVArray");
cleanup(); cleanup();
} }
@ -128,7 +129,7 @@ void GLShaderTVArray::initializeGL(int intCols, int intRows)
} }
QRgb * GLShaderTVArray::GetRowBuffer(int intRow) QRgb *GLShaderTVArray::GetRowBuffer(int intRow)
{ {
if (!m_blnInitialized) { if (!m_blnInitialized) {
return nullptr; return nullptr;

8
sdrgui/gui/glshadertvarray.h
View File

@ -55,9 +55,7 @@ public:
bool SelectRow(int intLine); bool SelectRow(int intLine);
bool SetDataColor(int intCol,QRgb objColor); bool SetDataColor(int intCol,QRgb objColor);
protected: protected:
QOpenGLShaderProgram *m_objProgram; QOpenGLShaderProgram *m_objProgram;
int m_matrixLoc; int m_matrixLoc;
int m_textureLoc; int m_textureLoc;
@ -65,13 +63,13 @@ protected:
static const QString m_strVertexShaderSourceArray; static const QString m_strVertexShaderSourceArray;
static const QString m_strFragmentShaderSourceColored; static const QString m_strFragmentShaderSourceColored;
QImage *m_objImage=NULL; QImage *m_objImage;
QOpenGLTexture *m_objTexture=NULL; QOpenGLTexture *m_objTexture;
int m_intCols; int m_intCols;
int m_intRows; int m_intRows;
QRgb * m_objCurrentRow; QRgb *m_objCurrentRow;
bool m_blnInitialized; bool m_blnInitialized;
bool m_blnColor; bool m_blnColor;