From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 9 Mar 2014 11:30:27 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~45
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=12c11c0e615f7fc17ef7a600ff0c9099f7908dbc;hp=f51595f6c9e2eb280a4f1fcb63a9aa8fafcf3660;p=movit

Merge branch 'master' into epoxy
---

diff --git a/init.cpp b/init.cpp
index 3c781e1..671c507 100644
--- a/init.cpp
+++ b/init.cpp
@@ -221,12 +221,6 @@ void measure_roundoff_problems()
 		1.0f, 1.0f,
 		1.0f, 0.0f
 	};
-	float texcoords[] = {
-		0.25f, 0.0f,
-		0.25f, 0.0f,
-		0.75f, 0.0f,
-		0.75f, 0.0f
-	};
 
 	GLuint vao;
 	glGenVertexArrays(1, &vao);
@@ -235,7 +229,7 @@ void measure_roundoff_problems()
 	check_error();
 
 	GLuint position_vbo = fill_vertex_attribute(glsl_program_num, "position", 2, GL_FLOAT, sizeof(vertices), vertices);
-	GLuint texcoord_vbo = fill_vertex_attribute(glsl_program_num, "texcoord", 2, GL_FLOAT, sizeof(texcoords), texcoords);
+	GLuint texcoord_vbo = fill_vertex_attribute(glsl_program_num, "texcoord", 2, GL_FLOAT, sizeof(vertices), vertices);  // Same data.
 
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 	check_error();