From 8587afaca73e2ea405dfbbf9e88d9688e8082a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 16 Aug 2019 12:24:26 +0200 Subject: [PATCH] GL: improve Attribute docs with clear integer/double unavailablility errors. --- doc/snippets/MagnumGL.cpp | 9 ++++- src/Magnum/GL/AbstractShaderProgram.h | 4 +- src/Magnum/GL/Attribute.h | 54 +++++++++++++++++++-------- 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/doc/snippets/MagnumGL.cpp b/doc/snippets/MagnumGL.cpp index af8e7f9d8..2e2f79b67 100644 --- a/doc/snippets/MagnumGL.cpp +++ b/doc/snippets/MagnumGL.cpp @@ -312,11 +312,16 @@ MyShader& bindSpecularTexture(GL::Texture2D& texture) { /* [AbstractShaderProgram-textures] */ /* [AbstractShaderProgram-xfb] */ -MyShader& setTransformFeedback(GL::TransformFeedback& feedback, GL::Buffer& positions, GL::Buffer& data) { +MyShader& setTransformFeedback(GL::TransformFeedback& feedback, + GL::Buffer& positions, GL::Buffer& data) +{ feedback.attachBuffers(0, {&positions, &data}); return *this; } -MyShader& setTransformFeedback(GL::TransformFeedback& feedback, Int totalCount, GL::Buffer& positions, GLintptr positionsOffset, GL::Buffer& data, GLintptr dataOffset) { +MyShader& setTransformFeedback(GL::TransformFeedback& feedback, Int totalCount, + GL::Buffer& positions, GLintptr positionsOffset, GL::Buffer& data, + GLintptr dataOffset) +{ feedback.attachBuffers(0, { std::make_tuple(&positions, positionsOffset, totalCount*sizeof(Vector3)), std::make_tuple(&data, dataOffset, totalCount*sizeof(Vector2ui)) diff --git a/src/Magnum/GL/AbstractShaderProgram.h b/src/Magnum/GL/AbstractShaderProgram.h index c1a3781bd..eca93e92e 100644 --- a/src/Magnum/GL/AbstractShaderProgram.h +++ b/src/Magnum/GL/AbstractShaderProgram.h @@ -54,8 +54,8 @@ This class is designed to be used via subclassing. Subclasses define these functions and properties: