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

Put some others bunch of code between ifdef win32

Browse Source
This commit is contained in:
vlj 2014-08-20 01:48:20 +02:00
parent ffd558e577
commit 953dd9db0d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphics/shaders.cpp
View File

@ -607,6 +607,7 @@ void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
GLuint createNearestSampler() GLuint createNearestSampler()
{ {
#ifdef WIN32
unsigned id; unsigned id;
glGenSamplers(1, &id); glGenSamplers(1, &id);
glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@ -615,6 +616,7 @@ GLuint createNearestSampler()
glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT); glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.); glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
return id; return id;
#endif
} }
void BindTextureNearest(GLuint TU, GLuint tex) void BindTextureNearest(GLuint TU, GLuint tex)
@ -630,6 +632,7 @@ void BindTextureNearest(GLuint TU, GLuint tex)
GLuint createBilinearSampler() GLuint createBilinearSampler()
{ {
#ifdef WIN32
unsigned id; unsigned id;
glGenSamplers(1, &id); glGenSamplers(1, &id);
glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@ -638,6 +641,7 @@ GLuint createBilinearSampler()
glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT); glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.); glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
return id; return id;
#endif
} }
void BindTextureBilinear(GLuint TU, GLuint tex) void BindTextureBilinear(GLuint TU, GLuint tex)
@ -653,6 +657,7 @@ void BindTextureBilinear(GLuint TU, GLuint tex)
GLuint createBilinearClampedSampler() GLuint createBilinearClampedSampler()
{ {
#ifdef WIN32
unsigned id; unsigned id;
glGenSamplers(1, &id); glGenSamplers(1, &id);
glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@ -661,6 +666,7 @@ GLuint createBilinearClampedSampler()
glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.); glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
return id; return id;
#endif
} }
void BindTextureBilinearClamped(GLuint TU, GLuint tex) void BindTextureBilinearClamped(GLuint TU, GLuint tex)
@ -676,6 +682,7 @@ void BindTextureBilinearClamped(GLuint TU, GLuint tex)
GLuint createSemiTrilinearSampler() GLuint createSemiTrilinearSampler()
{ {
#ifdef WIN32
unsigned id; unsigned id;
glGenSamplers(1, &id); glGenSamplers(1, &id);
glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@ -684,6 +691,7 @@ GLuint createSemiTrilinearSampler()
glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.); glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
return id; return id;
#endif
} }
void BindTextureSemiTrilinear(GLuint TU, GLuint tex) void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
@ -699,6 +707,7 @@ void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
GLuint createTrilinearSampler() GLuint createTrilinearSampler()
{ {
#ifdef WIN32
unsigned id; unsigned id;
glGenSamplers(1, &id); glGenSamplers(1, &id);
glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@ -710,6 +719,7 @@ GLuint createTrilinearSampler()
if (aniso == 0) aniso = 1; if (aniso == 0) aniso = 1;
glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso); glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
return id; return id;
#endif
} }
void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex) void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
@ -728,6 +738,7 @@ void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
GLuint createShadowSampler() GLuint createShadowSampler()
{ {
#ifdef WIN32
unsigned id; unsigned id;
glGenSamplers(1, &id); glGenSamplers(1, &id);
glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@ -737,6 +748,7 @@ GLuint createShadowSampler()
glSamplerParameterf(id, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE); glSamplerParameterf(id, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
glSamplerParameterf(id, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL); glSamplerParameterf(id, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
return id; return id;
#endif
} }
void BindTextureShadow(GLuint TU, GLuint tex) void BindTextureShadow(GLuint TU, GLuint tex)