Skip to content

A
angle
Commit 5704d6e8 by Jamie Madill
Options

Add some shared utility methods to the utils project.

BUG=angle:730 Change-Id: I268c7f76ee9a14ab82f646ae8ebf4eed100bf86d Reviewed-on: https://chromium-review.googlesource.com/213509Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 62af5467
Showing with 50 additions and 35 deletions
projects/samples/sample_util.vcxproj
...@@ -201,9 +201,8 @@ ...@@ -201,9 +201,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\samples\angle\sample_util\Vector.h"/> <ClInclude Include="..\..\samples\angle\sample_util\Vector.h"/>
<ClInclude Include="..\..\samples\angle\sample_util\Matrix.h"/>
<ClInclude Include="..\..\samples\angle\sample_util\shader_utils.h"/>
<ClInclude Include="..\..\samples\angle\sample_util\geometry_utils.h"/> <ClInclude Include="..\..\samples\angle\sample_util\geometry_utils.h"/>
<ClInclude Include="..\..\samples\angle\sample_util\Matrix.h"/>
<ClInclude Include="..\..\samples\angle\sample_util\random_utils.h"/> <ClInclude Include="..\..\samples\angle\sample_util\random_utils.h"/>
<ClInclude Include="..\..\samples\angle\sample_util\tga_utils.h"/> <ClInclude Include="..\..\samples\angle\sample_util\tga_utils.h"/>
<ClInclude Include="..\..\samples\angle\sample_util\SampleApplication.h"/> <ClInclude Include="..\..\samples\angle\sample_util\SampleApplication.h"/>
...@@ -211,11 +210,10 @@ ...@@ -211,11 +210,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\samples\angle\sample_util\texture_utils.cpp"/> <ClCompile Include="..\..\samples\angle\sample_util\texture_utils.cpp"/>
<ClCompile Include="..\..\samples\angle\sample_util\tga_utils.cpp"/>
<ClCompile Include="..\..\samples\angle\sample_util\shader_utils.cpp"/>
<ClCompile Include="..\..\samples\angle\sample_util\SampleApplication.cpp"/> <ClCompile Include="..\..\samples\angle\sample_util\SampleApplication.cpp"/>
<ClCompile Include="..\..\samples\angle\sample_util\geometry_utils.cpp"/> <ClCompile Include="..\..\samples\angle\sample_util\geometry_utils.cpp"/>
<ClCompile Include="..\..\samples\angle\sample_util\Vector.cpp"/> <ClCompile Include="..\..\samples\angle\sample_util\Vector.cpp"/>
<ClCompile Include="..\..\samples\angle\sample_util\tga_utils.cpp"/>
<ClCompile Include="..\..\samples\angle\sample_util\random_utils.cpp"/> <ClCompile Include="..\..\samples\angle\sample_util\random_utils.cpp"/>
<ClCompile Include="..\..\samples\angle\sample_util\Matrix.cpp"/> <ClCompile Include="..\..\samples\angle\sample_util\Matrix.cpp"/>
</ItemGroup> </ItemGroup>
......
projects/samples/sample_util.vcxproj.filters
...@@ -13,36 +13,30 @@ ...@@ -13,36 +13,30 @@
<ClInclude Include="..\..\samples\angle\sample_util\Vector.h"> <ClInclude Include="..\..\samples\angle\sample_util\Vector.h">
<Filter>angle\sample_util</Filter> <Filter>angle\sample_util</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\samples\angle\sample_util\texture_utils.cpp"> <ClInclude Include="..\..\samples\angle\sample_util\geometry_utils.h">
<Filter>angle\sample_util</Filter>
</ClCompile>
<ClInclude Include="..\..\samples\angle\sample_util\Matrix.h">
<Filter>angle\sample_util</Filter> <Filter>angle\sample_util</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\samples\angle\sample_util\tga_utils.cpp"> <ClCompile Include="..\..\samples\angle\sample_util\texture_utils.cpp">
<Filter>angle\sample_util</Filter> <Filter>angle\sample_util</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\samples\angle\sample_util\shader_utils.h"> <ClCompile Include="..\..\samples\angle\sample_util\SampleApplication.cpp">
<Filter>angle\sample_util</Filter>
</ClInclude>
<ClCompile Include="..\..\samples\angle\sample_util\shader_utils.cpp">
<Filter>angle\sample_util</Filter> <Filter>angle\sample_util</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\samples\angle\sample_util\geometry_utils.h"> <ClInclude Include="..\..\samples\angle\sample_util\Matrix.h">
<Filter>angle\sample_util</Filter> <Filter>angle\sample_util</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\samples\angle\sample_util\SampleApplication.cpp"> <ClInclude Include="..\..\samples\angle\sample_util\random_utils.h">
<Filter>angle\sample_util</Filter> <Filter>angle\sample_util</Filter>
</ClCompile> </ClInclude>
<ClCompile Include="..\..\samples\angle\sample_util\geometry_utils.cpp"> <ClCompile Include="..\..\samples\angle\sample_util\geometry_utils.cpp">
<Filter>angle\sample_util</Filter> <Filter>angle\sample_util</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\samples\angle\sample_util\random_utils.h">
<Filter>angle\sample_util</Filter>
</ClInclude>
<ClCompile Include="..\..\samples\angle\sample_util\Vector.cpp"> <ClCompile Include="..\..\samples\angle\sample_util\Vector.cpp">
<Filter>angle\sample_util</Filter> <Filter>angle\sample_util</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\samples\angle\sample_util\tga_utils.cpp">
<Filter>angle\sample_util</Filter>
</ClCompile>
<ClInclude Include="..\..\samples\angle\sample_util\tga_utils.h"> <ClInclude Include="..\..\samples\angle\sample_util\tga_utils.h">
<Filter>angle\sample_util</Filter> <Filter>angle\sample_util</Filter>
</ClInclude> </ClInclude>
......
projects/util/angle_util.vcxproj
...@@ -201,16 +201,19 @@ ...@@ -201,16 +201,19 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\util\mouse.h"/> <ClInclude Include="..\..\util\mouse.h"/>
<ClInclude Include="..\..\util\shared_utils.h"/>
<ClInclude Include="..\..\util\Timer.h"/> <ClInclude Include="..\..\util\Timer.h"/>
<ClInclude Include="..\..\util\EGLWindow.h"/> <ClInclude Include="..\..\util\EGLWindow.h"/>
<ClInclude Include="..\..\util\OSWindow.h"/>
<ClInclude Include="..\..\util\Event.h"/>
<ClInclude Include="..\..\util\path_utils.h"/> <ClInclude Include="..\..\util\path_utils.h"/>
<ClInclude Include="..\..\util\shader_utils.h"/>
<ClInclude Include="..\..\util\OSWindow.h"/>
<ClInclude Include="..\..\util\keyboard.h"/> <ClInclude Include="..\..\util\keyboard.h"/>
<ClInclude Include="..\..\util\win32\Win32Timer.h"/> <ClInclude Include="..\..\util\Event.h"/>
<ClInclude Include="..\..\util\win32\Win32Window.h"/> <ClInclude Include="..\..\util\win32\Win32Window.h"/>
<ClInclude Include="..\..\util\win32\Win32Timer.h"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\util\shader_utils.cpp"/>
<ClCompile Include="..\..\util\OSWindow.cpp"/> <ClCompile Include="..\..\util\OSWindow.cpp"/>
<ClCompile Include="..\..\util\EGLWindow.cpp"/> <ClCompile Include="..\..\util\EGLWindow.cpp"/>
<ClCompile Include="..\..\util\win32\Win32_path_utils.cpp"/> <ClCompile Include="..\..\util\win32\Win32_path_utils.cpp"/>
......
projects/util/angle_util.vcxproj.filters
...@@ -7,21 +7,21 @@ ...@@ -7,21 +7,21 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\util\mouse.h"/> <ClInclude Include="..\..\util\mouse.h"/>
<ClInclude Include="..\..\util\shared_utils.h"/>
<ClInclude Include="..\..\util\Timer.h"/> <ClInclude Include="..\..\util\Timer.h"/>
<None Include="..\..\util\util.gyp"/>
<ClInclude Include="..\..\util\EGLWindow.h"/> <ClInclude Include="..\..\util\EGLWindow.h"/>
<ClInclude Include="..\..\util\path_utils.h"/>
<None Include="..\..\util\util.gyp"/>
<ClInclude Include="..\..\util\shader_utils.h"/>
<ClCompile Include="..\..\util\shader_utils.cpp"/>
<ClInclude Include="..\..\util\OSWindow.h"/> <ClInclude Include="..\..\util\OSWindow.h"/>
<ClCompile Include="..\..\util\OSWindow.cpp"/> <ClCompile Include="..\..\util\OSWindow.cpp"/>
<ClInclude Include="..\..\util\Event.h"/>
<ClInclude Include="..\..\util\path_utils.h"/>
<ClInclude Include="..\..\util\keyboard.h"/> <ClInclude Include="..\..\util\keyboard.h"/>
<ClCompile Include="..\..\util\EGLWindow.cpp"/> <ClCompile Include="..\..\util\EGLWindow.cpp"/>
<ClInclude Include="..\..\util\Event.h"/>
<ClCompile Include="..\..\util\win32\Win32_path_utils.cpp"> <ClCompile Include="..\..\util\win32\Win32_path_utils.cpp">
<Filter>win32</Filter> <Filter>win32</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\util\win32\Win32Timer.h">
<Filter>win32</Filter>
</ClInclude>
<ClCompile Include="..\..\util\win32\Win32Window.cpp"> <ClCompile Include="..\..\util\win32\Win32Window.cpp">
<Filter>win32</Filter> <Filter>win32</Filter>
</ClCompile> </ClCompile>
...@@ -31,5 +31,8 @@ ...@@ -31,5 +31,8 @@
<ClInclude Include="..\..\util\win32\Win32Window.h"> <ClInclude Include="..\..\util\win32\Win32Window.h">
<Filter>win32</Filter> <Filter>win32</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\util\win32\Win32Timer.h">
<Filter>win32</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>
tests/angle_tests/ANGLETest.h
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include "angle_gl.h" #include "angle_gl.h"
#include <algorithm> #include <algorithm>
#include "shared_utils.h"
#define EXPECT_GL_ERROR(err) EXPECT_EQ((err), glGetError()) #define EXPECT_GL_ERROR(err) EXPECT_EQ((err), glGetError())
#define EXPECT_GL_NO_ERROR() EXPECT_GL_ERROR(GL_NO_ERROR) #define EXPECT_GL_NO_ERROR() EXPECT_GL_ERROR(GL_NO_ERROR)
...@@ -31,8 +33,6 @@ ...@@ -31,8 +33,6 @@
EXPECT_EQ((a), pixel[3]); \ EXPECT_EQ((a), pixel[3]); \
} }
#define SHADER_SOURCE(...) #__VA_ARGS__
class EGLWindow; class EGLWindow;
class OSWindow; class OSWindow;
......
util/EGLWindow.h
...@@ -21,11 +21,7 @@ ...@@ -21,11 +21,7 @@
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
// A macro to disallow the copy constructor and operator= functions #include "shared_utils.h"
// This must be used in the private: declarations for a class
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \
void operator=(const TypeName&)
class OSWindow; class OSWindow;
......
util/shared_utils.h 0 → 100644
//
// Copyright (c) 2014 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.
//
#ifndef UTIL_SHARED_UTILS_H
#define UTIL_SHARED_UTILS_H
#define SHADER_SOURCE(...) #__VA_ARGS__
// A macro to disallow the copy constructor and operator= functions
// This must be used in the private: declarations for a class
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \
void operator=(const TypeName&)
#endif // UTIL_SHARED_UTILS_H
util/util.gyp
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
'keyboard.h', 'keyboard.h',
'mouse.h', 'mouse.h',
'path_utils.h', 'path_utils.h',
'shader_utils.cpp',
'shader_utils.h',
'shared_utils.h',
'EGLWindow.cpp', 'EGLWindow.cpp',
'EGLWindow.h', 'EGLWindow.h',
'Event.h', 'Event.h',
......
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