lsalzman
/
tesseract
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tqaa mask scaling 

fix GL extension typo
master
Lee Salzman 2013-02-11 21:19:19 +02:00
parent ba81d8d550
commit 5d1bb90919
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glsl.cfg
View File

@ -3640,7 +3640,7 @@ lazyshader 0 "tqaaresolvemasked" [
vec4 color = texture2DRect(tex0, gl_TexCoord[0].xy + quincunx.xy*(1.0 - mask));
float vscale = color.a*maxvelocity.x*inversesqrt(dot(vel, vel) + 1e-6);
vec4 prevcolor = texture2DRect(tex1, gl_TexCoord[0].xy + quincunx.zw + vel*vscale);
float prevmask = clamp(2.0*texture2DRect(tex3, (gl_TexCoord[0].xy + quincunx.zw + vel*vscale)*movemaskscale).r, 0.0, 1.0);
float prevmask = clamp(4.0*texture2DRect(tex3, (gl_TexCoord[0].xy + quincunx.zw + vel*vscale)*movemaskscale).r, 0.0, 1.0);
float weight = 0.5 - 0.5*color.a;
weight *= clamp(1.0 - maxvelocity.z*abs(color.a - prevcolor.a), 0.0, 1.0);

2
src/engine/glexts.h
View File

@ -70,7 +70,7 @@ extern PFNGLBLITFRAMEBUFFEREXTPROC glBlitFramebuffer_;
#define GL_MAX_SAMPLES_EXT 0x8D57
typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
#endif
extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC glRenderBufferStorageMultisample_;
extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC glRenderbufferStorageMultisample_;
// GL_ARB_texture_multisample
#ifndef GL_ARB_texture_multisample

4
src/engine/rendergl.cpp
View File

@ -63,7 +63,7 @@ PFNGLDRAWBUFFERSARBPROC glDrawBuffers_ = NULL;
PFNGLBLITFRAMEBUFFEREXTPROC glBlitFramebuffer_ = NULL;
// GL_EXT_framebuffer_multisample
PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC glRenderBufferStorageMultisample_ = NULL;
PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC glRenderbufferStorageMultisample_ = NULL;
// GL_ARB_texture_multisample
PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample_ = NULL;
@ -380,7 +380,7 @@ void gl_checkextensions()
}
if(hasext(exts, "GL_EXT_framebuffer_multisample"))
{
glRenderBufferStorageMultisample_ = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)getprocaddress("glRenderBufferStorageMultisampleEXT");
glRenderbufferStorageMultisample_ = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)getprocaddress("glRenderbufferStorageMultisampleEXT");
hasFBMS = true;
if(dbgexts) conoutf(CON_INIT, "Using GL_EXT_framebuffer_multisample extension.");
}