magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	6eb9676604	Fix Shader::compile() error output. Because Debug outputs chars as numbers, it displayed the following: compilation of fragment shader321 succeeded ... compilation of vertex shader322 succeeded ... instead of compilation of fragment shader 1 succeeded ... compilation of vertex shader 2 succeeded ... Now I will forever know that ASCII code of space is 32.	12 years ago
Vladimír Vondruš	1ab87a4de5	Workarounds for platforms without std::to_string(). I hate this.	12 years ago
Vladimír Vondruš	7898f9b0f3	GCC 4.4 compatibility: ambiguous std::to_string() overload.	12 years ago
Vladimír Vondruš	4a5ea35961	GCC 4.5 compatibility: no range-based for.	12 years ago
Vladimír Vondruš	4be1c5e15c	Print non-error shader compilation/linking messages to Warning output. Instead of schizophrenic Debug/Error.	12 years ago
Vladimír Vondruš	7b504a9bb1	Finally implemented parallelizable shader compilation and linking. As g_truc said long ago: https://twitter.com/g_truc/status/352778836657700866 Currently there is not much use of this as the stock shaders are compiled one by one (and doing it differently would make things needlessly overcomplicated), but the users can do parallel compilation of their own shaders. Also removed a bunch of now-unneeded TODOs and made the linker/compiler code nearly similar. Also the whole Shader::compile() call now does two allocations in total instead of two allocations for each shader.	12 years ago
Vladimír Vondruš	b9b7262eba	GLSL ES 3.0 requires `es` in version directive.	12 years ago
Vladimír Vondruš	2235cb76b1	Apparently Android is something like newlib.	12 years ago
Vladimír Vondruš	b68843bf22	Shader: ability to use version directive from shader source.	12 years ago
Vladimír Vondruš	6f0ba96cb6	Happy new year too.	12 years ago
Vladimír Vondruš	0616f24f34	Making includes absolute, part 5: absolute includes everywhere. The only places where they aren't absolute are: - when header is included from corresponding source file - when including headers which are not part of final installation (e.g. test-specific configuration, headers from Implementation/)	12 years ago
Vladimír Vondruš	8c2291aa49	Making includes absolute, part 4: using absolute includes for Corrade. Also adapted to some Corrade renames.	12 years ago
Vladimír Vondruš	45a10cefdf	Making includes absolute, part 1: moving files around. Everything what was in src/ is now in src/Corrade, everything from src/Plugins is now in src/MagnumPlugins, everything from external/ is in src/MagnumExternal. Added new CMakeLists.txt file and updated the other ones for the moves, no other change was made. If MAGNUM_BUILD_DEPRECATED is set, everything compiles and installs like previously except for the plugins, which are now in MagnumPlugins and not in Magnum/Plugins.	12 years ago
Vladimír Vondruš	ce52f7b62f	Moved Version enum to its own file. There will be many places (e.g. all Platform::*Application::Configuration classes) where Version will be used without Context (and all GL stuff brought with it).	13 years ago
Vladimír Vondruš	c9103b8947	Fix compilation of Shader on MinGW32. Broken during renaming in `5f51652aff`.	13 years ago
Vladimír Vondruš	5f51652aff	Updated, documented and tested Shader and ShaderProgram movement. Added Shader::type() and Shader::sources() accessors for testing purposes, it involved renaming private members (no functional change).	13 years ago
Vladimír Vondruš	a4aad89cfb	Ability to print Shader::Type enum to Debug output.	13 years ago
Vladimír Vondruš	b2325dda2f	Support for object labels from KHR_debug and EXT_debug_label. Can't test EXT_debug_label, as that is apparently OSX 10.9-only. Added GL tests for all implemented objects. KHR_debug is selected first, if that is not available, fall back to EXT_debug_label. If neither is available, the functions are no-op. I hope EXT_debug_label gets replaced by KHR_debug later, thus it is now only "emulated" through KHR_debug enums.	13 years ago
Vladimír Vondruš	bfe6033348	Minor cleanup.	13 years ago
Vladimír Vondruš	d945395800	Using Corrade::Utility::Directory::{read,write}() where possible. Much shorter code now with less redundancy.	13 years ago
Vladimír Vondruš	ee045d261a	Make some type conversions explicit. Fixes a bunch of MSVC warnings.	13 years ago
Vladimír Vondruš	51f7230ed2	MSVC 2013 compatibility: added missing headers. Not sure how this is done in GCC and Clang, they don't need ~60k LOC <algorithm> just for std::max().	13 years ago
Vladimír Vondruš	2c97326d8d	std::fstream accepts filename as std::string in C++11. Finally.	13 years ago
Vladimír Vondruš	28032a3909	Doc++	13 years ago
Vladimír Vondruš	da03d86e3e	Explicitly pass also shader source sizes in Shader::compile(). Should avoid potentially costly `strlen` in glShaderSource() internals.	13 years ago
Vladimír Vondruš	d6c4bb0300	Use "constructor cast" instead of `static_cast<GL...>(...)`. Makes the lines shorter, the conversions are mainly from strongly-typed enums to underlying type, so nothing potentially harmful which should be marked with static_cast.	13 years ago
Vladimír Vondruš	41ee03c5c5	Missing std::to_string() is MinGW32's fault, not Windows fault.	13 years ago
Vladimír Vondruš	2426a08c7a	GCC 4.6 compatibility: can't use both constexpr and const.	13 years ago
Vladimír Vondruš	a040b358ef	Shader-related limit queries. Renamed AbstractShaderProgram::maxSupportedVertexAttributeCount() to maxVertexAttributes(), the old function is now an alias to retain source compatibility, will be removed in future release. Also printing the values in magnum-info.	13 years ago
Vladimír Vondruš	706560fb28	Mingw32's GCC 4.7 doesn't have std::to_string().	13 years ago
Vladimír Vondruš	99c72ed99b	Initial support for OpenGL 4.4.	13 years ago
Vladimír Vondruš	252f489eaa	Don't query shader info log if it contains only '\0' character.	13 years ago
Vladimír Vondruš	0c31f5dbe4	NaCl's newlib doesn't have std::to_string().	13 years ago
Vladimír Vondruš	6ec472038b	GCC 4.4 compatibility: ambiguous std::to_string() call. It shouldn't be. What is ambiguous in conversion from `unsigned long int` to `unsigned long long int`?	13 years ago
Vladimír Vondruš	9d1d4b5ef1	Properly number shader sources. Previously the sources were numbered 1, 3, 5 etc., which is wrong.	13 years ago
Vladimír Vondruš	64b00278b8	No need to add `#line` directive also before `#version` line.	13 years ago
Vladimír Vondruš	12f9666321	Missing space in shader compiler output message. Missed out when reworking in `6904b38b13`.	13 years ago
Vladimír Vondruš	6904b38b13	Reworked and cleaned up shader classes. Removed unneeded member variables, removed wrong assertions and wrong documentation (most of the state they were fobidding is actually valid). Retrieving shader log with full length, properly printing non-error messages to debug output. Each shader must now be compiled explicitly using compile(), which is slightly better for the user as it is possible to check compile status instead of having it weirdly hidden inside attachShader(). link() now also returns linking status.	13 years ago
Vladimír Vondruš	4d3865c10c	Properly move in shader move constructor/assignment.	13 years ago
Vladimír Vondruš	0804106f62	Make Shader::addSource() move-aware. Also update addFile() to prevent unnecessary copying.	13 years ago
Vladimír Vondruš	950dde62f1	Make Shader::addSource() no-op for empty string.	13 years ago
Vladimír Vondruš	63245ae457	Fixed various superflous spaces and newlines in Shader error messages. The debug classes are long overdue for total rework. This isn't usable.	13 years ago
Vladimír Vondruš	d3ebbabb27	Properly count line numbers in shaders. Now line 41 of third added file is marked as 3(41). Source 0 is the `#version` string added in Shader constructor. Huh, deinlining that Shader::addSource() function also significantly reduced debug binary sizes.	13 years ago
Vladimír Vondruš	fd4ada4fc1	Method chaining in Shader. The methods return reference instead of pointer, as the class is commonly created on the stack. Removed static functions Shader::fromFile() and Shader::fromData(), as they are not needed now. Also asserting that the file exists and is readable in addFile().	13 years ago
Vladimír Vondruš	1aac14d059	Using CORRADE_ASSERT_UNREACHABLE() instead of CORRADE_ASSERT(false).	13 years ago
Vladimír Vondruš	c5ab86794b	Relicensing to MIT/Expat license, part 3: source files. Added license header also to shader sources. Hopefully it won't harm compilation times too much.	13 years ago
Vladimír Vondruš	b6f1910599	Making some asserts internal. They shouldn't be triggered by the user, so no explanational message is needed (but exact position in source is).	14 years ago
Vladimír Vondruš	0f889369f4	No `using namespace std` anywhere. Also added missing std:: prefix to remaining cases of std::size_t, std::[u]int[0-9]+_t, std::sin() etc., std::exit().	14 years ago
Vladimír Vondruš	ae013effff	Adapted to Corrade changes. Optimalizations in Corrade::TestSuite and Corrade::Utility::Debug leaded to significant reduction of compilation time - on my machine it was ~5:38 before with building of unit tests enabled, now only ~5:00.	14 years ago
Vladimír Vondruš	6dc27374a4	Assert when creating Shader with unsupported version.	14 years ago

19 Commits (bc18eec596735cccc858087dbda62f02a2bb84ee)