[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49723] branches/soc-2012-swiss_cheese/ source/blender/gpu: compile fixes from mismatched calling conventions

[Jason Wilkins]

Revision: 49723
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49723
Author:   jwilkins
Date:     2012-08-09 05:19:15 +0000 (Thu, 09 Aug 2012)
Log Message:
-----------
compile fixes from mismatched calling conventions

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h	2012-08-09 03:59:28 UTC (rev 49722)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h	2012-08-09 05:19:15 UTC (rev 49723)
@@ -250,7 +250,7 @@
 GPUFUNC void * (GLAPIENTRY* gpuMapBuffer)(GLenum target, GLenum access);
 GPUFUNC GLboolean (GLAPIENTRY* gpuUnmapBuffer)(GLenum  target);
 
-GPUFUNC void * (GLAPIENTRY* gpuBufferStartUpdate)(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage);
+GPUFUNC const void * (GLAPIENTRY* gpuBufferStartUpdate)(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage);
 GPUFUNC void (GLAPIENTRY* gpuBufferFinishUpdate)(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage);
 
 void GPU_func_comp_init(void);

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c	2012-08-09 03:59:28 UTC (rev 49722)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c	2012-08-09 05:19:15 UTC (rev 49723)
@@ -234,25 +234,25 @@
 
 #endif
 
-static void * gpuBufferStartUpdate_buffer(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage)
+static const void * GLAPIENTRY gpuBufferStartUpdate_buffer(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage)
 {
 	gpuBufferData(target, 0, NULL, usage);
 	return data;
 }
 
-static void * gpuBufferStartUpdate_map(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage)
+static void * GLAPIENTRY gpuBufferStartUpdate_map(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage)
 {
 	gpuBufferData(target, size, NULL, usage);
 	return gpuMapBuffer(target, GL_WRITE_ONLY);
 }
 
-static void gpuBufferFinishUpdate_buffer(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage)
+static void GLAPIENTRY gpuBufferFinishUpdate_buffer(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage)
 {
 	gpuBufferData(target, size, data, usage);
 
 }
 
-static void gpuBufferFinishUpdate_map(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage)
+static void GLAPIENTRY gpuBufferFinishUpdate_map(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage)
 {
 	gpuUnmapBuffer(target);