[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60328] branches/soc-2013-viewport_fx/ source: putting GPU_mipmap_2D declaration in the proper header file ( required letting creator.c include GL/glew.h)

Jason Wilkins Jason.A.Wilkins at gmail.com
Mon Sep 23 14:06:48 CEST 2013


Revision: 60328
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60328
Author:   jwilkins
Date:     2013-09-23 12:06:47 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
putting GPU_mipmap_2D declaration in the proper header file (required letting creator.c include GL/glew.h)

Modified Paths:
--------------
    branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h
    branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h
    branches/soc-2013-viewport_fx/source/creator/CMakeLists.txt

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h	2013-09-23 11:49:42 UTC (rev 60327)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h	2013-09-23 12:06:47 UTC (rev 60328)
@@ -34,6 +34,8 @@
 
 #include "BLI_sys_types.h"
 
+#include "GPU_glew.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -112,6 +114,8 @@
 /* enable gpu mipmapping */
 void GPU_set_gpu_mipmapping(int gpu_mipmap);
 
+GLenum GPU_mipmap_2D(GLboolean genmip, GLenum internalFormat, int w, int h, GLenum type, void* data);
+
 /* Image updates and free
  * - these deal with images bound as opengl textures */
 

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h	2013-09-23 11:49:42 UTC (rev 60327)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h	2013-09-23 12:06:47 UTC (rev 60328)
@@ -34,6 +34,15 @@
 
 #include "GPU_glew.h"
 
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+
 /* XXX jwilkins: temporary work around for MinGW32 build error */
 #ifdef __MINGW32__
 #undef GPU_ENABLE_STRING_MARKER
@@ -55,14 +64,12 @@
 
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 const char* gpuErrorString(GLenum err);
 
-GLenum GPU_mipmap_2D(GLboolean genmip, GLenum internalFormat, int w, int h, GLenum type, void* data);
 
+
+
+
 #ifdef __cplusplus
 }
 #endif

Modified: branches/soc-2013-viewport_fx/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2013-viewport_fx/source/creator/CMakeLists.txt	2013-09-23 11:49:42 UTC (rev 60327)
+++ branches/soc-2013-viewport_fx/source/creator/CMakeLists.txt	2013-09-23 12:06:47 UTC (rev 60328)
@@ -39,6 +39,9 @@
 	../blender/windowmanager
 )
 
+add_definitions(${GL_DEFINITIONS})
+blender_include_dirs(${GLEW_INCLUDE_PATH})
+
 if(WIN32)
 	blender_include_dirs(../../intern/utfconv)
 endif()




More information about the Bf-blender-cvs mailing list