# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1315373635 -10800
# Node ID fe1cb1c567cc846b10d329567a1cada2a46834ed
# Parent  9890940948f757bc6fba179e0bb62a5894dc78df
at long last

diff -r 9890940948f7 -r fe1cb1c567cc sdr/test.v.glsl
--- a/sdr/test.v.glsl	Wed Sep 07 08:30:24 2011 +0300
+++ b/sdr/test.v.glsl	Wed Sep 07 08:33:55 2011 +0300
@@ -1,4 +1,4 @@
-//uniform mat4 matrix_modelview, matrix_projection;
+uniform mat4 matrix_modelview, matrix_projection;
 
 attribute vec4 attr_vertex, attr_color;
 
@@ -6,7 +6,7 @@
 
 void main()
 {
-	//mat4 mvp = matrix_projection * matrix_modelview;
-	gl_Position = /*mvp */ attr_vertex;
+	mat4 mvp = matrix_projection * matrix_modelview;
+	gl_Position = mvp * attr_vertex;
 	var_color = attr_color;
 }
diff -r 9890940948f7 -r fe1cb1c567cc src/ES2Renderer.m
--- a/src/ES2Renderer.m	Wed Sep 07 08:30:24 2011 +0300
+++ b/src/ES2Renderer.m	Wed Sep 07 08:33:55 2011 +0300
@@ -56,7 +56,7 @@
         return NO;
     }
 
-	reshape(0, 0, backingWidth, backingHeight);
+	reshape(backingWidth, backingHeight);
 
     return YES;
 }
diff -r 9890940948f7 -r fe1cb1c567cc src/istereo.c
--- a/src/istereo.c	Wed Sep 07 08:30:24 2011 +0300
+++ b/src/istereo.c	Wed Sep 07 08:33:55 2011 +0300
@@ -35,13 +35,13 @@
 
 	bind_program(prog);
 
-	/*gl_matrix_mode(GL_MODELVIEW);
+	gl_matrix_mode(GL_MODELVIEW);
 	gl_load_identity();
-	gl_translatef(0, 0, -8);*/
+	gl_translatef(0, 0, -8);
 
-	dbg_draw();
+	//dbg_draw();
 
-	/*gl_begin(GL_QUADS);
+	gl_begin(GL_QUADS);
 	gl_color3f(1, 0, 0);
 	gl_vertex3f(-1, -1, 0);
 	gl_color3f(0, 1, 0);
@@ -50,7 +50,7 @@
 	gl_vertex3f(1, 1, 0);
 	gl_color3f(1, 1, 0);
 	gl_vertex3f(-1, 1, 0);
-	gl_end();*/
+	gl_end();
 
 	assert(glGetError() == GL_NO_ERROR);
 }
@@ -78,13 +78,6 @@
 	if(!(prog = create_program_link(vs, ps))) {
 		return -1;
 	}
-
-	glBindAttribLocation(prog, 0, "attr_vertex");
-	glBindAttribLocation(prog, 1, "attr_color");
-	glLinkProgram(prog);
-
-	assert(prog);
-
 	return prog;
 }