BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Settings: everything != 0 equals true; remove .asm shaders

Browse Source
This commit is contained in:
PilzAdam 2013-07-08 01:58:22 +02:00
parent 88d43af276
commit 6bc3a43d52
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/shader.cpp
View File

@ -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"); bool enable_shaders = g_settings->getBool("enable_shaders");
if(!enable_shaders) if(!enable_shaders)
return shaderinfo; 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;
}
} }

4
src/test.cpp
View File

@ -164,6 +164,10 @@ struct TestUtilities: public TestBase
UASSERT(is_yes("YeS") == true); UASSERT(is_yes("YeS") == true);
UASSERT(is_yes("") == false); UASSERT(is_yes("") == false);
UASSERT(is_yes("FAlse") == 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}; const char *ends[] = {"abc", "c", "bc", NULL};
UASSERT(removeStringEnd("abc", ends) == ""); UASSERT(removeStringEnd("abc", ends) == "");
UASSERT(removeStringEnd("bc", ends) == "b"); UASSERT(removeStringEnd("bc", ends) == "b");

2
src/util/string.h
View File

@ -146,7 +146,7 @@ inline std::string lowercase(const std::string &s)
inline bool is_yes(const std::string &s) inline bool is_yes(const std::string &s)
{ {
std::string s2 = lowercase(trim(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 true;
return false; return false;
} }