From c4a8930909ed3b24786f0904b06bc69fe0f7aae8 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@glfw.org>
Date: Wed, 21 Sep 2016 15:40:27 +0200
Subject: [PATCH] Cleanup

---
 tests/cursor.c  | 10 +++++-----
 tests/msaa.c    |  5 +----
 tests/sharing.c |  2 +-
 tests/tearing.c |  3 +--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/tests/cursor.c b/tests/cursor.c
index c0a3a85b..c3f515b6 100644
--- a/tests/cursor.c
+++ b/tests/cursor.c
@@ -310,12 +310,12 @@ int main(void)
 
             scale = (float) fb_width / (float) wnd_width;
             vertices[0][0] = 0.f;
-            vertices[0][1] = fb_height - cursor_y * scale;
+            vertices[0][1] = (float) (fb_height - cursor_y * scale);
             vertices[1][0] = (float) fb_width;
-            vertices[1][1] = fb_height - cursor_y * scale;
-            vertices[2][0] = cursor_x * scale;
+            vertices[1][1] = (float) (fb_height - cursor_y * scale);
+            vertices[2][0] = (float) (cursor_x * scale);
             vertices[2][1] = 0.f;
-            vertices[3][0] = cursor_x * scale;
+            vertices[3][0] = (float) (cursor_x * scale);
             vertices[3][1] = (float) fb_height;
 
             glBufferData(GL_ARRAY_BUFFER,
@@ -323,7 +323,7 @@ int main(void)
                          vertices,
                          GL_STREAM_DRAW);
 
-            mat4x4_ortho(mvp, 0.f, fb_width, 0.f, fb_height, 0.f, 1.f);
+            mat4x4_ortho(mvp, 0.f, (float) fb_width, 0.f, (float) fb_height, 0.f, 1.f);
             glUniformMatrix4fv(mvp_location, 1, GL_FALSE, (const GLfloat*) mvp);
 
             glDrawArrays(GL_LINES, 0, 4);
diff --git a/tests/msaa.c b/tests/msaa.c
index ff76ea6a..b8aae34b 100644
--- a/tests/msaa.c
+++ b/tests/msaa.c
@@ -44,10 +44,7 @@
 
 #include "getopt.h"
 
-static const struct
-{
-    float x, y;
-} vertices[4] =
+static const vec2 vertices[4] =
 {
     { -0.6f, -0.6f },
     {  0.6f, -0.6f },
diff --git a/tests/sharing.c b/tests/sharing.c
index 3d0422d7..2c4cced2 100644
--- a/tests/sharing.c
+++ b/tests/sharing.c
@@ -77,7 +77,7 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action,
 int main(int argc, char** argv)
 {
     GLFWwindow* windows[2];
-    GLuint texture, vertex_shader, fragment_shader, program, vertex_buffer;
+    GLuint texture, program, vertex_buffer;
     GLint mvp_location, vpos_location, color_location, texture_location;
 
     srand((unsigned int) time(NULL));
diff --git a/tests/tearing.c b/tests/tearing.c
index b2daa27c..07824e3f 100644
--- a/tests/tearing.c
+++ b/tests/tearing.c
@@ -142,14 +142,13 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action,
 int main(int argc, char** argv)
 {
     int ch, width, height;
-    float position;
     unsigned long frame_count = 0;
     double last_time, current_time;
     int fullscreen = GLFW_FALSE;
     GLFWmonitor* monitor = NULL;
     GLFWwindow* window;
     GLuint vertex_buffer, vertex_shader, fragment_shader, program;
-    GLint mvp_location, vpos_location, vcol_location;
+    GLint mvp_location, vpos_location;
 
     while ((ch = getopt(argc, argv, "fh")) != -1)
     {