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

OpenGL modernization: more GL_DEPRECATED blocks

Browse Source
This commit is contained in:
f4exb 2016-03-05 12:33:54 +01:00
parent e95dddd0d8
commit 30c5b5f505
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gui/glspectrum.h
View File

@ -151,11 +151,13 @@ private:
QRgb m_waterfallPalette[240]; QRgb m_waterfallPalette[240];
QImage* m_waterfallBuffer; QImage* m_waterfallBuffer;
int m_waterfallBufferPos; int m_waterfallBufferPos;
#ifdef GL_DEPRECATED
bool m_waterfallTextureAllocated; bool m_waterfallTextureAllocated;
GLuint m_waterfallTexture; GLuint m_waterfallTexture;
QRectF m_glWaterfallRect;
#endif
int m_waterfallTextureHeight; int m_waterfallTextureHeight;
int m_waterfallTexturePos; int m_waterfallTexturePos;
QRectF m_glWaterfallRect;
QMatrix4x4 m_glWaterfallBoxMatrix; QMatrix4x4 m_glWaterfallBoxMatrix;
bool m_displayWaterfall; bool m_displayWaterfall;
bool m_ssbSpectrum; bool m_ssbSpectrum;

14
sdrbase/gui/glspectrum.cpp
View File

@ -51,9 +51,9 @@ GLSpectrum::GLSpectrum(QWidget* parent) :
#ifdef GL_DEPRECATED #ifdef GL_DEPRECATED
m_leftMarginTextureAllocated(false), m_leftMarginTextureAllocated(false),
m_frequencyTextureAllocated(false), m_frequencyTextureAllocated(false),
m_waterfallTextureAllocated(false),
#endif #endif
m_waterfallBuffer(NULL), m_waterfallBuffer(NULL),
m_waterfallTextureAllocated(false),
m_waterfallTextureHeight(-1), m_waterfallTextureHeight(-1),
m_displayWaterfall(true), m_displayWaterfall(true),
m_ssbSpectrum(false), m_ssbSpectrum(false),
@ -128,11 +128,13 @@ GLSpectrum::~GLSpectrum()
delete m_waterfallBuffer; delete m_waterfallBuffer;
m_waterfallBuffer = NULL; m_waterfallBuffer = NULL;
} }
#ifdef GL_DEPRECATED
if(m_waterfallTextureAllocated) { if(m_waterfallTextureAllocated) {
makeCurrent(); makeCurrent();
deleteTexture(m_waterfallTexture); deleteTexture(m_waterfallTexture);
m_waterfallTextureAllocated = false; m_waterfallTextureAllocated = false;
} }
#endif
if(m_histogramBuffer != NULL) { if(m_histogramBuffer != NULL) {
delete m_histogramBuffer; delete m_histogramBuffer;
m_histogramBuffer = NULL; m_histogramBuffer = NULL;
@ -1477,12 +1479,14 @@ void GLSpectrum::applyChanges()
m_frequencyScale.setSize(width() - leftMargin - rightMargin); m_frequencyScale.setSize(width() - leftMargin - rightMargin);
m_frequencyScale.setRange(Unit::Frequency, m_centerFrequency - m_sampleRate / 2, m_centerFrequency + m_sampleRate / 2); m_frequencyScale.setRange(Unit::Frequency, m_centerFrequency - m_sampleRate / 2, m_centerFrequency + m_sampleRate / 2);
#ifdef GL_DEPRECATED
m_glWaterfallRect = QRectF( m_glWaterfallRect = QRectF(
(float)leftMargin / (float)width(), (float)leftMargin / (float)width(),
(float)waterfallTop / (float)height(), (float)waterfallTop / (float)height(),
(float)(width() - leftMargin - rightMargin) / (float)width(), (float)(width() - leftMargin - rightMargin) / (float)width(),
(float)waterfallHeight / (float)height() (float)waterfallHeight / (float)height()
); );
#endif
m_glWaterfallBoxMatrix.setToIdentity(); m_glWaterfallBoxMatrix.setToIdentity();
m_glWaterfallBoxMatrix.translate( m_glWaterfallBoxMatrix.translate(
@ -1602,14 +1606,14 @@ void GLSpectrum::applyChanges()
m_frequencyScale.setSize(width() - leftMargin - rightMargin); m_frequencyScale.setSize(width() - leftMargin - rightMargin);
m_frequencyScale.setRange(Unit::Frequency, m_centerFrequency - m_sampleRate / 2.0, m_centerFrequency + m_sampleRate / 2.0); m_frequencyScale.setRange(Unit::Frequency, m_centerFrequency - m_sampleRate / 2.0, m_centerFrequency + m_sampleRate / 2.0);
#ifdef GL_DEPRECATED
m_glWaterfallRect = QRectF( m_glWaterfallRect = QRectF(
(float)leftMargin / (float)width(), (float)leftMargin / (float)width(),
(float)topMargin / (float)height(), (float)topMargin / (float)height(),
(float)(width() - leftMargin - rightMargin) / (float)width(), (float)(width() - leftMargin - rightMargin) / (float)width(),
(float)waterfallHeight / (float)height() (float)waterfallHeight / (float)height()
); );
#endif
m_glWaterfallBoxMatrix.setToIdentity(); m_glWaterfallBoxMatrix.setToIdentity();
m_glWaterfallBoxMatrix.translate( m_glWaterfallBoxMatrix.translate(
-1.0f + ((float)(2*leftMargin) / (float) width()), -1.0f + ((float)(2*leftMargin) / (float) width()),
@ -1996,10 +2000,12 @@ void GLSpectrum::applyChanges()
m_glShaderFrequencyScale.initTexture(m_frequencyPixmap.toImage()); m_glShaderFrequencyScale.initTexture(m_frequencyPixmap.toImage());
} }
#ifdef GL_DEPRECATED
if(!m_waterfallTextureAllocated) { if(!m_waterfallTextureAllocated) {
glGenTextures(1, &m_waterfallTexture); glGenTextures(1, &m_waterfallTexture);
m_waterfallTextureAllocated = true; m_waterfallTextureAllocated = true;
} }
#endif
if(!m_histogramTextureAllocated) { if(!m_histogramTextureAllocated) {
glGenTextures(1, &m_histogramTexture); glGenTextures(1, &m_histogramTexture);
m_histogramTextureAllocated = true; m_histogramTextureAllocated = true;
@ -2090,8 +2096,10 @@ void GLSpectrum::applyChanges()
m_waterfallTextureHeight = waterfallHeight; m_waterfallTextureHeight = waterfallHeight;
quint8* data = new quint8[m_fftSize * m_waterfallTextureHeight * 4]; quint8* data = new quint8[m_fftSize * m_waterfallTextureHeight * 4];
memset(data, 0x00, m_fftSize * m_waterfallTextureHeight * 4); memset(data, 0x00, m_fftSize * m_waterfallTextureHeight * 4);
#ifdef GL_DEPRECATED
glBindTexture(GL_TEXTURE_2D, m_waterfallTexture); glBindTexture(GL_TEXTURE_2D, m_waterfallTexture);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_fftSize, m_waterfallTextureHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_fftSize, m_waterfallTextureHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
#endif
delete[] data; delete[] data;
m_waterfallTexturePos = 0; m_waterfallTexturePos = 0;
} }