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

Add OpenGL shaders using OpenGL 3.3 syntax for MacOS which doesn't support version 2 syntax wth 4.2 context

Browse Source
This commit is contained in:
Jon Beniston
2022-06-18 23:40:25 +01:00
parent c135affb6a
commit e13e919012
11 changed files with 263 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrgui/gui/glshaderspectrogram.h
+4 -2
View File
@@ -36,7 +36,7 @@ public:
GLShaderSpectrogram();
~GLShaderSpectrogram();
void initializeGL();
void initializeGL(float openGLVersion);
void initColorMapTexture(const QString &colorMapName);
void initTexture(const QImage& image);
void subTexture(int xOffset, int yOffset, int width, int height, const void *pixels);
@@ -85,7 +85,7 @@ private:
QOpenGLShaderProgram *m_programForLocs; // Which program the locations are for
int m_textureTransformLoc;
int m_vertexTransformLoc;
int m_textureLoc;
int m_dataTextureLoc;
int m_limitLoc;
int m_brightnessLoc;
int m_colorMapLoc;
@@ -93,9 +93,11 @@ private:
int m_lightPosLoc;
bool m_useImmutableStorage;
static const QString m_vertexShader2;
static const QString m_vertexShader;
static const QString m_geometryShader;
static const QString m_fragmentShaderShaded;
static const QString m_fragmentShaderSimple2;
static const QString m_fragmentShaderSimple;
QOpenGLBuffer m_vertexBuf;