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

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

Browse Source
This commit is contained in:
Magne Djupvik 2018-01-29 16:53:26 +01:00
commit 6ac36f8117
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -114,7 +114,7 @@ include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
# Find system GLEW library or build it if missing # Find system GLEW library or build it if missing
if(NOT USE_GLES2 AND NOT SERVER_ONLY) if(NOT USE_GLES2 AND NOT SERVER_ONLY)
add_definitions(-DGLEW_NO_GLU) add_definitions(-DGLEW_NO_GLU)
if(USE_SYSTEM_GLEW) if((UNIX AND NOT APPLE) AND USE_SYSTEM_GLEW)
find_package(PkgConfig) find_package(PkgConfig)
if(PKGCONFIG_FOUND) if(PKGCONFIG_FOUND)
pkg_check_modules(GLEW glew>=2.1) pkg_check_modules(GLEW glew>=2.1)

4
src/graphics/sp/sp_base.cpp
View File

@ -200,8 +200,8 @@ void displaceShaderInit(SPShader* shader)
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
}, RP_RESERVED); }, RP_RESERVED);
SPShaderManager::addPrefilledTexturesToShader(shader, SPShaderManager::addPrefilledTexturesToShader(shader,
{{ "displacement_tex", "displace.png", false/*srgb*/, ST_BILINEAR }}, {std::make_tuple("displacement_tex", "displace.png", false/*srgb*/,
RP_RESERVED); ST_BILINEAR)}, RP_RESERVED);
shader->addCustomPrefilledTextures(ST_BILINEAR, shader->addCustomPrefilledTextures(ST_BILINEAR,
GL_TEXTURE_2D, "mask_tex", []()->GLuint GL_TEXTURE_2D, "mask_tex", []()->GLuint
{ {