From 503a6b2dc50986262a2a6b04e7fc033c4075198f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 16 Dec 2015 14:01:36 +0100
Subject: [PATCH] Fix AMD complaints about misaligned data in Mesh GL test.

---
 src/Magnum/Test/MeshGLTest.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Magnum/Test/MeshGLTest.cpp b/src/Magnum/Test/MeshGLTest.cpp
index b7e05e4b0..e5240881c 100644
--- a/src/Magnum/Test/MeshGLTest.cpp
+++ b/src/Magnum/Test/MeshGLTest.cpp
@@ -871,13 +871,13 @@ void MeshGLTest::addVertexBufferUnsignedIntWithUnsignedShort() {
 
     typedef Attribute<0, UnsignedInt> Attribute;
 
-    constexpr UnsignedShort data[] = { 0, 49563, 16583 };
+    constexpr UnsignedShort data[] = { 0, 49563, 2128, 3821, 16583 };
     Buffer buffer;
     buffer.setData(data, BufferUsage::StaticDraw);
 
     Mesh mesh;
     mesh.setBaseVertex(1)
-        .addVertexBuffer(buffer, 2, Attribute(Attribute::DataType::UnsignedShort));
+        .addVertexBuffer(buffer, 2, 2, Attribute(Attribute::DataType::UnsignedShort));
 
     MAGNUM_VERIFY_NO_ERROR();
 
@@ -896,13 +896,13 @@ void MeshGLTest::addVertexBufferUnsignedIntWithShort() {
 
     typedef Attribute<0, UnsignedInt> Attribute;
 
-    constexpr Short data[] = { 0, 24563, 16583 };
+    constexpr Short data[] = { 0, 24563, 2128, 3821, 16583 };
     Buffer buffer;
     buffer.setData(data, BufferUsage::StaticDraw);
 
     Mesh mesh;
     mesh.setBaseVertex(1)
-        .addVertexBuffer(buffer, 2, Attribute(Attribute::DataType::Short));
+        .addVertexBuffer(buffer, 2, 2, Attribute(Attribute::DataType::Short));
 
     MAGNUM_VERIFY_NO_ERROR();
 
@@ -921,13 +921,13 @@ void MeshGLTest::addVertexBufferIntWithUnsignedShort() {
 
     typedef Attribute<0, Int> Attribute;
 
-    constexpr UnsignedShort data[] = { 0, 49563, 16583 };
+    constexpr UnsignedShort data[] = { 0, 49563, 2128, 3821, 16583 };
     Buffer buffer;
     buffer.setData(data, BufferUsage::StaticDraw);
 
     Mesh mesh;
     mesh.setBaseVertex(1)
-        .addVertexBuffer(buffer, 2, Attribute(Attribute::DataType::UnsignedShort));
+        .addVertexBuffer(buffer, 2, 2, Attribute(Attribute::DataType::UnsignedShort));
 
     MAGNUM_VERIFY_NO_ERROR();
 
@@ -946,13 +946,13 @@ void MeshGLTest::addVertexBufferIntWithShort() {
 
     typedef Attribute<0, Int> Attribute;
 
-    constexpr Short data[] = { 0, 24563, -16583 };
+    constexpr Short data[] = { 0, 24563, 2128, 3821, -16583 };
     Buffer buffer;
     buffer.setData(data, BufferUsage::StaticDraw);
 
     Mesh mesh;
     mesh.setBaseVertex(1)
-        .addVertexBuffer(buffer, 2, Attribute(Attribute::DataType::Short));
+        .addVertexBuffer(buffer, 2, 2, Attribute(Attribute::DataType::Short));
 
     MAGNUM_VERIFY_NO_ERROR();
 
@@ -1098,13 +1098,13 @@ void MeshGLTest::addVertexBufferLessVectorComponents() {
 void MeshGLTest::addVertexBufferNormalized() {
     typedef Attribute<0, Vector3> Attribute;
 
-    constexpr Color3ub data[] = { {}, {0, 128, 64}, {32, 156, 228} };
+    constexpr Color4ub data[] = { {}, {0, 128, 64}, {32, 156, 228} };
     Buffer buffer;
     buffer.setData(data, BufferUsage::StaticDraw);
 
     Mesh mesh;
     mesh.setBaseVertex(1)
-        .addVertexBuffer(buffer, 3, Attribute(Attribute::DataType::UnsignedByte, Attribute::DataOption::Normalized));
+        .addVertexBuffer(buffer, 4, Attribute(Attribute::DataType::UnsignedByte, Attribute::DataOption::Normalized), 1);
 
     MAGNUM_VERIFY_NO_ERROR();