X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fshader.cpp;h=0ac54ec0810aab3900c052046910bc474e8ff2d0;hb=a020d1b653f94fbcaac06c15f9dbab4521fda355;hp=19b8d7c9d9b2306d6305c56c96156167705a7752;hpb=88d43af276a4ed85500863b427bf370d8eca2095;p=oweals%2Fminetest.git diff --git a/src/shader.cpp b/src/shader.cpp index 19b8d7c9d..0ac54ec08 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "gamedef.h" #include "strfnd.h" // trim() +#include "tile.h" /* A cache from shader name to shader path @@ -210,8 +211,7 @@ public: class MainShaderConstantSetter : public IShaderConstantSetter { public: - MainShaderConstantSetter(IrrlichtDevice *device): - m_device(device) + MainShaderConstantSetter(IrrlichtDevice *device) {} ~MainShaderConstantSetter() {} @@ -240,16 +240,21 @@ public: services->setVertexShaderConstant(worldViewProj.pointer(), 4, 4); // set transposed world matrix + core::matrix4 transWorld = driver->getTransform(video::ETS_WORLD); + transWorld = transWorld.getTransposed(); + if(is_highlevel) + services->setVertexShaderConstant("mTransWorld", transWorld.pointer(), 16); + else + services->setVertexShaderConstant(transWorld.pointer(), 8, 4); + + // set world matrix core::matrix4 world = driver->getTransform(video::ETS_WORLD); - world = world.getTransposed(); if(is_highlevel) - services->setVertexShaderConstant("mTransWorld", world.pointer(), 16); + services->setVertexShaderConstant("mWorld", world.pointer(), 16); else services->setVertexShaderConstant(world.pointer(), 8, 4); - } -private: - IrrlichtDevice *m_device; + } }; /* @@ -262,13 +267,6 @@ public: ShaderSource(IrrlichtDevice *device); ~ShaderSource(); - /* - Gets a shader material id from cache or - - if main thread, from getShaderIdDirect - - if other thread, adds to request queue and waits for main thread - */ - u32 getShaderId(const std::string &name); - /* - If shader material specified by name is found from cache, return the cached id. @@ -276,26 +274,23 @@ public: The id 0 points to a null shader. Its material is EMT_SOLID. */ - u32 getShaderIdDirect(const std::string &name); - - // Finds out the name of a cached shader. - std::string getShaderName(u32 id); + u32 getShaderIdDirect(const std::string &name, + const u8 material_type, const u8 drawtype); /* If shader specified by the name pointed by the id doesn't - exist, create it, then return the cached shader. + exist, create it, then return id. Can be called from any thread. If called from some other thread and not found in cache, the call is queued to the main thread for processing. */ - ShaderInfo getShader(u32 id); - - ShaderInfo getShader(const std::string &name) - { - return getShader(getShaderId(name)); - } - + + u32 getShader(const std::string &name, + const u8 material_type, const u8 drawtype); + + ShaderInfo getShaderInfo(u32 id); + // Processes queued shader requests from other threads. // Shall be called from the main thread. void processQueue(); @@ -333,9 +328,7 @@ private: // A shader id is index in this array. // The first position contains a dummy shader. std::vector m_shaderinfo_cache; - // Maps a shader name to an index in the former. - std::map m_name_to_id; - // The two former containers are behind this mutex + // The former container is behind this mutex JMutex m_shaderinfo_cache_mutex; // Queued shader fetches (to be processed by the main thread) @@ -354,7 +347,9 @@ IWritableShaderSource* createShaderSource(IrrlichtDevice *device) /* Generate shader given the shader name. */ -ShaderInfo generate_shader(std::string name, IrrlichtDevice *device, +ShaderInfo generate_shader(std::string name, + u8 material_type, u8 drawtype, + IrrlichtDevice *device, video::IShaderConstantSetCallBack *callback, SourceShaderCache *sourcecache); @@ -373,13 +368,10 @@ ShaderSource::ShaderSource(IrrlichtDevice *device): m_shader_callback = new ShaderCallback(this, "default"); - m_shaderinfo_cache_mutex.Init(); - m_main_thread = get_current_thread_id(); // Add a dummy ShaderInfo as the first index, named "" m_shaderinfo_cache.push_back(ShaderInfo()); - m_name_to_id[""] = 0; // Add main global constant setter addGlobalConstantSetter(new MainShaderConstantSetter(device)); @@ -387,64 +379,55 @@ ShaderSource::ShaderSource(IrrlichtDevice *device): ShaderSource::~ShaderSource() { - //m_shader_callback->drop(); - for (std::vector::iterator iter = m_global_setters.begin(); iter != m_global_setters.end(); iter++) { delete *iter; } m_global_setters.clear(); -} -u32 ShaderSource::getShaderId(const std::string &name) -{ - //infostream<<"getShaderId(): \""<::iterator n; - n = m_name_to_id.find(name); - if(n != m_name_to_id.end()) - return n->second; + if (m_shader_callback) { + m_shader_callback->drop(); + m_shader_callback = NULL; } +} +u32 ShaderSource::getShader(const std::string &name, + const u8 material_type, const u8 drawtype) +{ /* Get shader */ + if(get_current_thread_id() == m_main_thread){ - return getShaderIdDirect(name); + return getShaderIdDirect(name, material_type, drawtype); } else { - infostream<<"getShaderId(): Queued: name=\""< result_queue; + + static ResultQueue result_queue; // Throw a request in m_get_shader_queue.add(name, 0, 0, &result_queue); - infostream<<"Waiting for shader from main thread, name=\"" - < - result = result_queue.pop_front(1000); - - // Check that at least something worked OK - assert(result.key == name); + result = result_queue.pop_frontNoEx(); - return result.item; - } - catch(ItemNotFoundException &e){ - infostream<<"Waiting for shader timed out."<name == name && info->material_type == material_type && + info->drawtype == drawtype) + return i; + } + /* Calling only allowed from main thread */ @@ -471,25 +463,7 @@ u32 ShaderSource::getShaderIdDirect(const std::string &name) return 0; } - /* - See if shader already exists - */ - { - JMutexAutoLock lock(m_shaderinfo_cache_mutex); - - std::map::iterator n; - n = m_name_to_id.find(name); - if(n != m_name_to_id.end()){ - /*infostream<<"getShaderIdDirect(): \""<second; - } - } - - /*infostream<<"getShaderIdDirect(): \""<= m_shaderinfo_cache.size()){ - errorstream<<"ShaderSource::getShaderName(): id="<= m_shaderinfo_cache.size()=" - < - request = m_get_shader_queue.pop(); - - /*infostream<<"ShaderSource::processQueue(): " - <<"got shader request with " - <<"name=\""< - result; - result.key = request.key; - result.callers = request.callers; - result.item = getShaderIdDirect(request.key); - - request.dest->push_back(result); - } + + } void ShaderSource::insertSourceShader(const std::string &name_of_shader, @@ -586,8 +528,8 @@ void ShaderSource::rebuildShaders() for(u32 i=0; iname != ""){ - *info = generate_shader(info->name, m_device, - m_shader_callback, &m_sourcecache); + *info = generate_shader(info->name, info->material_type, + info->drawtype, m_device, m_shader_callback, &m_sourcecache); } } } @@ -600,31 +542,37 @@ void ShaderSource::onSetConstants(video::IMaterialRendererServices *services, setter->onSetConstants(services, is_highlevel); } } - -ShaderInfo generate_shader(std::string name, IrrlichtDevice *device, - video::IShaderConstantSetCallBack *callback, + +ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype, + IrrlichtDevice *device, video::IShaderConstantSetCallBack *callback, SourceShaderCache *sourcecache) { - /*infostream<<"generate_shader(): " - "\""<getOrLoad(name, "base.txt")); - for(s32 i = 0; video::sBuiltInMaterialTypeNames[i] != 0; i++){ - if(video::sBuiltInMaterialTypeNames[i] == base_material_name){ - shaderinfo.material = (video::E_MATERIAL_TYPE) i; + switch(material_type){ + case TILE_MATERIAL_BASIC: + shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; break; - } + case TILE_MATERIAL_ALPHA: + shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL; + break; + case TILE_MATERIAL_LIQUID_TRANSPARENT: + shaderinfo.base_material = video::EMT_TRANSPARENT_VERTEX_ALPHA; + break; + case TILE_MATERIAL_LIQUID_OPAQUE: + shaderinfo.base_material = video::EMT_SOLID; + break; + case TILE_MATERIAL_WAVING_LEAVES: + shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; + break; + case TILE_MATERIAL_WAVING_PLANTS: + shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; + break; } - - // 0 = off, 1 = assembly shaders only, 2 = highlevel or assembly + bool enable_shaders = g_settings->getBool("enable_shaders"); if(!enable_shaders) return shaderinfo; @@ -650,7 +598,6 @@ ShaderInfo generate_shader(std::string name, IrrlichtDevice *device, load_shaders(name, sourcecache, driver->getDriverType(), enable_shaders, vertex_program, pixel_program, geometry_program, is_highlevel); - // Check hardware/driver support if(vertex_program != "" && !driver->queryFeature(video::EVDF_VERTEX_SHADER_1_1) && @@ -680,6 +627,134 @@ ShaderInfo generate_shader(std::string name, IrrlichtDevice *device, if(vertex_program == "" && pixel_program == "" && geometry_program == "") return shaderinfo; + // Create shaders header + std::string shaders_header = "#version 120\n"; + + static const char* drawTypes[] = { + "NDT_NORMAL", + "NDT_AIRLIKE", + "NDT_LIQUID", + "NDT_FLOWINGLIQUID", + "NDT_GLASSLIKE", + "NDT_ALLFACES", + "NDT_ALLFACES_OPTIONAL", + "NDT_TORCHLIKE", + "NDT_SIGNLIKE", + "NDT_PLANTLIKE", + "NDT_FENCELIKE", + "NDT_RAILLIKE", + "NDT_NODEBOX", + "NDT_GLASSLIKE_FRAMED" + }; + + for (int i = 0; i < 14; i++){ + shaders_header += "#define "; + shaders_header += drawTypes[i]; + shaders_header += " "; + shaders_header += itos(i); + shaders_header += "\n"; + } + + static const char* materialTypes[] = { + "TILE_MATERIAL_BASIC", + "TILE_MATERIAL_ALPHA", + "TILE_MATERIAL_LIQUID_TRANSPARENT", + "TILE_MATERIAL_LIQUID_OPAQUE", + "TILE_MATERIAL_WAVING_LEAVES", + "TILE_MATERIAL_WAVING_PLANTS" + }; + + for (int i = 0; i < 6; i++){ + shaders_header += "#define "; + shaders_header += materialTypes[i]; + shaders_header += " "; + shaders_header += itos(i); + shaders_header += "\n"; + } + + shaders_header += "#define MATERIAL_TYPE "; + shaders_header += itos(material_type); + shaders_header += "\n"; + shaders_header += "#define DRAW_TYPE "; + shaders_header += itos(drawtype); + shaders_header += "\n"; + + if (g_settings->getBool("generate_normalmaps")){ + shaders_header += "#define GENERATE_NORMALMAPS\n"; + shaders_header += "#define NORMALMAPS_STRENGTH "; + shaders_header += ftos(g_settings->getFloat("normalmaps_strength")); + shaders_header += "\n"; + float sample_step; + int smooth = (int)g_settings->getFloat("normalmaps_smooth"); + switch (smooth){ + case 0: + sample_step = 0.0078125; // 1.0 / 128.0 + break; + case 1: + sample_step = 0.00390625; // 1.0 / 256.0 + break; + case 2: + sample_step = 0.001953125; // 1.0 / 512.0 + break; + default: + sample_step = 0.0078125; + break; + } + shaders_header += "#define SAMPLE_STEP "; + shaders_header += ftos(sample_step); + shaders_header += "\n"; + } + + if (g_settings->getBool("enable_bumpmapping")) + shaders_header += "#define ENABLE_BUMPMAPPING\n"; + + if (g_settings->getBool("enable_parallax_occlusion")){ + shaders_header += "#define ENABLE_PARALLAX_OCCLUSION\n"; + shaders_header += "#define PARALLAX_OCCLUSION_SCALE "; + shaders_header += ftos(g_settings->getFloat("parallax_occlusion_scale")); + shaders_header += "\n"; + shaders_header += "#define PARALLAX_OCCLUSION_BIAS "; + shaders_header += ftos(g_settings->getFloat("parallax_occlusion_bias")); + shaders_header += "\n"; + } + + if (g_settings->getBool("enable_bumpmapping") || g_settings->getBool("enable_parallax_occlusion")) + shaders_header += "#define USE_NORMALMAPS\n"; + + if (g_settings->getBool("enable_waving_water")){ + shaders_header += "#define ENABLE_WAVING_WATER 1\n"; + shaders_header += "#define WATER_WAVE_HEIGHT "; + shaders_header += ftos(g_settings->getFloat("water_wave_height")); + shaders_header += "\n"; + shaders_header += "#define WATER_WAVE_LENGTH "; + shaders_header += ftos(g_settings->getFloat("water_wave_length")); + shaders_header += "\n"; + shaders_header += "#define WATER_WAVE_SPEED "; + shaders_header += ftos(g_settings->getFloat("water_wave_speed")); + shaders_header += "\n"; + } else{ + shaders_header += "#define ENABLE_WAVING_WATER 0\n"; + } + + shaders_header += "#define ENABLE_WAVING_LEAVES "; + if (g_settings->getBool("enable_waving_leaves")) + shaders_header += "1\n"; + else + shaders_header += "0\n"; + + shaders_header += "#define ENABLE_WAVING_PLANTS "; + if (g_settings->getBool("enable_waving_plants")) + shaders_header += "1\n"; + else + shaders_header += "0\n"; + + if(pixel_program != "") + pixel_program = shaders_header + pixel_program; + if(vertex_program != "") + vertex_program = shaders_header + vertex_program; + if(geometry_program != "") + geometry_program = shaders_header + geometry_program; + // Call addHighLevelShaderMaterial() or addShaderMaterial() const c8* vertex_program_ptr = 0; const c8* pixel_program_ptr = 0; @@ -706,11 +781,10 @@ ShaderInfo generate_shader(std::string name, IrrlichtDevice *device, scene::EPT_TRIANGLES, // Geometry shader input scene::EPT_TRIANGLE_STRIP, // Geometry shader output 0, // Support maximum number of vertices - callback, // Set-constant callback - shaderinfo.material, // Base material - 1 // Userdata passed to callback + callback, // Set-constant callback + shaderinfo.base_material, // Base material + 1 // Userdata passed to callback ); - if(shadermat == -1){ errorstream<<"generate_shader(): " "failed to generate \""<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; - } }