[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48398] branches/soc-2012-swiss_cheese/ source/blender/gpu: Aggressive rewriting of r48334 because it failed to build with MSVC8
Jason Wilkins
Jason.A.Wilkins at gmail.com
Fri Jun 29 13:16:18 CEST 2012
Revision: 48398
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48398
Author: jwilkins
Date: 2012-06-29 11:16:17 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Aggressive rewriting of r48334 because it failed to build with MSVC8
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48334
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h 2012-06-29 11:15:02 UTC (rev 48397)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h 2012-06-29 11:16:17 UTC (rev 48398)
@@ -1,59 +1,257 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Jason Wilkins.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/gpu/GPU_functions.h
+ * \ingroup gpu
+ */
+#ifndef GPU_FUNCTIONS_H
+#define GPU_FUNTCIONS_H
+
+#include "gpu_immediate_internal.h" /* XXX: temporary, will re-factor header files later */
-#ifdef GPU_INTERN_FUNC
-#define GPUFUNC
-#else
-#define GPUFUNC extern
-#endif
+#undef GLAPIENTRY /* glew.h was included above, so GLAPIENTRY is defined, but blank */
-GPUFUNC unsigned int (*gpuCreateShader)(unsigned int shaderType);
-GPUFUNC void (*gpuAttachShader)( unsigned int program, unsigned int shader);
-GPUFUNC void (*gpuShaderSource)(unsigned int shader, int count, const char ** string, const int * length);
-GPUFUNC void (*gpuCompileShader)(unsigned int shader);
-GPUFUNC void (*gpuGetShaderiv)(unsigned int shader, unsigned int pname, int *params);
-GPUFUNC void (*gpuGetShaderInfoLog)(unsigned int shader, int maxLength, int *length, char *infoLog);
+/***** BEGIN:THIS CODE WAS COPIED DIRECTLY FROM glew.h *****/
+
+#if defined(_WIN32)
+
+/*
+ * GLEW does not include <windows.h> to avoid name space pollution.
+ * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t
+ * defined properly.
+ */
+/* <windef.h> */
+#ifndef APIENTRY
+#define GLEW_APIENTRY_DEFINED
+# if defined(__MINGW32__) || defined(__CYGWIN__)
+# define APIENTRY __stdcall
+# elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
+# define APIENTRY __stdcall
+# else
+# define APIENTRY
+# endif
+#endif
+#ifndef GLAPI
+# if defined(__MINGW32__) || defined(__CYGWIN__)
+# define GLAPI extern
+# endif
+#endif
+/* <winnt.h> */
+#ifndef CALLBACK
+#define GLEW_CALLBACK_DEFINED
+# if defined(__MINGW32__) || defined(__CYGWIN__)
+# define CALLBACK __attribute__ ((__stdcall__))
+# elif (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
+# define CALLBACK __stdcall
+# else
+# define CALLBACK
+# endif
+#endif
+/* <wingdi.h> and <winnt.h> */
+#ifndef WINGDIAPI
+#define GLEW_WINGDIAPI_DEFINED
+#define WINGDIAPI __declspec(dllimport)
+#endif
+/* <ctype.h> */
+#if (defined(_MSC_VER) || defined(__BORLANDC__)) && !defined(_WCHAR_T_DEFINED)
+typedef unsigned short wchar_t;
+# define _WCHAR_T_DEFINED
+#endif
+/* <stddef.h> */
+#if !defined(_W64)
+# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && defined(_MSC_VER) && _MSC_VER >= 1300
+# define _W64 __w64
+# else
+# define _W64
+# endif
+#endif
+#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_) && !defined(__MINGW64__)
+# ifdef _WIN64
+typedef __int64 ptrdiff_t;
+# else
+typedef _W64 int ptrdiff_t;
+# endif
+# define _PTRDIFF_T_DEFINED
+# define _PTRDIFF_T_
+#endif
+
+#ifndef GLAPI
+# if defined(__MINGW32__) || defined(__CYGWIN__)
+# define GLAPI extern
+# else
+# define GLAPI WINGDIAPI
+# endif
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY APIENTRY
+#endif
+
+/*
+ * GLEW_STATIC is defined for static library.
+ * GLEW_BUILD is defined for building the DLL library.
+ */
+
+#ifdef GLEW_STATIC
+# define GLEWAPI extern
+#else
+# ifdef GLEW_BUILD
+# define GLEWAPI extern __declspec(dllexport)
+# else
+# define GLEWAPI extern __declspec(dllimport)
+# endif
+#endif
+
+#else /* _UNIX */
+
+/*
+ * Needed for ptrdiff_t in turn needed by VBO. This is defined by ISO
+ * C. On my system, this amounts to _3 lines_ of included code, all of
+ * them pretty much harmless. If you know of a way of detecting 32 vs
+ * 64 _targets_ at compile time you are free to replace this with
+ * something that's portable. For now, _this_ is the portable solution.
+ * (mem, 2004-01-04)
+ */
+
+#include <stddef.h>
+
+/* SGI MIPSPro doesn't like stdint.h in C++ mode */
+/* ID: 3376260 Solaris 9 has inttypes.h, but not stdint.h */
+
+#if (defined(__sgi) || defined(__sun)) && !defined(__GNUC__)
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
+#define GLEW_APIENTRY_DEFINED
+#define APIENTRY
+
+/*
+ * GLEW_STATIC is defined for static library.
+ */
+
+#ifdef GLEW_STATIC
+# define GLEWAPI extern
+#else
+# if defined(__GNUC__) && __GNUC__>=4
+# define GLEWAPI extern __attribute__ ((visibility("default")))
+# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# define GLEWAPI extern __global
+# else
+# define GLEWAPI extern
+# endif
+#endif
+
+/* <glu.h> */
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#endif /* _WIN32 */
-GPUFUNC unsigned int (*gpuCreateProgram)(void);
-GPUFUNC void (*gpuLinkProgram)(unsigned int program);
-GPUFUNC void (*gpuGetProgramiv)(unsigned int shader, unsigned int pname, int *params);
-GPUFUNC void (*gpuGetProgramInfoLog)(unsigned int shader, int maxLength, int *length, char *infoLog);
+/***** END:THIS CODE WAS COPIED DIRECTLY FROM glew.h *****/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
-GPUFUNC void (*gpuUniform1i)(int location, int v0);
+GLuint (GLAPIENTRY* gpuCreateShader)(GLuint shaderType);
+void (GLAPIENTRY* gpuAttachShader)(GLuint program, GLuint shader);
+void (GLAPIENTRY* gpuShaderSource)(GLuint shader, GLint count, const GLchar ** string, const GLint * length);
+void (GLAPIENTRY* gpuCompileShader)(GLuint shader);
+void (* gpuGetShaderiv)(GLuint shader, GLuint pname, GLint *params);
+void (GLAPIENTRY* gpuGetShaderInfoLog)(GLuint shader, GLint maxLength, GLint *length, GLchar *infoLog);
-GPUFUNC void (*gpuUniform1fv)(int location, int count, const float * value);
-GPUFUNC void (*gpuUniform2fv)(int location, int count, const float * value);
-GPUFUNC void (*gpuUniform3fv)(int location, int count, const float * value);
-GPUFUNC void (*gpuUniform4fv)(int location, int count, const float * value);
-GPUFUNC void (*gpuUniformMatrix3fv)(int location, int count, unsigned char transpose, const float * value);
-GPUFUNC void (*gpuUniformMatrix4fv)(int location, int count, unsigned char transpose, const float * value);
+GLuint (GLAPIENTRY* gpuCreateProgram)(void);
+void (GLAPIENTRY* gpuLinkProgram)(GLuint program);
+void (* gpuGetProgramiv)(GLuint shader, GLuint pname, GLint *params);
+void (GLAPIENTRY* gpuGetProgramInfoLog)(GLuint shader, GLint maxLength, GLint *length, GLchar *infoLog);
-GPUFUNC int (*gpuGetAttribLocation)(unsigned int program, const char *name);
-GPUFUNC int (*gpuGetUniformLocation)(unsigned int program, const char * name);
+void (GLAPIENTRY* gpuUniform1i)(GLint location, GLint v0);
-GPUFUNC void (*gpuUseProgram)(unsigned int program);
-GPUFUNC void (*gpuDeleteShader)(unsigned int shader);
-GPUFUNC void (*gpuDeleteProgram)(unsigned int program);
+void (GLAPIENTRY* gpuUniform1fv)(GLint location, GLint count, const GLfloat * value);
+void (GLAPIENTRY* gpuUniform2fv)(GLint location, GLint count, const GLfloat * value);
+void (GLAPIENTRY* gpuUniform3fv)(GLint location, GLint count, const GLfloat * value);
+void (GLAPIENTRY* gpuUniform4fv)(GLint location, GLint count, const GLfloat * value);
+void (GLAPIENTRY* gpuUniformMatrix3fv)(GLint location, GLint count, GLboolean transpose, const GLfloat * value);
+void (GLAPIENTRY* gpuUniformMatrix4fv)(GLint location, GLint count, GLboolean transpose, const GLfloat * value);
+GLint (GLAPIENTRY* gpuGetAttribLocation)(GLuint program, const GLchar *name);
+GLint (GLAPIENTRY* gpuGetUniformLocation)(GLuint program, const GLchar * name);
-GPUFUNC void (*gpuGenFramebuffers)(int m, unsigned int * ids);
-GPUFUNC void (*gpuBindFramebuffer)(unsigned int target, unsigned int framebuffer);
-GPUFUNC void (*gpuDeleteFramebuffers)(int n, const unsigned int * framebuffers);
+void (GLAPIENTRY* gpuUseProgram)(GLuint program);
+void (GLAPIENTRY* gpuDeleteShader)(GLuint shader);
+void (GLAPIENTRY* gpuDeleteProgram)(GLuint program);
+void (GLAPIENTRY* gpuGenFramebuffers)(GLint m, GLuint * ids);
+void (GLAPIENTRY* gpuBindFramebuffer)(GLuint target, GLuint framebuffer);
+void (GLAPIENTRY* gpuDeleteFramebuffers)(GLint n, const GLuint * framebuffers);
-#ifdef __cplusplus
-extern "C" {
-#endif
-
void GPU_func_comp_init(void);
#ifdef __cplusplus
}
#endif
+
+
+/***** BEGIN:THIS CODE WAS COPIED DIRECTLY FROM glew.h *****/
+
+#ifdef GLEW_APIENTRY_DEFINED
+#undef GLEW_APIENTRY_DEFINED
+#undef APIENTRY
+#undef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#ifdef GLEW_CALLBACK_DEFINED
+#undef GLEW_CALLBACK_DEFINED
+#undef CALLBACK
+#endif
+
+#ifdef GLEW_WINGDIAPI_DEFINED
+#undef GLEW_WINGDIAPI_DEFINED
+#undef WINGDIAPI
+#endif
+
+#undef GLAPI
+/* #undef GLEWAPI */
+
+/***** END:THIS CODE WAS COPIED DIRECTLY FROM glew.h *****/
+
+#endif /* GPU_FUNCTIONS_H */
Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_extensions.c 2012-06-29 11:15:02 UTC (rev 48397)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_extensions.c 2012-06-29 11:16:17 UTC (rev 48398)
@@ -41,7 +41,7 @@
#include "BKE_global.h"
-#include <sys/time.h>
+//#include <sys/time.h> XXX: not found while compiling with MSVC8
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list