From 3f53a7a1cae77ceb3952b0070cf40cfeeb050af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 22 Aug 2013 16:32:49 +0200 Subject: [PATCH 1/2] Shaders: don't set uniform if not used. --- src/Shaders/MeshVisualizer.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Shaders/MeshVisualizer.h b/src/Shaders/MeshVisualizer.h index b30e3c32b..5d6b9e1e9 100644 --- a/src/Shaders/MeshVisualizer.h +++ b/src/Shaders/MeshVisualizer.h @@ -125,10 +125,12 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizer: public AbstractShaderProgram { * @brief Set viewport size * @return Reference to self (for method chaining) * - * Has effect only if @ref Flag "Flag::Wireframe" is enabled. + * Has effect only if @ref Flag "Flag::Wireframe" is enabled and + * geometry shaders are used. */ MeshVisualizer& setViewportSize(const Vector2& size) { - setUniform(viewportSizeUniform, size); + if(flags & Flag::Wireframe && !(flags & Flag::NoGeometryShader)) + setUniform(viewportSizeUniform, size); return *this; } From 1b6ef7e0bda6c87f04e5b1a7a1f38bb2146b31f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 22 Aug 2013 16:41:10 +0200 Subject: [PATCH 2/2] Platform: updated markup to be valid HTML5. --- src/Platform/NaClApplication.h | 3 ++- src/Platform/magnum-info-nacl.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Platform/NaClApplication.h b/src/Platform/NaClApplication.h index 97edf3c44..da40cad4d 100644 --- a/src/Platform/NaClApplication.h +++ b/src/Platform/NaClApplication.h @@ -83,13 +83,14 @@ your NaCl toolchain. Magnum NaCl Application +

Magnum NaCl Application

- +
Initialization...
diff --git a/src/Platform/magnum-info-nacl.html b/src/Platform/magnum-info-nacl.html index b425ce48f..cd679fb9d 100644 --- a/src/Platform/magnum-info-nacl.html +++ b/src/Platform/magnum-info-nacl.html @@ -2,6 +2,7 @@ Magnum Info +