diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-05-01 09:34:23 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-05-10 15:59:09 -0300 |
| commit | 1bea8e1eacc68bcedbd3f207395bccf11011dae2 (patch) | |
| tree | b75303a69491978c1e13360a3e6f355c5234dfe0 /servers/rendering/rendering_device_binds.h | |
| parent | 6a0473bcc23c096ef9ee929632a209761c2668f6 (diff) | |
| download | redot-engine-1bea8e1eacc68bcedbd3f207395bccf11011dae2.tar.gz | |
New lightmapper
-Added LocalVector (needed it)
-Added stb_rect_pack (It's pretty cool, we could probably use it for other stuff too)
-Fixes and changes all around the place
-Added library for 128 bits fixed point (required for Delaunay3D)
Diffstat (limited to 'servers/rendering/rendering_device_binds.h')
| -rw-r--r-- | servers/rendering/rendering_device_binds.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/servers/rendering/rendering_device_binds.h b/servers/rendering/rendering_device_binds.h index 2a5396a3e8..fe8d554594 100644 --- a/servers/rendering/rendering_device_binds.h +++ b/servers/rendering/rendering_device_binds.h @@ -322,8 +322,31 @@ public: return base_error; } + void print_errors(const String &p_file) { + if (base_error != "") { + ERR_PRINT("Error parsing shader '" + p_file + "':\n\n" + base_error); + } else { + for (Map<StringName, Ref<RDShaderBytecode>>::Element *E = versions.front(); E; E = E->next()) { + for (int i = 0; i < RD::SHADER_STAGE_MAX; i++) { + String error = E->get()->get_stage_compile_error(RD::ShaderStage(i)); + if (error != String()) { + static const char *stage_str[RD::SHADER_STAGE_MAX] = { + "vertex", + "fragment", + "tesselation_control", + "tesselation_evaluation", + "compute" + }; + + ERR_PRINT("Error parsing shader '" + p_file + "', version '" + String(E->key()) + "', stage '" + stage_str[i] + "':\n\n" + error); + } + } + } + } + } + typedef String (*OpenIncludeFunction)(const String &, void *userdata); - Error parse_versions_from_text(const String &p_text, OpenIncludeFunction p_include_func = nullptr, void *p_include_func_userdata = nullptr); + Error parse_versions_from_text(const String &p_text, const String p_defines = String(), OpenIncludeFunction p_include_func = nullptr, void *p_include_func_userdata = nullptr); protected: Dictionary _get_versions() const { |