From f253ff9f1ab246c67ee5d3fb520c584b384ee708 Mon Sep 17 00:00:00 2001
From: RealBadAngel <maciej.kasatkin@o2.pl>
Date: Wed, 10 Feb 2016 04:27:45 +0100
Subject: [PATCH] Dump shader programs on compile errors
---
src/shader.cpp | 23 +++++++++++++++++++++++
src/shader.h | 3 +++
2 files changed, 26 insertions(+)
diff --git a/src/shader.cpp b/src/shader.cpp
index d39a8307c..1d990eafe 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -808,6 +808,9 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
"failed to generate \""<<name<<"\", "
"addHighLevelShaderMaterial failed."
<<std::endl;
+ dumpShaderProgram(warningstream, "Vertex", vertex_program);
+ dumpShaderProgram(warningstream, "Pixel", pixel_program);
+ dumpShaderProgram(warningstream, "Geometry", geometry_program);
return shaderinfo;
}
}
@@ -826,6 +829,8 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
"failed to generate \""<<name<<"\", "
"addShaderMaterial failed."
<<std::endl;
+ dumpShaderProgram(warningstream, "Vertex", vertex_program);
+ dumpShaderProgram(warningstream,"Pixel", pixel_program);
return shaderinfo;
}
}
@@ -871,3 +876,21 @@ void load_shaders(std::string name, SourceShaderCache *sourcecache,
}
}
+
+void dumpShaderProgram(std::ostream &output_stream,
+ const std::string &program_type, const std::string &program)
+{
+ output_stream << program_type << " shader program:" << std::endl <<
+ "----------------------------------" << std::endl;
+ size_t pos = 0;
+ size_t prev = 0;
+ s16 line = 1;
+ while ((pos = program.find("\n", prev)) != std::string::npos) {
+ output_stream << line++ << ": "<< program.substr(prev, pos - prev) <<
+ std::endl;
+ prev = pos + 1;
+ }
+ output_stream << line << ": " << program.substr(prev) << std::endl <<
+ "End of " << program_type << " shader program." << std::endl <<
+ " " << std::endl;
+}
diff --git a/src/shader.h b/src/shader.h
index 811f33080..b8aa88bce 100644
--- a/src/shader.h
+++ b/src/shader.h
@@ -110,4 +110,7 @@ class IWritableShaderSource : public IShaderSource
IWritableShaderSource* createShaderSource(IrrlichtDevice *device);
+void dumpShaderProgram(std::ostream &output_stream,
+ const std::string &program_type, const std::string &program);
+
#endif
--
GitLab