WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 06:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix flicker effect in OpenGL driver

Browse Source
This commit is contained in:
elasota
2020-09-26 16:54:30 -04:00
parent c3b1f45f96
commit db54e92425
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp
View File

@@ -66,6 +66,13 @@ struct GpGLFunctions
typedef void (GLAPIENTRYP PFNGLPIXELSTOREIPROC)(GLenum pname, GLint param);
typedef void (GLAPIENTRYP PFNGLTEXPARAMETERIPROC)(GLenum target, GLenum pname, GLint param);
typedef GLenum (GLAPIENTRYP PFNGLGETERRORPROC)();
typedef void (GLAPIENTRYP PFNGLENABLEPROC)(GLenum cap);
typedef void (GLAPIENTRYP PFNGLDISABLEPROC)(GLenum cap);
typedef void (GLAPIENTRYP PFNGLALPHAFUNCPROC)(GLenum func, GLclampf ref);
PFNGLENABLEPROC Enable;
PFNGLDISABLEPROC Disable;
PFNGLALPHAFUNCPROC AlphaFunc;
PFNGLCLEARPROC Clear;
PFNGLCLEARCOLORPROC ClearColor;
@@ -999,6 +1006,10 @@ static bool LookupOpenGLFunction(T &target, const char *name)
bool GpGLFunctions::LookUpFunctions()
{
LOOKUP_FUNC(Enable);
LOOKUP_FUNC(Disable);
LOOKUP_FUNC(AlphaFunc);
LOOKUP_FUNC(Clear);
LOOKUP_FUNC(ClearColor);
@@ -1293,6 +1304,12 @@ void GpDisplayDriver_SDL_GL2::DrawSurface(IGpDisplayDriverSurface *surface, int3
m_gl.Uniform1fv(program->m_pixelFlickerEndThresholdLocation, 1, &flickerEnd);
}
if (effects->m_flicker)
{
m_gl.Enable(GL_ALPHA_TEST);
m_gl.AlphaFunc(GL_GREATER, 0.5f);
}
GLint vpos[1] = { program->m_vertexPosUVLocation };
m_quadVertexArray->Activate(vpos);
@@ -1325,6 +1342,9 @@ void GpDisplayDriver_SDL_GL2::DrawSurface(IGpDisplayDriverSurface *surface, int3
m_quadVertexArray->Deactivate(vpos);
m_gl.UseProgram(0);
if (effects->m_flicker)
m_gl.Disable(GL_ALPHA_TEST);
}
IGpCursor *GpDisplayDriver_SDL_GL2::LoadCursor(bool isColor, int cursorID)

2
AerofoilSDL/ShaderCode/DrawQuadPaletteP.cpp
View File

@@ -15,7 +15,7 @@
"{\n"\
" vec4 resultColor = vec4(SamplePixel(texCoord.xy), 1.0);\n"\
" resultColor *= constants_Modulation;\n"\
" resultColor = ApplyFlicker(constants_FlickerAxis, texCoord.xy, constants_FlickerStartThreshold, constants_FlickerEndThreshold, resultColor * constants_Modulation);\n"\
" resultColor = ApplyFlicker(constants_FlickerAxis, texCoord.zw, constants_FlickerStartThreshold, constants_FlickerEndThreshold, resultColor * constants_Modulation);\n"\
" resultColor = ApplyDesaturation(constants_Desaturation, resultColor);\n"\
"\n"\
" gl_FragColor = vec4(ApplyColorSpaceTransform(resultColor.rgb), resultColor.a);\n"\