medfall

commit 00c01fae41f6f46fe112f93fa198ceaca9de0c7e
parent 570e172d47e0309ec191cc62aebec004b366046d
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Jan 22 13:51:03 +0200

MSVC warnings

Diffstat:
immediate.cc
 | 
2
+-
immediate.h
 | 
6
+++---
renderer.cc
 | 
4
++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/immediate.cc b/immediate.cc
@@ -6,7 +6,7 @@
 #include "immediate.h"
 #include "renderer.h"
 
-void immediate_init( ImmediateContext * ctx, ImmediateTriangle * memory, size_t max_triangles ) {
+void immediate_init( ImmediateContext * ctx, ImmediateTriangle * memory, u32 max_triangles ) {
 	ctx->triangles = memory;
 	ctx->num_triangles = 0;
 	ctx->max_triangles = max_triangles;
diff --git a/immediate.h b/immediate.h
@@ -15,12 +15,12 @@ struct ImmediateTriangle {
 
 struct ImmediateContext {
 	ImmediateTriangle * triangles;
-	size_t num_triangles;
-	size_t max_triangles;
+	u32 num_triangles;
+	u32 max_triangles;
 };
 
 void immediate_init( ImmediateContext * ctx,
-	ImmediateTriangle * memory, size_t max_triangles );
+	ImmediateTriangle * memory, u32 max_triangles );
 
 void immediate_triangle( ImmediateContext * ctx, v3 p1, v3 p2, v3 p3, v4 colour );
 void immediate_triangle( ImmediateContext * ctx,
diff --git a/renderer.cc b/renderer.cc
@@ -231,7 +231,7 @@ Shader renderer_new_shader( ShaderConfig config ) {
 	}
 
 	glUseProgram( program );
-	for( size_t i = 0; i < RENDERER_MAX_TEXTURES; i++ ) {
+	for( GLint i = 0; i < RENDERER_MAX_TEXTURES; i++ ) {
 		if( config.texture_uniform_names[ i ] != NULL ) {
 			GLuint uniform = glGetUniformLocation( program, config.texture_uniform_names[ i ] );
 			if( uniform == GLuint( -1 ) ) {
@@ -241,7 +241,7 @@ Shader renderer_new_shader( ShaderConfig config ) {
 		}
 	}
 
-	for( size_t i = 0; i < RENDERER_MAX_TEXTURE_BUFFERS; i++ ) {
+	for( GLint i = 0; i < RENDERER_MAX_TEXTURE_BUFFERS; i++ ) {
 		if( config.texture_buffer_uniform_names[ i ] != NULL ) {
 			GLuint uniform = glGetUniformLocation( program, config.texture_buffer_uniform_names[ i ] );
 			if( uniform == GLuint( -1 ) ) {