Skip to content

A
angle
Commit 83217796 by Geoff Lang
Options

Remove system.h.

The gyp files already define NOMINMAX and WIN32_LEAN_AND_MEAN. windows.h is also included via the D3D includes. This ends up speeding up the build process significantly by not having windows.h included in nearly every file. Also fixes issues on non-windows systems by not having stdarg.h included in debug.cpp. Change-Id: Id32d9aac37a5a29df832a062dd8024302a798a1c Reviewed-on: https://chromium-review.googlesource.com/183251Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent ab9d82cd
Showing with 24 additions and 84 deletions
projects/src/libEGL.vcxproj
......@@ -125,7 +125,6 @@
<ClInclude Include="..\..\src\common\RefCountObject.h"/>
<ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\utilities.h"/>
<ClInclude Include="..\..\src\common\system.h"/>
<ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\angleutils.h"/>
......
projects/src/libEGL.vcxproj.filters
......@@ -64,9 +64,6 @@
<ClCompile Include="..\..\src\common\event_tracer.cpp">
<Filter>common</Filter>
</ClCompile>
<ClInclude Include="..\..\src\common\system.h">
<Filter>common</Filter>
</ClInclude>
<ClCompile Include="..\..\src\common\RefCountObject.cpp">
<Filter>common</Filter>
</ClCompile>
......
projects/src/libGLESv2.vcxproj
......@@ -126,12 +126,12 @@
<ItemGroup>
<ClInclude Include="..\..\src\libGLESv2\resource.h"/>
<ClInclude Include="..\..\src\libGLESv2\Buffer.h"/>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h"/>
<ClInclude Include="..\..\src\libGLESv2\Shader.h"/>
<ClInclude Include="..\..\src\libGLESv2\BinaryStream.h"/>
<ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h"/>
<ClInclude Include="..\..\src\libGLESv2\queryconversions.h"/>
<ClInclude Include="..\..\src\libGLESv2\validationES3.h"/>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h"/>
<ClInclude Include="..\..\src\libGLESv2\Program.h"/>
<ClInclude Include="..\..\src\libGLESv2\Sampler.h"/>
<ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h"/>
......@@ -209,8 +209,6 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2darrayps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_2f.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_1ui.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h"/>
......@@ -224,14 +222,12 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3di11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2dui11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_2i.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2dps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_vs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough2d11vs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_2ui.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2dps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef3dps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h"/>
......@@ -242,8 +238,6 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2d11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_1i.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_1f.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3dui11ps.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11vs.h"/>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h"/>
......@@ -274,7 +268,6 @@
<ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\system.h"/>
<ClInclude Include="..\..\src\common\utilities.h"/>
<ClInclude Include="..\..\src\common\angleutils.h"/>
<ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h"/>
......@@ -301,10 +294,10 @@
<ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\validationES3.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\angletypes.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Texture.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Sampler.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\angletypes.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\copyimage.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp"/>
......
projects/src/libGLESv2.vcxproj.filters
......@@ -46,9 +46,6 @@
<ClInclude Include="..\..\src\libGLESv2\Buffer.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\Shader.h">
<Filter>libGLESv2</Filter>
</ClInclude>
......@@ -70,6 +67,9 @@
<ClInclude Include="..\..\src\libGLESv2\validationES3.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\Program.h">
<Filter>libGLESv2</Filter>
</ClInclude>
......@@ -175,9 +175,6 @@
<ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\angletypes.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\Texture.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
......@@ -196,6 +193,9 @@
<ClInclude Include="..\..\src\libGLESv2\formatutils.h">
<Filter>libGLESv2</Filter>
</ClInclude>
<ClCompile Include="..\..\src\libGLESv2\angletypes.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp">
<Filter>libGLESv2</Filter>
</ClCompile>
......@@ -484,12 +484,6 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_2f.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_1ui.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
......@@ -529,9 +523,6 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_2i.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2dps.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
......@@ -550,9 +541,6 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough2d11vs.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_2ui.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2dps.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
......@@ -583,12 +571,6 @@
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_1i.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_1f.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3dui11ps.h">
<Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
</ClInclude>
......@@ -748,9 +730,6 @@
<ClInclude Include="..\..\src\common\version.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\system.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\utilities.h">
<Filter>common</Filter>
</ClInclude>
......
projects/src/translator.vcxproj
......@@ -121,7 +121,6 @@
<ClInclude Include="..\..\src\common\mathutil.h"/>
<ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\system.h"/>
<ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\utilities.h"/>
......
projects/src/translator.vcxproj.filters
......@@ -49,9 +49,6 @@
<ClInclude Include="..\..\src\common\commit.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\system.h">
<Filter>common</Filter>
</ClInclude>
<ClCompile Include="..\..\src\common\utilities.cpp">
<Filter>common</Filter>
</ClCompile>
......
projects/src/translator_static.vcxproj
......@@ -121,7 +121,6 @@
<ClInclude Include="..\..\src\common\mathutil.h"/>
<ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\system.h"/>
<ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\utilities.h"/>
......
projects/src/translator_static.vcxproj.filters
......@@ -49,9 +49,6 @@
<ClInclude Include="..\..\src\common\commit.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\system.h">
<Filter>common</Filter>
</ClInclude>
<ClCompile Include="..\..\src\common\utilities.cpp">
<Filter>common</Filter>
</ClCompile>
......
src/common/debug.cpp
......@@ -7,7 +7,7 @@
// debug.cpp: Debugging utilities.
#include "common/debug.h"
#include "common/system.h"
#include <stdarg.h>
#if defined(ANGLE_ENABLE_PERF)
#include <d3d9.h>
......
src/common/mathutil.h
......@@ -9,10 +9,9 @@
#ifndef LIBGLESV2_MATHUTIL_H_
#define LIBGLESV2_MATHUTIL_H_
#include "common/system.h"
#include "common/debug.h"
#ifdef _WINDOWS_
#if defined(_WIN32)
#include <intrin.h>
#endif
......@@ -99,6 +98,7 @@ inline unsigned int unorm(float x)
inline bool supportsSSE2()
{
#if defined(_WIN32)
static bool checked = false;
static bool supports = false;
......@@ -120,6 +120,10 @@ inline bool supportsSSE2()
checked = true;
return supports;
#else
UNIMPLEMENTED();
return false;
#endif
}
template <typename destType, typename sourceType>
......
src/common/system.h deleted 100644 → 0
//
// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// system.h: Includes Windows system headers and undefines macros that conflict.
#ifndef COMMON_SYSTEM_H
#define COMMON_SYSTEM_H
#if defined(_WIN32)
#if !defined(WIN32_LEAN_AND_MEAN)
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#if defined(min)
#undef min
#endif
#if defined(max)
#undef max
#endif
#endif // _WIN32
#endif // COMMON_SYSTEM_H
src/common/utilities.cpp
......@@ -9,6 +9,10 @@
#include "common/utilities.h"
#include "common/mathutil.h"
#if defined(_WIN32)
#include <windows.h>
#endif
#include <set>
namespace gl
......@@ -432,6 +436,7 @@ bool IsTriangleMode(GLenum drawMode)
std::string getTempPath()
{
#if defined (_WIN32)
char path[MAX_PATH];
DWORD pathLen = GetTempPathA(sizeof(path) / sizeof(path[0]), path);
if (pathLen == 0)
......@@ -448,6 +453,10 @@ std::string getTempPath()
}
return path;
#else
UNIMPLEMENTED();
return "";
#endif
}
void writeFile(const char* path, const void* content, size_t size)
......
src/libEGL/Display.h
......@@ -11,8 +11,6 @@
#ifndef LIBEGL_DISPLAY_H_
#define LIBEGL_DISPLAY_H_
#include "common/system.h"
#include <set>
#include <vector>
......
src/libGLESv2/main.h
......@@ -10,7 +10,6 @@
#define LIBGLESV2_MAIN_H_
#include "common/debug.h"
#include "common/system.h"
namespace egl
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment