From 0ebc94d2362222e690d0a72a27858461c5605264 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 4 Jun 2008 10:04:31 -0600 Subject: egl: added OpenGL ES 2.0 header files in new GLES2 directory --- include/GLES2/gl2platform.h | 72 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 include/GLES2/gl2platform.h (limited to 'include/GLES2/gl2platform.h') diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h new file mode 100644 index 0000000000..62798c34fe --- /dev/null +++ b/include/GLES2/gl2platform.h @@ -0,0 +1,72 @@ +#ifndef __gl2platform_h_ +#define __gl2platform_h_ + +/* $Id: gl2platform.h 4532 2007-11-26 11:12:44Z markc $ */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* +** 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.0 (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: +** +** http://oss.sgi.com/projects/FreeB +** +** 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. +** +** 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: The application programming interfaces +** established by SGI in conjunction with the Original Code are The +** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released +** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version +** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X +** Window System(R) (Version 1.3), released October 19, 1998. 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. +*/ + +/*------------------------------------------------------------------------- + * Definition of GL_APICALL and GL_APIENTRY + *-----------------------------------------------------------------------*/ + +#if defined(_WIN32) || defined(__VC32__) /* Win32 */ +# if defined (_DLL_EXPORTS) +# define GL_APICALL __declspec(dllexport) +# else +# define GL_APICALL __declspec(dllimport) +# endif +#elif defined (__ARMCC_VERSION) /* ADS */ +# define GL_APICALL +#elif defined (__SYMBIAN32__) && defined (__GCC32__) /* Symbian GCC */ +# define GL_APICALL __declspec(dllexport) +#elif defined (__GNUC__) /* GCC dependencies (kludge) */ +# define GL_APICALL +#endif + +#if !defined (GL_APICALL) +# error Unsupported platform! +#endif + +#define GL_APIENTRY + +#ifdef __cplusplus +} +#endif + +#endif /* __gl2platform_h_ */ -- cgit v1.2.3 From b028b0cc533b4e10cdf599e49731e3c30fb0e366 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Fri, 27 Jun 2008 07:13:30 -0600 Subject: egl: Windows updates to the platform.h files --- include/GLES/glplatform.h | 3 +-- include/GLES2/gl2platform.h | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 15 deletions(-) (limited to 'include/GLES2/gl2platform.h') diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h index afbec74ea5..5ce0cbe84a 100644 --- a/include/GLES/glplatform.h +++ b/include/GLES/glplatform.h @@ -45,14 +45,13 @@ extern "C" { * Definition of GL_API and GL_APIENTRY *-----------------------------------------------------------------------*/ -#define __GL_EXPORTS - #ifdef _WIN32 # ifdef __GL_EXPORTS # define GL_API __declspec(dllexport) # else # define GL_API __declspec(dllimport) # endif +# define GLAPIENTRY __stdcall #else # ifdef __GL_EXPORTS # define GL_API diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h index 62798c34fe..077571e4ea 100644 --- a/include/GLES2/gl2platform.h +++ b/include/GLES2/gl2platform.h @@ -45,25 +45,22 @@ extern "C" { * Definition of GL_APICALL and GL_APIENTRY *-----------------------------------------------------------------------*/ -#if defined(_WIN32) || defined(__VC32__) /* Win32 */ -# if defined (_DLL_EXPORTS) +#ifdef _WIN32 +# ifdef __GL_EXPORTS # define GL_APICALL __declspec(dllexport) # else # define GL_APICALL __declspec(dllimport) # endif -#elif defined (__ARMCC_VERSION) /* ADS */ -# define GL_APICALL -#elif defined (__SYMBIAN32__) && defined (__GCC32__) /* Symbian GCC */ -# define GL_APICALL __declspec(dllexport) -#elif defined (__GNUC__) /* GCC dependencies (kludge) */ -# define GL_APICALL -#endif - -#if !defined (GL_APICALL) -# error Unsupported platform! +# define GLAPIENTRY __stdcall +#else +# ifdef __GL_EXPORTS +# define GL_APICALL +# else +# define GL_APICALL extern +# endif #endif -#define GL_APIENTRY +#define GL_APIENTRY #ifdef __cplusplus } -- cgit v1.2.3 From 810888f6564a1421f82190fbb8766ad8c79d88b7 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Mon, 30 Jun 2008 12:49:14 +0900 Subject: gles: Don't define GLAPIENTRY here. --- include/GLES/glplatform.h | 1 - include/GLES2/gl2platform.h | 1 - 2 files changed, 2 deletions(-) (limited to 'include/GLES2/gl2platform.h') diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h index 5ce0cbe84a..543464ba6f 100644 --- a/include/GLES/glplatform.h +++ b/include/GLES/glplatform.h @@ -51,7 +51,6 @@ extern "C" { # else # define GL_API __declspec(dllimport) # endif -# define GLAPIENTRY __stdcall #else # ifdef __GL_EXPORTS # define GL_API diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h index 077571e4ea..7c3a22e43e 100644 --- a/include/GLES2/gl2platform.h +++ b/include/GLES2/gl2platform.h @@ -51,7 +51,6 @@ extern "C" { # else # define GL_APICALL __declspec(dllimport) # endif -# define GLAPIENTRY __stdcall #else # ifdef __GL_EXPORTS # define GL_APICALL -- cgit v1.2.3 From f4caddd66f46f69ee34b1790ef1c2f549b186d2f Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Mon, 7 Jul 2008 17:56:09 -0600 Subject: egl: updated GL_APIENTRY for Windows --- include/GLES/glplatform.h | 3 ++- include/GLES2/gl2platform.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'include/GLES2/gl2platform.h') diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h index 543464ba6f..dbbf2b9194 100644 --- a/include/GLES/glplatform.h +++ b/include/GLES/glplatform.h @@ -51,15 +51,16 @@ extern "C" { # else # define GL_API __declspec(dllimport) # endif +# define GL_APIENTRY __stdcall #else # ifdef __GL_EXPORTS # define GL_API # else # define GL_API extern # endif +# define GL_APIENTRY #endif -#define GL_APIENTRY #ifndef APIENTRY # define APIENTRY GL_APIENTRY diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h index 7c3a22e43e..348daea765 100644 --- a/include/GLES2/gl2platform.h +++ b/include/GLES2/gl2platform.h @@ -51,15 +51,16 @@ extern "C" { # else # define GL_APICALL __declspec(dllimport) # endif +# define GL_APIENTRY __stdcall #else # ifdef __GL_EXPORTS # define GL_APICALL # else # define GL_APICALL extern # endif +# define GL_APIENTRY #endif -#define GL_APIENTRY #ifdef __cplusplus } -- cgit v1.2.3 From e4f3770690129dc1ea683fadbe07f1fbc49cf271 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Wed, 16 Jul 2008 16:10:57 -0600 Subject: mesa: WinCE fixes --- include/GL/gl.h | 2 +- include/GLES/glplatform.h | 6 +++++- include/GLES2/gl2platform.h | 6 +++++- scons/gallium.py | 8 ++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) (limited to 'include/GLES2/gl2platform.h') diff --git a/include/GL/gl.h b/include/GL/gl.h index c0cebec2ef..c9ef6136fa 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -58,7 +58,7 @@ # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern # endif /* _STATIC_MESA support */ -# if defined(__MINGW32__) && defined(GL_NO_STDCALL) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */ +# if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */ # define GLAPIENTRY # else # define GLAPIENTRY __stdcall diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h index dbbf2b9194..6e725b18a9 100644 --- a/include/GLES/glplatform.h +++ b/include/GLES/glplatform.h @@ -51,7 +51,11 @@ extern "C" { # else # define GL_API __declspec(dllimport) # endif -# define GL_APIENTRY __stdcall +# ifdef UNDER_CE +# define GL_APIENTRY +# else +# define GL_APIENTRY __stdcall +# endif #else # ifdef __GL_EXPORTS # define GL_API diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h index 348daea765..7891a61ed7 100644 --- a/include/GLES2/gl2platform.h +++ b/include/GLES2/gl2platform.h @@ -51,7 +51,11 @@ extern "C" { # else # define GL_APICALL __declspec(dllimport) # endif -# define GL_APIENTRY __stdcall +# ifdef UNDER_CE +# define GL_APIENTRY +# else +# define GL_APIENTRY __stdcall +# endif #else # ifdef __GL_EXPORTS # define GL_APICALL diff --git a/scons/gallium.py b/scons/gallium.py index 62030f0ab7..75225c97c7 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -338,6 +338,7 @@ def generate(env): if platform == 'wince': # See also C:\WINCE600\public\common\oak\misc\makefile.def cflags += [ + '/Zl', # omit default library name in .OBJ '/GF', # enable read-only string pooling '/GR-', # disable C++ RTTI '/GS', # enable security checks @@ -400,6 +401,13 @@ def generate(env): '/entry:DrvEnableDriver', ] + if platform == 'wince': + linkflags += [ + '/nodefaultlib', +# '/incremental:no', +# '/fullbuild', + '/entry:_DllMainCRTStartup', + ] if env['profile']: linkflags += [ '/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx -- cgit v1.2.3 From 8c092def6c8f59048341c585af9b752bfa1f0236 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Sun, 31 Aug 2008 17:43:20 +0900 Subject: Remove CVS keywords. Please remove CVS keywords when importing third-party code into the git repository. --- include/GLES/gl.h | 1 - include/GLES/glext.h | 1 - include/GLES/glplatform.h | 1 - include/GLES2/gl2.h | 1 - include/GLES2/gl2ext.h | 1 - include/GLES2/gl2platform.h | 1 - 6 files changed, 6 deletions(-) (limited to 'include/GLES2/gl2platform.h') diff --git a/include/GLES/gl.h b/include/GLES/gl.h index 76cc947983..8ffcdc1db3 100644 --- a/include/GLES/gl.h +++ b/include/GLES/gl.h @@ -1,7 +1,6 @@ #ifndef __gl_h_ #define __gl_h_ -/* $Id: gl.h 4533 2007-11-26 11:19:35Z markc $ */ #include diff --git a/include/GLES/glext.h b/include/GLES/glext.h index 4de33bc8b8..a55829489d 100644 --- a/include/GLES/glext.h +++ b/include/GLES/glext.h @@ -1,7 +1,6 @@ #ifndef __glext_h_ #define __glext_h_ -/* $Id: glext.h 5687 2008-05-13 21:31:32Z oddhack $ */ #ifdef __cplusplus extern "C" { diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h index 6e725b18a9..7c8392bfcb 100644 --- a/include/GLES/glplatform.h +++ b/include/GLES/glplatform.h @@ -1,7 +1,6 @@ #ifndef __glplatform_h_ #define __glplatform_h_ -/* $Id: glplatform.h 4585 2007-11-30 09:49:39Z markc $ */ #ifdef __cplusplus extern "C" { diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h index 6466170be5..5ce939c7b9 100644 --- a/include/GLES2/gl2.h +++ b/include/GLES2/gl2.h @@ -1,7 +1,6 @@ #ifndef __gl2_h_ #define __gl2_h_ -/* $Id: gl2.h 5418 2008-03-26 19:57:12Z oddhack $ */ #include diff --git a/include/GLES2/gl2ext.h b/include/GLES2/gl2ext.h index 04418c1434..305b29b630 100644 --- a/include/GLES2/gl2ext.h +++ b/include/GLES2/gl2ext.h @@ -1,7 +1,6 @@ #ifndef __gl2ext_h_ #define __gl2ext_h_ -/* $Id: gl2ext.h 5767 2008-06-02 17:44:20Z benj $ */ #ifdef __cplusplus extern "C" { diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h index 7891a61ed7..7e3dbc64b4 100644 --- a/include/GLES2/gl2platform.h +++ b/include/GLES2/gl2platform.h @@ -1,7 +1,6 @@ #ifndef __gl2platform_h_ #define __gl2platform_h_ -/* $Id: gl2platform.h 4532 2007-11-26 11:12:44Z markc $ */ #ifdef __cplusplus extern "C" { -- cgit v1.2.3