ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2014-06-23 09:05:22 +10:00
commit 8004e9d42c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/shaders/ssao.frag
View File

@ -24,12 +24,12 @@ layout (std140) uniform MatrixesData
out float AO; out float AO;
const float sigma = 2.; const float sigma = 1.;
const float tau = 7.; const float tau = 7.;
const float beta = 0.001; const float beta = 0.001;
const float epsilon = .00001; const float epsilon = .00001;
const float radius = 1.; const float radius = 1.;
const float k = 5.; const float k = 1.5;
#define SAMPLES 16 #define SAMPLES 16
@ -56,7 +56,7 @@ void main(void)
vec3 norm = -normalize(cross(ddy, ddx)); vec3 norm = -normalize(cross(ddy, ddx));
float r = radius / FragPos.z; float r = radius / FragPos.z;
float phi = 30. * (x ^ y) + 10. * x * y; float phi = 3. * (x ^ y) + x * y;
float bl = 0.0; float bl = 0.0;
float m = log2(r) + 6 + log2(invSamples); float m = log2(r) + 6 + log2(invSamples);

2
src/graphics/rtts.cpp
View File

@ -42,7 +42,7 @@ static GLuint generateRTT(const core::dimension2du &res, GLint internalFormat, G
glGenTextures(1, &result); glGenTextures(1, &result);
glBindTexture(GL_TEXTURE_2D, result); glBindTexture(GL_TEXTURE_2D, result);
#if WIN32 #if WIN32
if (irr_driver->getGLSLVersion() < 420) if (irr_driver->getGLSLVersion() >= 420)
glTexStorage2D(GL_TEXTURE_2D, mipmaplevel, internalFormat, res.Width, res.Height); glTexStorage2D(GL_TEXTURE_2D, mipmaplevel, internalFormat, res.Width, res.Height);
else else
#endif #endif