VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 08:24:43 -04:00
Code Issues Projects Releases Wiki Activity

OpenGL modernization: removed GL_DEPRECTATED blocks entirely

Browse Source
This commit is contained in:
f4exb
2016-03-06 16:39:28 +01:00
parent 285467aaa8
commit 4cdaf0fe54
4 changed files with 57 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/gui/glscope.h
-17
View File
@@ -157,23 +157,6 @@ private:
int m_displayGridIntensity;
int m_displayTraceIntensity;
#ifdef GL_DEPRECATED
QRectF m_glLeft1ScaleRect;
QRectF m_glRight1ScaleRect;
QRectF m_glLeft2ScaleRect;
QRectF m_glBot1ScaleRect;
QRectF m_glBot2ScaleRect;
bool m_left1ScaleTextureAllocated;
bool m_left2ScaleTextureAllocated;
bool m_bot1ScaleTextureAllocated;
bool m_bot2ScaleTextureAllocated;
bool m_powerOverlayTextureAllocated1;
GLuint m_left1ScaleTexture;
GLuint m_left2ScaleTexture;
GLuint m_bot1ScaleTexture;
GLuint m_bot2ScaleTexture;
GLuint m_powerOverlayTexture1;
#endif
ScaleEngine m_x1Scale;
ScaleEngine m_x2Scale;
include/gui/glspectrum.h
-26
View File
@@ -74,10 +74,6 @@ public:
private:
struct ChannelMarkerState {
ChannelMarker* m_channelMarker;
#ifdef GL_DEPRECATED
QRectF m_glRect;
QRectF m_glRectDsb;
#endif
QMatrix4x4 m_glMatrixWaterfall;
QMatrix4x4 m_glMatrixDsbWaterfall;
QMatrix4x4 m_glMatrixFreqScale;
@@ -88,10 +84,6 @@ private:
ChannelMarkerState(ChannelMarker* channelMarker) :
m_channelMarker(channelMarker)
#ifdef GL_DEPRECATED
m_glRect(),
m_glRectDsb()
#endif
{ }
};
QList<ChannelMarkerState*> m_channelMarkerStates;
@@ -134,14 +126,6 @@ private:
QPixmap m_leftMarginPixmap;
QPixmap m_frequencyPixmap;
#ifdef GL_DEPRECATED
bool m_leftMarginTextureAllocated;
GLuint m_leftMarginTexture;
QRectF m_glLeftScaleRect;
bool m_frequencyTextureAllocated;
GLuint m_frequencyTexture;
QRectF m_glFrequencyScaleRect;
#endif
ScaleEngine m_timeScale;
ScaleEngine m_powerScale;
ScaleEngine m_frequencyScale;
@@ -152,11 +136,6 @@ private:
QRgb m_waterfallPalette[240];
QImage* m_waterfallBuffer;
int m_waterfallBufferPos;
#ifdef GL_DEPRECATED
bool m_waterfallTextureAllocated;
GLuint m_waterfallTexture;
QRectF m_glWaterfallRect;
#endif
int m_waterfallTextureHeight;
int m_waterfallTexturePos;
QMatrix4x4 m_glWaterfallBoxMatrix;
@@ -167,11 +146,6 @@ private:
QImage* m_histogramBuffer;
quint8* m_histogram;
quint8* m_histogramHoldoff;
#ifdef GL_DEPRECATED
bool m_histogramTextureAllocated;
GLuint m_histogramTexture;
QRectF m_glHistogramRect;
#endif
int m_histogramHoldoffBase;
int m_histogramHoldoffCount;
int m_histogramLateHoldoff;