From 4d68547cbe1b35db53fbc14a7448b7f2d86008b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 20 Nov 2013 01:20:34 +0100 Subject: [PATCH] Shaders: set VertexColor::Color attribute location to 3. Locations 0, 1 and 2 are reserved for positions, texture coordinates and normals. --- src/Shaders/VertexColor.h | 2 +- src/Shaders/VertexColor2D.vert | 2 +- src/Shaders/VertexColor3D.vert | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Shaders/VertexColor.h b/src/Shaders/VertexColor.h index 5c32f4b86..8bb656004 100644 --- a/src/Shaders/VertexColor.h +++ b/src/Shaders/VertexColor.h @@ -50,7 +50,7 @@ template class MAGNUM_SHADERS_EXPORT VertexColor: public typedef Attribute<0, typename DimensionTraits::VectorType> Position; /** @brief Vertex color */ - typedef Attribute<1, Color3> Color; + typedef Attribute<3, Color3> Color; explicit VertexColor(); diff --git a/src/Shaders/VertexColor2D.vert b/src/Shaders/VertexColor2D.vert index 627fe2a64..de59a8983 100644 --- a/src/Shaders/VertexColor2D.vert +++ b/src/Shaders/VertexColor2D.vert @@ -39,7 +39,7 @@ uniform highp mat3 transformationProjectionMatrix; #ifdef EXPLICIT_ATTRIB_LOCATION layout(location = 0) in highp vec2 position; -layout(location = 1) in lowp vec3 color; +layout(location = 3) in lowp vec3 color; #else in highp vec2 position; in lowp vec3 color; diff --git a/src/Shaders/VertexColor3D.vert b/src/Shaders/VertexColor3D.vert index cbc07d517..0e0e37b48 100644 --- a/src/Shaders/VertexColor3D.vert +++ b/src/Shaders/VertexColor3D.vert @@ -39,7 +39,7 @@ uniform highp mat4 transformationProjectionMatrix; #ifdef EXPLICIT_ATTRIB_LOCATION layout(location = 0) in highp vec4 position; -layout(location = 1) in lowp vec3 color; +layout(location = 3) in lowp vec3 color; #else in highp vec4 position; in lowp vec3 color;