Revision: 24733
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24733
Author: dfelinto
Date: 2009-11-21 21:36:03 +0100 (Sat, 21 Nov 2009)
Log Message:
-----------
patch [#19796] GLEW update by Mitchell Stokes (Moguri)
GLEW update to version 1.5.1 [11-03-08]
this opens room for Geometry Shader support.
* - Brecht, Campbell told me you did some local changes in order to make it
right in Linux. I get to you in order to know what those changes are (or feel
free to commit them directly)
Modified Paths:
--------------
trunk/blender/extern/glew/CMakeLists.txt
trunk/blender/extern/glew/SConscript
trunk/blender/extern/glew/include/GL/glew.h
trunk/blender/extern/glew/include/GL/glxew.h
trunk/blender/extern/glew/include/GL/wglew.h
trunk/blender/extern/glew/src/glew.c
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/editors/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/SConscript
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/gpu/SConscript
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/blender/windowmanager/SConscript
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/SConscript
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/Rasterizer/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
trunk/blender/source/gameengine/Rasterizer/SConscript
Modified: trunk/blender/extern/glew/CMakeLists.txt
===================================================================
--- trunk/blender/extern/glew/CMakeLists.txt 2009-11-21 19:49:11 UTC (rev
24732)
+++ trunk/blender/extern/glew/CMakeLists.txt 2009-11-21 20:36:03 UTC (rev
24733)
@@ -34,5 +34,7 @@
src/glew.c
)
+ADD_DEFINITIONS(-DGLEW_STATIC)
+
BLENDERLIB(extern_glew "${SRC}" "${INC}")
Modified: trunk/blender/extern/glew/SConscript
===================================================================
--- trunk/blender/extern/glew/SConscript 2009-11-21 19:49:11 UTC (rev
24732)
+++ trunk/blender/extern/glew/SConscript 2009-11-21 20:36:03 UTC (rev
24733)
@@ -6,7 +6,7 @@
sources = ['src/glew.c']
-defs = ''
+defs = 'GLEW_STATIC'
incs = 'include'
env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs),
libtype=['extern','player'], priority=[50,230])
Modified: trunk/blender/extern/glew/include/GL/glew.h
===================================================================
--- trunk/blender/extern/glew/include/GL/glew.h 2009-11-21 19:49:11 UTC (rev
24732)
+++ trunk/blender/extern/glew/include/GL/glew.h 2009-11-21 20:36:03 UTC (rev
24733)
@@ -1,7 +1,7 @@
/*
** The OpenGL Extension Wrangler Library
-** Copyright (C) 2002-2006, Milan Ikits <milan ikits[]ieee org>
-** Copyright (C) 2002-2006, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
** Copyright (C) 2002, Lev Povalahev
** All rights reserved.
**
@@ -30,40 +30,52 @@
*/
/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * Mesa 3-D graphics library
+ * Version: 7.0
+ *
+ * Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
**
-** http://oss.sgi.com/projects/FreeB
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
*/
-#define BLENDER_CHANGES
-
-#ifdef BLENDER_CHANGES
-#define GLEW_STATIC
-#endif
-
#ifndef __glew_h__
#define __glew_h__
#define __GLEW_H__
@@ -84,7 +96,7 @@
#define __GLEXT_H_
#define __gl_ATI_h_
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(_WIN32)
/*
* GLEW does not include <windows.h> to avoid name space pollution.
@@ -94,7 +106,7 @@
/* <windef.h> */
#ifndef APIENTRY
#define GLEW_APIENTRY_DEFINED
-# if defined(__CYGWIN__) || defined(__MINGW32__)
+# if defined(__MINGW32__)
# define APIENTRY __stdcall
# elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) ||
defined(__BORLANDC__)
# define APIENTRY __stdcall
@@ -103,14 +115,14 @@
# endif
#endif
#ifndef GLAPI
-# if defined(__CYGWIN__) || defined(__MINGW32__)
+# if defined(__MINGW32__)
# define GLAPI extern
# endif
#endif
/* <winnt.h> */
#ifndef CALLBACK
#define GLEW_CALLBACK_DEFINED
-# if defined(__CYGWIN__) || defined(__MINGW32__)
+# if defined(__MINGW32__)
# define CALLBACK __attribute__ ((__stdcall__))
# elif (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) ||
defined(_M_PPC)) && !defined(MIDL_PASS)
# define CALLBACK __stdcall
@@ -130,7 +142,7 @@
#endif
/* <stddef.h> */
#if !defined(_W64)
-# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >=
1300
+# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) &&
defined(_MSC_VER) && _MSC_VER >= 1300
# define _W64 __w64
# else
# define _W64
@@ -147,7 +159,7 @@
#endif
#ifndef GLAPI
-# if defined(__CYGWIN__) || defined(__MINGW32__)
+# if defined(__MINGW32__)
# define GLAPI extern
# else
# define GLAPI WINGDIAPI
@@ -184,6 +196,7 @@
*/
#include <stddef.h>
+#include <stdint.h>
#define GLEW_APIENTRY_DEFINED
#define APIENTRY
@@ -208,29 +221,37 @@
#ifndef GL_VERSION_1_1
#define GL_VERSION_1_1 1
-#if defined(__APPLE__) && !defined(__LP64__)
-typedef unsigned long GLenum;
-typedef unsigned long GLbitfield;
-typedef unsigned long GLuint;
-typedef long GLint;
-typedef long GLsizei;
-#else
typedef unsigned int GLenum;
typedef unsigned int GLbitfield;
typedef unsigned int GLuint;
typedef int GLint;
typedef int GLsizei;
-#endif
typedef unsigned char GLboolean;
typedef signed char GLbyte;
typedef short GLshort;
typedef unsigned char GLubyte;
typedef unsigned short GLushort;
+typedef unsigned long GLulong;
typedef float GLfloat;
typedef float GLclampf;
typedef double GLdouble;
typedef double GLclampd;
typedef void GLvoid;
+#if defined(_MSC_VER)
+# if _MSC_VER < 1400
+typedef __int64 GLint64EXT;
+typedef unsigned __int64 GLuint64EXT;
+# else
+typedef signed long long GLint64EXT;
+typedef unsigned long long GLuint64EXT;
+# endif
+#else
+# if defined(__MINGW32__)
+#include <inttypes.h>
+# endif
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif
#define GL_ACCUM 0x0100
#define GL_LOAD 0x0101
@@ -1435,6 +1456,8 @@
typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, GLsizei
*count, GLenum type, const GLvoid **indices, GLsizei primcount);
typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat
param);
typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVPROC) (GLenum pname, GLfloat
*params);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint
param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVPROC) (GLenum pname, GLint
*params);
typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte
green, GLbyte blue);
typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble
green, GLdouble blue);
@@ -1481,6 +1504,8 @@
#define glMultiDrawElements GLEW_GET_FUN(__glewMultiDrawElements)
#define glPointParameterf GLEW_GET_FUN(__glewPointParameterf)
#define glPointParameterfv GLEW_GET_FUN(__glewPointParameterfv)
+#define glPointParameteri GLEW_GET_FUN(__glewPointParameteri)
+#define glPointParameteriv GLEW_GET_FUN(__glewPointParameteriv)
#define glSecondaryColor3b GLEW_GET_FUN(__glewSecondaryColor3b)
#define glSecondaryColor3bv GLEW_GET_FUN(__glewSecondaryColor3bv)
#define glSecondaryColor3d GLEW_GET_FUN(__glewSecondaryColor3d)
@@ -1735,7 +1760,7 @@
typedef void (GLAPIENTRY * PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei
bufSize, GLsizei* length, GLchar* infoLog);
typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEPROC) (GLint obj, GLsizei
maxLength, GLsizei* length, GLchar* source);
typedef void (GLAPIENTRY * PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname,
GLint* param);
-typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLint programObj,
const GLchar* name);
+typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLuint program,
const GLchar* name);
typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVPROC) (GLuint program, GLint
location, GLfloat* params);
typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVPROC) (GLuint program, GLint
location, GLint* params);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
