Skip to content

A
angle
Commit 08146a27 by Tom Anderson Committed by Commit Bot
Options

Remove non-source sources from binary targets

No behavior changes. BUG=chromium:964411 Change-Id: I843757e65f110882c01514fe6bf4aed28e07dd21 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1617011 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 7a026133
Showing with 28 additions and 32 deletions
src/common/Color.h
...@@ -99,6 +99,6 @@ using ColorGeneric = angle::ColorGeneric; ...@@ -99,6 +99,6 @@ using ColorGeneric = angle::ColorGeneric;
} // namespace gl } // namespace gl
#include "Color.inl" #include "Color.inc"
#endif // COMMON_COLOR_H_ #endif // COMMON_COLOR_H_
src/common/Color.inl → src/common/Color.inc
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// Color.inl : Inline definitions of some functions from Color.h // Color.inc : Inline definitions of some functions from Color.h
namespace angle namespace angle
{ {
......
src/compiler.gni
...@@ -104,8 +104,6 @@ angle_translator_sources = [ ...@@ -104,8 +104,6 @@ angle_translator_sources = [
"src/compiler/translator/blocklayout.cpp", "src/compiler/translator/blocklayout.cpp",
"src/compiler/translator/blocklayout.h", "src/compiler/translator/blocklayout.h",
"src/compiler/translator/glslang.h", "src/compiler/translator/glslang.h",
"src/compiler/translator/glslang.l",
"src/compiler/translator/glslang.y",
"src/compiler/translator/glslang_lex.cpp", "src/compiler/translator/glslang_lex.cpp",
"src/compiler/translator/glslang_tab.cpp", "src/compiler/translator/glslang_tab.cpp",
"src/compiler/translator/glslang_tab.h", "src/compiler/translator/glslang_tab.h",
...@@ -290,7 +288,6 @@ angle_preprocessor_sources = [ ...@@ -290,7 +288,6 @@ angle_preprocessor_sources = [
"src/compiler/preprocessor/DirectiveParser.h", "src/compiler/preprocessor/DirectiveParser.h",
"src/compiler/preprocessor/ExpressionParser.cpp", "src/compiler/preprocessor/ExpressionParser.cpp",
"src/compiler/preprocessor/ExpressionParser.h", "src/compiler/preprocessor/ExpressionParser.h",
"src/compiler/preprocessor/ExpressionParser.y",
"src/compiler/preprocessor/Input.cpp", "src/compiler/preprocessor/Input.cpp",
"src/compiler/preprocessor/Input.h", "src/compiler/preprocessor/Input.h",
"src/compiler/preprocessor/Lexer.cpp", "src/compiler/preprocessor/Lexer.cpp",
...@@ -306,6 +303,5 @@ angle_preprocessor_sources = [ ...@@ -306,6 +303,5 @@ angle_preprocessor_sources = [
"src/compiler/preprocessor/Token.h", "src/compiler/preprocessor/Token.h",
"src/compiler/preprocessor/Tokenizer.cpp", "src/compiler/preprocessor/Tokenizer.cpp",
"src/compiler/preprocessor/Tokenizer.h", "src/compiler/preprocessor/Tokenizer.h",
"src/compiler/preprocessor/Tokenizer.l",
"src/compiler/preprocessor/numeric_lex.h", "src/compiler/preprocessor/numeric_lex.h",
] ]
src/image_util/copyimage.h
...@@ -34,6 +34,6 @@ void CopyBGRA8ToRGBA8(const uint8_t *source, uint8_t *dest); ...@@ -34,6 +34,6 @@ void CopyBGRA8ToRGBA8(const uint8_t *source, uint8_t *dest);
} // namespace angle } // namespace angle
#include "copyimage.inl" #include "copyimage.inc"
#endif // IMAGEUTIL_COPYIMAGE_H_ #endif // IMAGEUTIL_COPYIMAGE_H_
src/image_util/copyimage.inl → src/image_util/copyimage.inc
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// copyimage.inl: Defines image copying functions // copyimage.inc: Defines image copying functions
namespace angle namespace angle
{ {
......
src/image_util/generatemip.h
...@@ -29,6 +29,6 @@ inline void GenerateMip(size_t sourceWidth, ...@@ -29,6 +29,6 @@ inline void GenerateMip(size_t sourceWidth,
} // namespace angle } // namespace angle
#include "generatemip.inl" #include "generatemip.inc"
#endif // IMAGEUTIL_GENERATEMIP_H_ #endif // IMAGEUTIL_GENERATEMIP_H_
src/image_util/generatemip.inl → src/image_util/generatemip.inc
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// generatemip.inl: Defines the GenerateMip function, templated on the format // generatemip.inc: Defines the GenerateMip function, templated on the format
// type of the image for which mip levels are being generated. // type of the image for which mip levels are being generated.
#include "common/mathutil.h" #include "common/mathutil.h"
......
src/image_util/loadimage.h
...@@ -723,6 +723,6 @@ void LoadETC2SRGBA8ToSRGBA8(size_t width, ...@@ -723,6 +723,6 @@ void LoadETC2SRGBA8ToSRGBA8(size_t width,
} // namespace angle } // namespace angle
#include "loadimage.inl" #include "loadimage.inc"
#endif // IMAGEUTIL_LOADIMAGE_H_ #endif // IMAGEUTIL_LOADIMAGE_H_
src/libANGLE/Error.h
...@@ -185,6 +185,6 @@ inline bool IsError(const egl::Error &err) ...@@ -185,6 +185,6 @@ inline bool IsError(const egl::Error &err)
return err.isError(); return err.isError();
} }
#include "Error.inl" #include "Error.inc"
#endif // LIBANGLE_ERROR_H_ #endif // LIBANGLE_ERROR_H_
src/libANGLE/Error.inl → src/libANGLE/Error.inc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// Error.inl: Inline definitions of egl::Error and gl::Error classes which encapsulate API errors // Error.inc: Inline definitions of egl::Error and gl::Error classes which encapsulate API errors
// and optional error messages. // and optional error messages.
#include "common/angleutils.h" #include "common/angleutils.h"
......
src/libANGLE/Version.h
...@@ -29,6 +29,6 @@ bool operator<(const Version &a, const Version &b); ...@@ -29,6 +29,6 @@ bool operator<(const Version &a, const Version &b);
bool operator>(const Version &a, const Version &b); bool operator>(const Version &a, const Version &b);
} // namespace gl } // namespace gl
#include "Version.inl" #include "Version.inc"
#endif // LIBANGLE_VERSION_H_ #endif // LIBANGLE_VERSION_H_
src/libANGLE/Version.inl → src/libANGLE/Version.inc
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// Version.inl: Encapsulation of a GL version. // Version.inc: Encapsulation of a GL version.
#include <tuple> #include <tuple>
......
src/libANGLE/VertexAttribute.h
...@@ -164,6 +164,6 @@ bool operator!=(const VertexAttribCurrentValueData &a, const VertexAttribCurrent ...@@ -164,6 +164,6 @@ bool operator!=(const VertexAttribCurrentValueData &a, const VertexAttribCurrent
} // namespace gl } // namespace gl
#include "VertexAttribute.inl" #include "VertexAttribute.inc"
#endif // LIBANGLE_VERTEXATTRIBUTE_H_ #endif // LIBANGLE_VERTEXATTRIBUTE_H_
src/libANGLE/VertexAttribute.inl → src/libANGLE/VertexAttribute.inc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// VertexAttribute.inl: Inline vertex attribute methods // VertexAttribute.inc: Inline vertex attribute methods
// //
namespace gl namespace gl
......
src/libANGLE/angletypes.h
...@@ -527,7 +527,7 @@ inline DestT *SafeGetImplAs(SrcT *src) ...@@ -527,7 +527,7 @@ inline DestT *SafeGetImplAs(SrcT *src)
} // namespace rx } // namespace rx
#include "angletypes.inl" #include "angletypes.inc"
namespace angle namespace angle
{ {
......
src/libANGLE/angletypes.inl → src/libANGLE/angletypes.inc
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// angletypes.inl : Inline definitions of some functions from angletypes.h // angletypes.inc : Inline definitions of some functions from angletypes.h
namespace gl namespace gl
{ {
......
src/libANGLE/renderer/vulkan/TextureVk.cpp
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "libANGLE/renderer/vulkan/TextureVk.h" #include "libANGLE/renderer/vulkan/TextureVk.h"
#include "common/debug.h" #include "common/debug.h"
#include "image_util/generatemip.inl" #include "image_util/generatemip.inc"
#include "libANGLE/Config.h" #include "libANGLE/Config.h"
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/Image.h" #include "libANGLE/Image.h"
......
src/libGLESv2.gni
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
libangle_common_sources = [ libangle_common_sources = [
"src/common/Color.h", "src/common/Color.h",
"src/common/Color.inl", "src/common/Color.inc",
"src/common/FastVector.h", "src/common/FastVector.h",
"src/common/FixedVector.h", "src/common/FixedVector.h",
"src/common/Float16ToFloat32.cpp", "src/common/Float16ToFloat32.cpp",
...@@ -96,14 +96,14 @@ if (is_android) { ...@@ -96,14 +96,14 @@ if (is_android) {
libangle_image_util_sources = [ libangle_image_util_sources = [
"src/image_util/copyimage.cpp", "src/image_util/copyimage.cpp",
"src/image_util/copyimage.h", "src/image_util/copyimage.h",
"src/image_util/copyimage.inl", "src/image_util/copyimage.inc",
"src/image_util/generatemip.h", "src/image_util/generatemip.h",
"src/image_util/generatemip.inl", "src/image_util/generatemip.inc",
"src/image_util/imageformats.cpp", "src/image_util/imageformats.cpp",
"src/image_util/imageformats.h", "src/image_util/imageformats.h",
"src/image_util/loadimage.cpp", "src/image_util/loadimage.cpp",
"src/image_util/loadimage.h", "src/image_util/loadimage.h",
"src/image_util/loadimage.inl", "src/image_util/loadimage.inc",
"src/image_util/loadimage_etc.cpp", "src/image_util/loadimage_etc.cpp",
] ]
...@@ -189,7 +189,7 @@ libangle_sources = [ ...@@ -189,7 +189,7 @@ libangle_sources = [
"src/libANGLE/EGLSync.h", "src/libANGLE/EGLSync.h",
"src/libANGLE/Error.cpp", "src/libANGLE/Error.cpp",
"src/libANGLE/Error.h", "src/libANGLE/Error.h",
"src/libANGLE/Error.inl", "src/libANGLE/Error.inc",
"src/libANGLE/ErrorStrings.h", "src/libANGLE/ErrorStrings.h",
"src/libANGLE/Fence.cpp", "src/libANGLE/Fence.cpp",
"src/libANGLE/Fence.h", "src/libANGLE/Fence.h",
...@@ -259,18 +259,18 @@ libangle_sources = [ ...@@ -259,18 +259,18 @@ libangle_sources = [
"src/libANGLE/VaryingPacking.cpp", "src/libANGLE/VaryingPacking.cpp",
"src/libANGLE/VaryingPacking.h", "src/libANGLE/VaryingPacking.h",
"src/libANGLE/Version.h", "src/libANGLE/Version.h",
"src/libANGLE/Version.inl", "src/libANGLE/Version.inc",
"src/libANGLE/VertexArray.cpp", "src/libANGLE/VertexArray.cpp",
"src/libANGLE/VertexArray.h", "src/libANGLE/VertexArray.h",
"src/libANGLE/VertexAttribute.cpp", "src/libANGLE/VertexAttribute.cpp",
"src/libANGLE/VertexAttribute.h", "src/libANGLE/VertexAttribute.h",
"src/libANGLE/VertexAttribute.inl", "src/libANGLE/VertexAttribute.inc",
"src/libANGLE/Workarounds.h", "src/libANGLE/Workarounds.h",
"src/libANGLE/WorkerThread.cpp", "src/libANGLE/WorkerThread.cpp",
"src/libANGLE/WorkerThread.h", "src/libANGLE/WorkerThread.h",
"src/libANGLE/angletypes.cpp", "src/libANGLE/angletypes.cpp",
"src/libANGLE/angletypes.h", "src/libANGLE/angletypes.h",
"src/libANGLE/angletypes.inl", "src/libANGLE/angletypes.inc",
"src/libANGLE/es3_copy_conversion_table_autogen.cpp", "src/libANGLE/es3_copy_conversion_table_autogen.cpp",
"src/libANGLE/features.h", "src/libANGLE/features.h",
"src/libANGLE/format_map_autogen.cpp", "src/libANGLE/format_map_autogen.cpp",
......
src/tests/angle_end2end_tests.gni
...@@ -83,7 +83,7 @@ angle_end2end_tests_sources = [ ...@@ -83,7 +83,7 @@ angle_end2end_tests_sources = [
"gl_tests/MultisampleTest.cpp", "gl_tests/MultisampleTest.cpp",
"gl_tests/MultithreadingTest.cpp", "gl_tests/MultithreadingTest.cpp",
"gl_tests/MultiviewDrawTest.cpp", "gl_tests/MultiviewDrawTest.cpp",
"gl_tests/media/pixel.inl", "gl_tests/media/pixel.inc",
"gl_tests/PackUnpackTest.cpp", "gl_tests/PackUnpackTest.cpp",
"gl_tests/PathRenderingTest.cpp", "gl_tests/PathRenderingTest.cpp",
"gl_tests/PbufferTest.cpp", "gl_tests/PbufferTest.cpp",
......
src/tests/gl_tests/DXT1CompressedTextureTest.cpp
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "test_utils/ANGLETest.h" #include "test_utils/ANGLETest.h"
#include "test_utils/gl_raii.h" #include "test_utils/gl_raii.h"
#include "media/pixel.inl" #include "media/pixel.inc"
using namespace angle; using namespace angle;
......
src/tests/gl_tests/DXTSRGBCompressedTextureTest.cpp
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "test_utils/ANGLETest.h" #include "test_utils/ANGLETest.h"
#include "test_utils/gl_raii.h" #include "test_utils/gl_raii.h"
#include "media/pixel.inl" #include "media/pixel.inc"
#include "DXTSRGBCompressedTextureTestData.inl" #include "DXTSRGBCompressedTextureTestData.inl"
......
src/tests/gl_tests/SwizzleTest.cpp
...@@ -380,7 +380,7 @@ TEST_P(SwizzleTest, LA32F_2D) ...@@ -380,7 +380,7 @@ TEST_P(SwizzleTest, LA32F_2D)
runTest2D(); runTest2D();
} }
#include "media/pixel.inl" #include "media/pixel.inc"
TEST_P(SwizzleTest, CompressedDXT_2D) TEST_P(SwizzleTest, CompressedDXT_2D)
{ {
......
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