Browse Source

Couple of GL clean-ups.

tags/2021-05-28
jules 11 years ago
parent
commit
b09467c7c5
2 changed files with 5 additions and 2 deletions
  1. +4
    -0
      modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp
  2. +1
    -2
      modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp

+ 4
- 0
modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp View File

@@ -79,21 +79,25 @@ void OpenGLHelpers::enableScissorTest (const Rectangle<int>& clip)
String OpenGLHelpers::translateVertexShaderToV3 (const String& code)
{
#if JUCE_OPENGL3
if (OpenGLShaderProgram::getLanguageVersion() > 1.2)
return "#version 150\n" + code.replace ("attribute", "in")
.replace ("varying", "out");
#endif
return code;
}
String OpenGLHelpers::translateFragmentShaderToV3 (const String& code)
{
#if JUCE_OPENGL3
if (OpenGLShaderProgram::getLanguageVersion() > 1.2)
return "#version 150\n"
"out vec4 fragColor;\n"
+ code.replace ("varying", "in")
.replace ("texture2D", "texture")
.replace ("gl_FragColor", "fragColor");
#endif
return code;
}

+ 1
- 2
modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp View File

@@ -65,9 +65,8 @@ double OpenGLShaderProgram::getLanguageVersion()
#endif
}
bool OpenGLShaderProgram::addShader (const String& codeString, GLenum type)
bool OpenGLShaderProgram::addShader (const String& code, GLenum type)
{
String code (codeString);
GLuint shaderID = context.extensions.glCreateShader (type);
const GLchar* c = code.toRawUTF8();


Loading…
Cancel
Save