diff options
| author | sapier <Sapier at GMX dot net> | 2013-07-07 15:53:40 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-07-07 19:49:52 -0400 |
| commit | 88d43af276a4ed85500863b427bf370d8eca2095 (patch) | |
| tree | d02fe1196639c48ad14bc4cfc6c5d621015488bf /src/shader.cpp | |
| parent | 7e73b7cae9faf203e369dc5cf2b85cff6e6efbad (diff) | |
| download | minetest-88d43af276a4ed85500863b427bf370d8eca2095.tar.gz minetest-88d43af276a4ed85500863b427bf370d8eca2095.tar.bz2 minetest-88d43af276a4ed85500863b427bf370d8eca2095.zip | |
Fix many formspec menu bugs
Diffstat (limited to 'src/shader.cpp')
| -rw-r--r-- | src/shader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/shader.cpp b/src/shader.cpp index 58042e651..19b8d7c9d 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -362,7 +362,7 @@ ShaderInfo generate_shader(std::string name, IrrlichtDevice *device, Load shader programs */ void load_shaders(std::string name, SourceShaderCache *sourcecache, - video::E_DRIVER_TYPE drivertype, s32 enable_shaders, + video::E_DRIVER_TYPE drivertype, bool enable_shaders, std::string &vertex_program, std::string &pixel_program, std::string &geometry_program, bool &is_highlevel); @@ -625,8 +625,8 @@ ShaderInfo generate_shader(std::string name, IrrlichtDevice *device, } // 0 = off, 1 = assembly shaders only, 2 = highlevel or assembly - s32 enable_shaders = g_settings->getS32("enable_shaders"); - if(enable_shaders <= 0) + bool enable_shaders = g_settings->getBool("enable_shaders"); + if(!enable_shaders) return shaderinfo; video::IVideoDriver* driver = device->getVideoDriver(); @@ -748,7 +748,7 @@ ShaderInfo generate_shader(std::string name, IrrlichtDevice *device, } void load_shaders(std::string name, SourceShaderCache *sourcecache, - video::E_DRIVER_TYPE drivertype, s32 enable_shaders, + video::E_DRIVER_TYPE drivertype, bool enable_shaders, std::string &vertex_program, std::string &pixel_program, std::string &geometry_program, bool &is_highlevel) { @@ -757,7 +757,7 @@ void load_shaders(std::string name, SourceShaderCache *sourcecache, geometry_program = ""; is_highlevel = false; - if(enable_shaders >= 2){ + if(enable_shaders){ // Look for high level shaders if(drivertype == video::EDT_DIRECT3D9){ // Direct3D 9: HLSL @@ -778,7 +778,7 @@ void load_shaders(std::string name, SourceShaderCache *sourcecache, } } - if(enable_shaders >= 1){ + if(enable_shaders){ // Look for assembly shaders if(drivertype == video::EDT_DIRECT3D8){ // Direct3D 8 assembly shaders |