From 6bc3a43d52c04b6a91787bcb49d0044f1452fc4e Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Mon, 8 Jul 2013 01:58:22 +0200 Subject: Settings: everything != 0 equals true; remove .asm shaders --- src/shader.cpp | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/shader.cpp') 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; - } } -- cgit v1.2.3