Index: new-game.cpp
===================================================================
--- new-game.cpp	(revision 8b7cfcfd52b28f7b70f2a15fb8025acaa9b1a843)
+++ new-game.cpp	(revision d0b95962c3e4a536ba085aaf78bf8b52972c3523)
@@ -117,8 +117,4 @@
    glAttachShader(shader_program, fs);
 
-   // this must be used on OSX instead of using layout() in the shader
-   glBindAttribLocation(shader_program, 0, "vertex_position");
-   glBindAttribLocation(shader_program, 1, "vertex_color");
-
    glLinkProgram(shader_program);
 
Index: test.vert
===================================================================
--- test.vert	(revision 8b7cfcfd52b28f7b70f2a15fb8025acaa9b1a843)
+++ test.vert	(revision d0b95962c3e4a536ba085aaf78bf8b52972c3523)
@@ -1,10 +1,6 @@
 #version 410
 
-// using layout() doens't work on OSX, so use glBindAttribLocation() in the C++ code instead
-// layout(position = 0) in vec3 vertex_position;
-// layout(position = 1) in vec3 vertex_color;
-
-in vec3 vertex_position;
-in vec3 vertex_color;
+layout(location = 0) in vec3 vertex_position;
+layout(location = 1) in vec3 vertex_color;
 
 out vec3 color;