aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPilzAdam <pilzadam@minetest.net>2013-07-08 01:58:22 +0200
committerPilzAdam <pilzadam@minetest.net>2013-07-08 01:58:49 +0200
commit6bc3a43d52c04b6a91787bcb49d0044f1452fc4e (patch)
tree533c824948d2ccd753649a4c20d12d711d5f1a3c /src
parent88d43af276a4ed85500863b427bf370d8eca2095 (diff)
downloadminetest-6bc3a43d52c04b6a91787bcb49d0044f1452fc4e.tar.gz
minetest-6bc3a43d52c04b6a91787bcb49d0044f1452fc4e.tar.bz2
minetest-6bc3a43d52c04b6a91787bcb49d0044f1452fc4e.zip
Settings: everything != 0 equals true; remove .asm shaders
Diffstat (limited to 'src')
-rw-r--r--src/shader.cpp21
-rw-r--r--src/test.cpp4
-rw-r--r--src/util/string.h2
3 files changed, 5 insertions, 22 deletions
diff --git a/src/shader.cpp b/src/shader.cpp
index 19b8d7c9d..ed8cc5b73 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -624,7 +624,6 @@ ShaderInfo generate_shader(std::string name, IrrlichtDevice *device,
}
}
- // 0 = off, 1 = assembly shaders only, 2 = highlevel or assembly
bool enable_shaders = g_settings->getBool("enable_shaders");
if(!enable_shaders)
return shaderinfo;
@@ -778,24 +777,4 @@ void load_shaders(std::string name, SourceShaderCache *sourcecache,
}
}
- if(enable_shaders){
- // Look for assembly shaders
- if(drivertype == video::EDT_DIRECT3D8){
- // Direct3D 8 assembly shaders
- vertex_program = sourcecache->getOrLoad(name, "d3d8_vertex.asm");
- pixel_program = sourcecache->getOrLoad(name, "d3d8_pixel.asm");
- }
- else if(drivertype == video::EDT_DIRECT3D9){
- // Direct3D 9 assembly shaders
- vertex_program = sourcecache->getOrLoad(name, "d3d9_vertex.asm");
- pixel_program = sourcecache->getOrLoad(name, "d3d9_pixel.asm");
- }
- else if(drivertype == video::EDT_OPENGL){
- // OpenGL assembly shaders
- vertex_program = sourcecache->getOrLoad(name, "opengl_vertex.asm");
- pixel_program = sourcecache->getOrLoad(name, "opengl_fragment.asm");
- }
- if(vertex_program != "" || pixel_program != "")
- return;
- }
}
diff --git a/src/test.cpp b/src/test.cpp
index e609fe26f..ddbcee7f2 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -164,6 +164,10 @@ struct TestUtilities: public TestBase
UASSERT(is_yes("YeS") == true);
UASSERT(is_yes("") == false);
UASSERT(is_yes("FAlse") == false);
+ UASSERT(is_yes("-1") == true);
+ UASSERT(is_yes("0") == false);
+ UASSERT(is_yes("1") == true);
+ UASSERT(is_yes("2") == true);
const char *ends[] = {"abc", "c", "bc", NULL};
UASSERT(removeStringEnd("abc", ends) == "");
UASSERT(removeStringEnd("bc", ends) == "b");
diff --git a/src/util/string.h b/src/util/string.h
index 6c48adeb3..d8cedc3e8 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -146,7 +146,7 @@ inline std::string lowercase(const std::string &s)
inline bool is_yes(const std::string &s)
{
std::string s2 = lowercase(trim(s));
- if(s2 == "y" || s2 == "yes" || s2 == "true" || s2 == "1")
+ if(s2 == "y" || s2 == "yes" || s2 == "true" || atoi(s2.c_str()) != 0)
return true;
return false;
}