[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49660] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern: gpuLights compilation fix for gcc

Alexander Kuznetsov kuzsasha at gmail.com
Tue Aug 7 18:04:16 CEST 2012


Revision: 49660
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49660
Author:   alexk
Date:     2012-08-07 16:04:14 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
gpuLights compilation fix for gcc

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.h
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_internal.h

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.h	2012-08-07 15:04:46 UTC (rev 49659)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.h	2012-08-07 16:04:14 UTC (rev 49660)
@@ -75,27 +75,27 @@
 void gpuInitializeLighting(void);
 void gpuShutdownLighting(void);
 
-void gpuColorMaterial(GLenum face, GLenum mode);
-void gpuEnableColorMaterial(void);
-void gpuDisableColorMaterial(void);
+BLI_INLINE void gpuColorMaterial(GLenum face, GLenum mode);
+BLI_INLINE void gpuEnableColorMaterial(void);
+BLI_INLINE void gpuDisableColorMaterial(void);
 
-void gpuMaterialfv(GLenum face, GLenum pname, const GLfloat *params);
-void gpuMateriali(GLenum face, GLenum pname, GLint param);
-void gpuGetMaterialfv(GLenum face, GLenum pname, GLfloat *params);
+BLI_INLINE void gpuMaterialfv(GLenum face, GLenum pname, const GLfloat *params);
+BLI_INLINE void gpuMateriali(GLenum face, GLenum pname, GLint param);
+BLI_INLINE void gpuGetMaterialfv(GLenum face, GLenum pname, GLfloat *params);
 
-void gpuLightf(GLint light, GLenum pname, GLfloat param);
-void gpuLightfv(GLint light, GLenum pname, const GLfloat* params);
+BLI_INLINE void gpuLightf(GLint light, GLenum pname, GLfloat param);
+BLI_INLINE void gpuLightfv(GLint light, GLenum pname, const GLfloat* params);
 
-void gpuEnableLight(GLint light);
-void gpuDisableLight(GLint light);
-GLboolean gpuIsLightEnabled(GLint light);
+BLI_INLINE void gpuEnableLight(GLint light);
+BLI_INLINE void gpuDisableLight(GLint light);
+BLI_INLINE GLboolean gpuIsLightEnabled(GLint light);
 
-void gpuLightModeli(GLenum pname, GLint param);
-void gpuLightModelfv(GLenum pname, const GLfloat* params);
+BLI_INLINE void gpuLightModeli(GLenum pname, GLint param);
+BLI_INLINE void gpuLightModelfv(GLenum pname, const GLfloat* params);
 
-void gpuEnableLighting(void);
-void gpuDisableLighting(void);
-GLboolean gpuIsLightingEnabled(void);
+BLI_INLINE void gpuEnableLighting(void);
+BLI_INLINE void gpuDisableLighting(void);
+BLI_INLINE GLboolean gpuIsLightingEnabled(void);
 
 
 

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_internal.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_internal.h	2012-08-07 15:04:46 UTC (rev 49659)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_internal.h	2012-08-07 16:04:14 UTC (rev 49660)
@@ -34,7 +34,7 @@
 
 
 
-#include "GPU_lighting.h"
+#include "gpu_lighting.h"
 
 
 




More information about the Bf-blender-cvs mailing list