VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

Fix shaders so they don't crash when OpenGL 2.0 ES is used

Browse Source
This commit is contained in:
Jon Beniston
2022-07-21 21:09:41 +01:00
parent 08cc6d02f5
commit 7ba8540dd4
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrgui/gui/glshaderspectrogram.cpp
+7 -6
View File
@@ -288,6 +288,7 @@ void GLShaderSpectrogram::initTexture(const QImage& image)
initTextureMutable(image);
}
initGrid(image.width());
m_limit = 1.4f*1.0f/(float)image.height();
}
void GLShaderSpectrogram::initTextureImmutable(const QImage& image)
@@ -419,7 +420,7 @@ void GLShaderSpectrogram::drawSurface(SpectrumSettings::SpectrogramStyle style,
program->setUniformValue(m_dataTextureLoc, 0); // set uniform to texture unit?
program->setUniformValue(m_colorMapLoc, 1);
program->setUniformValue(m_limitLoc, 1.4f*1.0f/(float)(m_texture->height()));
program->setUniformValue(m_limitLoc, m_limit);
if (style == SpectrumSettings::Outline)
{
@@ -721,11 +722,11 @@ void GLShaderSpectrogram::applyPerspective(QMatrix4x4 &matrix)
const QString GLShaderSpectrogram::m_vertexShader2 = QString(
"attribute vec2 coord2d;\n"
"varying vec4 coord;\n"
"varying float lightDistance;\n"
"varying highp float lightDistance;\n"
"uniform mat4 textureTransform;\n"
"uniform mat4 vertexTransform;\n"
"uniform sampler2D dataTexture;\n"
"uniform float limit;\n"
"uniform highp float limit;\n"
"uniform vec3 lightPos;\n"
"void main(void) {\n"
" coord = textureTransform * vec4(clamp(coord2d, limit, 1.0-limit), 0, 1);\n"
@@ -810,11 +811,11 @@ const QString GLShaderSpectrogram::m_fragmentShaderShaded = QString(
);
const QString GLShaderSpectrogram::m_fragmentShaderSimple2 = QString(
"varying vec4 coord;\n"
"uniform float brightness;\n"
"varying highp vec4 coord;\n"
"uniform highp float brightness;\n"
"uniform sampler2D colorMap;\n"
"void main(void) {\n"
" float factor;\n"
" highp float factor;\n"
" if (gl_FrontFacing)\n"
" factor = 1.0;\n"
" else\n"