diff options
author | Geoff Lang <geofflang@chromium.org> | 2014-05-27 16:10:46 -0400 |
---|---|---|
committer | Geoff Lang <geofflang@chromium.org> | 2014-05-29 15:07:10 +0000 |
commit | d7e7d735ec75a6b0ff855447b20691c7fbb6c97e (patch) | |
tree | cea538ecef141402d6f58c4fd2394541b6b18041 | |
parent | 13b0d70ac731edd588a1dacadcbf724650fc5278 (diff) | |
download | angle-d7e7d735ec75a6b0ff855447b20691c7fbb6c97e.tar.gz |
Move the GL_APICALL and similar defines to the project level.
BUG=angle:658
Change-Id: Ib4fa10bb89a6658efbc20d5a763d8ec9c3a5506f
Reviewed-on: https://chromium-review.googlesource.com/201465
Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
-rw-r--r-- | projects/src/libEGL.vcxproj | 8 | ||||
-rw-r--r-- | projects/src/libGLESv2.vcxproj | 8 | ||||
-rw-r--r-- | src/common/RefCountObject.h | 1 | ||||
-rw-r--r-- | src/common/blocklayout.h | 1 | ||||
-rw-r--r-- | src/common/shadervars.h | 1 | ||||
-rw-r--r-- | src/common/utilities.h | 3 | ||||
-rw-r--r-- | src/compiler/translator/OutputHLSL.h | 1 | ||||
-rw-r--r-- | src/libEGL.gypi | 6 | ||||
-rw-r--r-- | src/libGLESv2.gypi | 6 | ||||
-rw-r--r-- | src/libGLESv2/Context.h | 4 | ||||
-rw-r--r-- | src/libGLESv2/HandleAllocator.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/ProgramBinary.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/Query.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/Renderbuffer.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/ResourceManager.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/Shader.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/Texture.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/TransformFeedback.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/Uniform.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/formatutils.h | 1 | ||||
-rw-r--r-- | src/libGLESv2/precompiled.h | 3 |
21 files changed, 20 insertions, 32 deletions
diff --git a/projects/src/libEGL.vcxproj b/projects/src/libEGL.vcxproj index 7baacc59..61a27abb 100644 --- a/projects/src/libEGL.vcxproj +++ b/projects/src/libEGL.vcxproj @@ -46,7 +46,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <MinimalRebuild>false</MinimalRebuild> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> @@ -70,7 +70,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> - <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -83,7 +83,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <MinimalRebuild>false</MinimalRebuild> <Optimization>MaxSpeed</Optimization> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> @@ -107,7 +107,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> - <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/projects/src/libGLESv2.vcxproj b/projects/src/libGLESv2.vcxproj index 8265f990..f817c9b5 100644 --- a/projects/src/libGLESv2.vcxproj +++ b/projects/src/libGLESv2.vcxproj @@ -46,7 +46,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <MinimalRebuild>false</MinimalRebuild> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> @@ -70,7 +70,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> - <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -83,7 +83,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <MinimalRebuild>false</MinimalRebuild> <Optimization>MaxSpeed</Optimization> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> @@ -107,7 +107,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> - <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/src/common/RefCountObject.h b/src/common/RefCountObject.h index f1fa8d24..88b63931 100644 --- a/src/common/RefCountObject.h +++ b/src/common/RefCountObject.h @@ -14,7 +14,6 @@ #include <cstddef> -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/common/blocklayout.h b/src/common/blocklayout.h index a9dca60a..e6ffff1a 100644 --- a/src/common/blocklayout.h +++ b/src/common/blocklayout.h @@ -11,7 +11,6 @@ #define COMMON_BLOCKLAYOUT_H_ #include <vector> -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> #include <GLSLANG/ShaderLang.h> diff --git a/src/common/shadervars.h b/src/common/shadervars.h index 576060c6..99187a0d 100644 --- a/src/common/shadervars.h +++ b/src/common/shadervars.h @@ -14,7 +14,6 @@ #include <vector> #include <algorithm> -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/common/utilities.h b/src/common/utilities.h index d6e09bbe..f69e33a7 100644 --- a/src/common/utilities.h +++ b/src/common/utilities.h @@ -9,9 +9,6 @@ #ifndef LIBGLESV2_UTILITIES_H #define LIBGLESV2_UTILITIES_H -#ifndef GL_APICALL -#define GL_APICALL -#endif #include <GLES3/gl3.h> #include <GLES3/gl3ext.h> #include <GLES2/gl2.h> diff --git a/src/compiler/translator/OutputHLSL.h b/src/compiler/translator/OutputHLSL.h index ad42f2dc..55d6441b 100644 --- a/src/compiler/translator/OutputHLSL.h +++ b/src/compiler/translator/OutputHLSL.h @@ -11,7 +11,6 @@ #include <set> #include <map> -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/libEGL.gypi b/src/libEGL.gypi index bd638ecb..f5def3ff 100644 --- a/src/libEGL.gypi +++ b/src/libEGL.gypi @@ -25,6 +25,12 @@ -dirs common libEGL ../include \ -types *.cpp *.h *.def *.rc)', ], + 'defines': + [ + 'GL_APICALL=', + 'GL_GLEXT_PROTOTYPES=', + 'EGLAPI=', + ], 'includes': [ '../build/common_defines.gypi', ], 'msvs_settings': { diff --git a/src/libGLESv2.gypi b/src/libGLESv2.gypi index 704587cc..b2dce122 100644 --- a/src/libGLESv2.gypi +++ b/src/libGLESv2.gypi @@ -40,6 +40,12 @@ -types *.cpp *.h *.hlsl *.vs *.ps *.bat *.def *.rc \ -excludes */d3d/* */d3d9/* */d3d11/*)', ], + 'defines': + [ + 'GL_APICALL=', + 'GL_GLEXT_PROTOTYPES=', + 'EGLAPI=', + ], 'conditions': [ ['angle_enable_d3d9==1', diff --git a/src/libGLESv2/Context.h b/src/libGLESv2/Context.h index 367f1ec3..b3c8a3fc 100644 --- a/src/libGLESv2/Context.h +++ b/src/libGLESv2/Context.h @@ -10,14 +10,10 @@ #ifndef LIBGLESV2_CONTEXT_H_ #define LIBGLESV2_CONTEXT_H_ -#ifndef GL_APICALL -#define GL_APICALL -#endif #include <GLES3/gl3.h> #include <GLES3/gl3ext.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#define EGLAPI #include <EGL/egl.h> #include <string> diff --git a/src/libGLESv2/HandleAllocator.h b/src/libGLESv2/HandleAllocator.h index 43845697..e23010d9 100644 --- a/src/libGLESv2/HandleAllocator.h +++ b/src/libGLESv2/HandleAllocator.h @@ -10,7 +10,6 @@ #ifndef LIBGLESV2_HANDLEALLOCATOR_H_ #define LIBGLESV2_HANDLEALLOCATOR_H_ -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h index 0d36e97f..839923b6 100644 --- a/src/libGLESv2/ProgramBinary.h +++ b/src/libGLESv2/ProgramBinary.h @@ -10,7 +10,6 @@ #ifndef LIBGLESV2_PROGRAM_BINARY_H_ #define LIBGLESV2_PROGRAM_BINARY_H_ -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES3/gl3ext.h> #include <GLES2/gl2.h> diff --git a/src/libGLESv2/Query.h b/src/libGLESv2/Query.h index a863402f..4eb236f1 100644 --- a/src/libGLESv2/Query.h +++ b/src/libGLESv2/Query.h @@ -9,7 +9,6 @@ #ifndef LIBGLESV2_QUERY_H_ #define LIBGLESV2_QUERY_H_ -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/libGLESv2/Renderbuffer.h b/src/libGLESv2/Renderbuffer.h index 0220638c..969232b1 100644 --- a/src/libGLESv2/Renderbuffer.h +++ b/src/libGLESv2/Renderbuffer.h @@ -12,7 +12,6 @@ #ifndef LIBGLESV2_RENDERBUFFER_H_ #define LIBGLESV2_RENDERBUFFER_H_ -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/libGLESv2/ResourceManager.h b/src/libGLESv2/ResourceManager.h index 3bd6cad6..85e6b4bc 100644 --- a/src/libGLESv2/ResourceManager.h +++ b/src/libGLESv2/ResourceManager.h @@ -10,7 +10,6 @@ #ifndef LIBGLESV2_RESOURCEMANAGER_H_ #define LIBGLESV2_RESOURCEMANAGER_H_ -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/libGLESv2/Shader.h b/src/libGLESv2/Shader.h index c04cf75f..a4189499 100644 --- a/src/libGLESv2/Shader.h +++ b/src/libGLESv2/Shader.h @@ -12,7 +12,6 @@ #ifndef LIBGLESV2_SHADER_H_ #define LIBGLESV2_SHADER_H_ -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> #include <string> diff --git a/src/libGLESv2/Texture.h b/src/libGLESv2/Texture.h index fa88709a..a44a7019 100644 --- a/src/libGLESv2/Texture.h +++ b/src/libGLESv2/Texture.h @@ -13,7 +13,6 @@ #include <vector> -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/libGLESv2/TransformFeedback.h b/src/libGLESv2/TransformFeedback.h index e3bac282..183873c8 100644 --- a/src/libGLESv2/TransformFeedback.h +++ b/src/libGLESv2/TransformFeedback.h @@ -10,7 +10,6 @@ #include "common/angleutils.h" #include "common/RefCountObject.h" -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/libGLESv2/Uniform.h b/src/libGLESv2/Uniform.h index 9e35157d..221ba48f 100644 --- a/src/libGLESv2/Uniform.h +++ b/src/libGLESv2/Uniform.h @@ -10,7 +10,6 @@ #include <string> #include <vector> -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> diff --git a/src/libGLESv2/formatutils.h b/src/libGLESv2/formatutils.h index 3b778ef2..004c8eda 100644 --- a/src/libGLESv2/formatutils.h +++ b/src/libGLESv2/formatutils.h @@ -9,7 +9,6 @@ #ifndef LIBGLESV2_FORMATUTILS_H_ #define LIBGLESV2_FORMATUTILS_H_ -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> diff --git a/src/libGLESv2/precompiled.h b/src/libGLESv2/precompiled.h index 1d078138..3bc66a1d 100644 --- a/src/libGLESv2/precompiled.h +++ b/src/libGLESv2/precompiled.h @@ -6,15 +6,12 @@ // precompiled.h: Precompiled header file for libGLESv2. -#define GL_APICALL #include <GLES3/gl3.h> #include <GLES3/gl3ext.h> #include <GLES2/gl2.h> -#define GL_GLEXT_PROTOTYPES #include <GLES2/gl2ext.h> -#define EGLAPI #include <EGL/egl.h> #include <assert.h> |