medfall

commit e39b5f635696b37041c0eb7d622c5192913623dc
parent d2437a686c9fb32a0f4f64cda286e4573172fc9e
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Aug 23 12:40:58 +0200

Attributes/uniforms are GLint not GLuint

Diffstat:
game.h
 | 
6
+++---
immediate.cc
 | 
5
++++-
immediate.h
 | 
2
+-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/game.h b/game.h
@@ -22,9 +22,9 @@ struct GameState {
 	WorkQueue background_tasks;
 
 	GLuint test_shader;
-	GLuint test_at_position;
-	GLuint test_at_colour;
-	GLuint test_un_VP;
+	GLint test_at_position;
+	GLint test_at_colour;
+	GLint test_un_VP;
 
 	ImmediateContext test_immediate;
 };
diff --git a/immediate.cc b/immediate.cc
@@ -25,7 +25,10 @@ void immediate_triangle( ImmediateContext * const ctx,
 	ctx->triangles[ ctx->num_triangles++ ] = triangle;
 }
 
-void immediate_render( ImmediateContext * const ctx, const GLuint at_position, const GLuint at_colour ) {
+void immediate_render(
+	ImmediateContext * const ctx,
+	const GLint at_position, const GLint at_colour,
+) {
 	GLuint vao;
 	glGenVertexArrays( 1, &vao );
 
diff --git a/immediate.h b/immediate.h
@@ -23,7 +23,7 @@ void immediate_init( ImmediateContext * const ctx, ImmediateTriangle * const mem
 void immediate_triangle( ImmediateContext * const ctx,
 	const glm::vec3 v1, const glm::vec3 v2, const glm::vec3 v3, const glm::vec4 colour );
 
-void immediate_render( ImmediateContext * const ctx, const GLuint at_position, const GLuint at_colour );
+void immediate_render( ImmediateContext * const ctx, const GLint at_position, const GLint at_colour );
 void immediate_clear( ImmediateContext * const ctx );
 
 #endif // _IMMEDIATE_H_