MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Correct TexrectCopyShader for GL versions that are not GLES 2.0

Browse Source
This commit is contained in:
Sergey Lipskiy 2017-01-30 11:00:42 +07:00
parent 4756b1eb74
commit 3b1dd92118
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Graphics/OpenGLContext/GLSL/glsl_SpecialShadersFactory.cpp
View File

@ -331,13 +331,13 @@ namespace glsl {
TexrectCopy(const opengl::GLInfo & _glinfo) TexrectCopy(const opengl::GLInfo & _glinfo)
{ {
m_part = m_part =
"IN mediump vec2 vTexCoord0; \n" "IN mediump vec2 vTexCoord0; \n"
"uniform sampler2D uTex0; \n" "uniform sampler2D uTex0; \n"
" \n" "OUT lowp vec4 fragColor; \n"
"void main() \n" " \n"
"{ \n" "void main() \n"
" gl_FragColor = texture2D(uTex0, vTexCoord0); \n" "{ \n"
"} \n" " fragColor = texture2D(uTex0, vTexCoord0); \n"
; ;
} }
}; };
@ -574,8 +574,9 @@ namespace glsl {
TexrectCopyShader(const opengl::GLInfo & _glinfo, TexrectCopyShader(const opengl::GLInfo & _glinfo,
opengl::CachedUseProgram * _useProgram, opengl::CachedUseProgram * _useProgram,
const ShaderPart * _vertexHeader, const ShaderPart * _vertexHeader,
const ShaderPart * _fragmentHeader) const ShaderPart * _fragmentHeader,
: TexrectCopyShaderBase(_glinfo, _useProgram, _vertexHeader, _fragmentHeader) const ShaderPart * _fragmentEnd)
: TexrectCopyShaderBase(_glinfo, _useProgram, _vertexHeader, _fragmentHeader, _fragmentEnd)
{ {
m_useProgram->useProgram(m_program); m_useProgram->useProgram(m_program);
const int texLoc = glGetUniformLocation(GLuint(m_program), "uTex0"); const int texLoc = glGetUniformLocation(GLuint(m_program), "uTex0");
@ -668,7 +669,7 @@ namespace glsl {
graphics::ShaderProgram * SpecialShadersFactory::createTexrectCopyShader() const graphics::ShaderProgram * SpecialShadersFactory::createTexrectCopyShader() const
{ {
return new TexrectCopyShader(m_glinfo, m_useProgram, m_vertexHeader, m_fragmentHeader); return new TexrectCopyShader(m_glinfo, m_useProgram, m_vertexHeader, m_fragmentHeader, m_fragmentEnd);
} }
graphics::ShaderProgram * SpecialShadersFactory::createGammaCorrectionShader() const graphics::ShaderProgram * SpecialShadersFactory::createGammaCorrectionShader() const