Skip to content

A
angle
Commit ddc41208 by Frank Henigman Committed by Commit Bot
Options

Rename .gypi -> .gni.

Rename and reformat all gyp files. They were previously converted to gn but not renamed to preserve continuity in git. This rename completes the removal of all traces of gyp. BUG=angleproject:1569 Change-Id: I50123105d8881583184ffc564bed65d9fbe4d41c Reviewed-on: https://chromium-review.googlesource.com/1187885 Commit-Queue: Frank Henigman <fjhenigman@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent ae6c2b88
Showing with 90 additions and 178 deletions
BUILD.gn
...@@ -49,8 +49,8 @@ angle_git_is_present = exec_script("src/commit_id.py", ...@@ -49,8 +49,8 @@ angle_git_is_present = exec_script("src/commit_id.py",
angle_use_commit_id = angle_git_is_present == 1 angle_use_commit_id = angle_git_is_present == 1
import("src/libGLESv2.gypi") import("src/libGLESv2.gni")
import("src/compiler.gypi") import("src/compiler.gni")
# This config is exported to dependent targets (and also applied to internal # This config is exported to dependent targets (and also applied to internal
# ones). # ones).
...@@ -790,7 +790,7 @@ static_library("libEGL_static") { ...@@ -790,7 +790,7 @@ static_library("libEGL_static") {
] ]
} }
import("util/util.gyp") import("util/util.gni")
config("angle_util_config") { config("angle_util_config") {
include_dirs = [ "util" ] include_dirs = [ "util" ]
......
doc/ContributingCode.md
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
### Build maintenance ### Build maintenance
1. If you added or removed source files: 1. If you added or removed source files:
* You _must_ update the build files with your changes. See `src/libGLESv2.gypi` and `src/compiler.gypi`. * You _must_ update the build files with your changes. See `src/libGLESv2.gni` and `src/compiler.gni`.
2. ANGLE's BUILD.gn script is used by [Chromium's gn build](https://www.chromium.org/developers/gn-build-configuration). If you change build files other than to add or remove source files be aware you could break the Chromium build. ANGLE's commit queue (CQ) will detect such breakage. Ask a project member for help with Chromium issues if you don't have a Chromium checkout. 2. ANGLE's BUILD.gn script is used by [Chromium's gn build](https://www.chromium.org/developers/gn-build-configuration). If you change build files other than to add or remove source files be aware you could break the Chromium build. ANGLE's commit queue (CQ) will detect such breakage. Ask a project member for help with Chromium issues if you don't have a Chromium checkout.
3. If you modified `glslang.y` or `glslang.l`: 3. If you modified `glslang.y` or `glslang.l`:
* You _must_ update the bison-generated compiler sources. Download and install the latest 64-bit Bison and flex from official [Cygwin](https://cygwin.com/install.html) on _Windows_. From the Cygwin shell run `generate_parser.sh` in `src/compiler/translator` and update your CL. Do not edit the generated files by hand. * You _must_ update the bison-generated compiler sources. Download and install the latest 64-bit Bison and flex from official [Cygwin](https://cygwin.com/install.html) on _Windows_. From the Cygwin shell run `generate_parser.sh` in `src/compiler/translator` and update your CL. Do not edit the generated files by hand.
......
src/compiler.gypi → src/compiler.gni
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,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.
angle_translator_sources = angle_translator_sources = [
[
"../include/EGL/egl.h", "../include/EGL/egl.h",
"../include/EGL/eglext.h", "../include/EGL/eglext.h",
"../include/EGL/eglplatform.h", "../include/EGL/eglplatform.h",
...@@ -199,15 +198,13 @@ angle_translator_sources = ...@@ -199,15 +198,13 @@ angle_translator_sources =
"third_party/compiler/ArrayBoundsClamper.cpp", "third_party/compiler/ArrayBoundsClamper.cpp",
"third_party/compiler/ArrayBoundsClamper.h", "third_party/compiler/ArrayBoundsClamper.h",
] ]
angle_translator_essl_sources = angle_translator_essl_sources = [
[
"compiler/translator/OutputESSL.cpp", "compiler/translator/OutputESSL.cpp",
"compiler/translator/OutputESSL.h", "compiler/translator/OutputESSL.h",
"compiler/translator/TranslatorESSL.cpp", "compiler/translator/TranslatorESSL.cpp",
"compiler/translator/TranslatorESSL.h", "compiler/translator/TranslatorESSL.h",
] ]
angle_translator_glsl_sources = angle_translator_glsl_sources = [
[
"compiler/translator/BuiltInFunctionEmulatorGLSL.cpp", "compiler/translator/BuiltInFunctionEmulatorGLSL.cpp",
"compiler/translator/BuiltInFunctionEmulatorGLSL.h", "compiler/translator/BuiltInFunctionEmulatorGLSL.h",
"compiler/translator/ExtensionGLSL.cpp", "compiler/translator/ExtensionGLSL.cpp",
...@@ -221,8 +218,7 @@ angle_translator_glsl_sources = ...@@ -221,8 +218,7 @@ angle_translator_glsl_sources =
"compiler/translator/VersionGLSL.cpp", "compiler/translator/VersionGLSL.cpp",
"compiler/translator/VersionGLSL.h", "compiler/translator/VersionGLSL.h",
] ]
angle_translator_hlsl_sources = angle_translator_hlsl_sources = [
[
"compiler/translator/ASTMetadataHLSL.cpp", "compiler/translator/ASTMetadataHLSL.cpp",
"compiler/translator/ASTMetadataHLSL.h", "compiler/translator/ASTMetadataHLSL.h",
"compiler/translator/blocklayoutHLSL.cpp", "compiler/translator/blocklayoutHLSL.cpp",
...@@ -265,15 +261,13 @@ angle_translator_hlsl_sources = ...@@ -265,15 +261,13 @@ angle_translator_hlsl_sources =
"compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.cpp", "compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.cpp",
"compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h", "compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h",
] ]
angle_translator_lib_vulkan_sources = angle_translator_lib_vulkan_sources = [
[
"compiler/translator/OutputVulkanGLSL.cpp", "compiler/translator/OutputVulkanGLSL.cpp",
"compiler/translator/OutputVulkanGLSL.h", "compiler/translator/OutputVulkanGLSL.h",
"compiler/translator/TranslatorVulkan.cpp", "compiler/translator/TranslatorVulkan.cpp",
"compiler/translator/TranslatorVulkan.h", "compiler/translator/TranslatorVulkan.h",
] ]
angle_preprocessor_sources = angle_preprocessor_sources = [
[
"compiler/preprocessor/DiagnosticsBase.cpp", "compiler/preprocessor/DiagnosticsBase.cpp",
"compiler/preprocessor/DiagnosticsBase.h", "compiler/preprocessor/DiagnosticsBase.h",
"compiler/preprocessor/DirectiveHandlerBase.cpp", "compiler/preprocessor/DirectiveHandlerBase.cpp",
......
src/libGLESv2.gypi → src/libGLESv2.gni
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,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.
libangle_common_sources = libangle_common_sources = [
[
"common/Color.h", "common/Color.h",
"common/Color.inl", "common/Color.inl",
"common/FixedVector.h", "common/FixedVector.h",
...@@ -54,20 +53,10 @@ libangle_common_sources = ...@@ -54,20 +53,10 @@ libangle_common_sources =
"common/vector_utils.h", "common/vector_utils.h",
"common/version.h", "common/version.h",
] ]
libangle_common_linux_sources = libangle_common_linux_sources = [ "common/system_utils_linux.cpp" ]
[ libangle_common_mac_sources = [ "common/system_utils_mac.cpp" ]
"common/system_utils_linux.cpp", libangle_common_win_sources = [ "common/system_utils_win.cpp" ]
] libangle_image_util_sources = [
libangle_common_mac_sources =
[
"common/system_utils_mac.cpp",
]
libangle_common_win_sources =
[
"common/system_utils_win.cpp",
]
libangle_image_util_sources =
[
"image_util/copyimage.cpp", "image_util/copyimage.cpp",
"image_util/copyimage.h", "image_util/copyimage.h",
"image_util/copyimage.inl", "image_util/copyimage.inl",
...@@ -80,34 +69,18 @@ libangle_image_util_sources = ...@@ -80,34 +69,18 @@ libangle_image_util_sources =
"image_util/loadimage.inl", "image_util/loadimage.inl",
"image_util/loadimage_etc.cpp", "image_util/loadimage_etc.cpp",
] ]
libangle_gpu_info_util_sources = libangle_gpu_info_util_sources = [
[
"gpu_info_util/SystemInfo.cpp", "gpu_info_util/SystemInfo.cpp",
"gpu_info_util/SystemInfo.h", "gpu_info_util/SystemInfo.h",
"gpu_info_util/SystemInfo_internal.h", "gpu_info_util/SystemInfo_internal.h",
] ]
libangle_gpu_info_util_win_sources = libangle_gpu_info_util_win_sources = [ "gpu_info_util/SystemInfo_win.cpp" ]
[ libangle_gpu_info_util_linux_sources = [ "gpu_info_util/SystemInfo_linux.cpp" ]
"gpu_info_util/SystemInfo_win.cpp",
]
libangle_gpu_info_util_linux_sources =
[
"gpu_info_util/SystemInfo_linux.cpp",
]
libangle_gpu_info_util_libpci_sources = libangle_gpu_info_util_libpci_sources =
[ [ "gpu_info_util/SystemInfo_libpci.cpp" ]
"gpu_info_util/SystemInfo_libpci.cpp", libangle_gpu_info_util_x11_sources = [ "gpu_info_util/SystemInfo_x11.cpp" ]
] libangle_gpu_info_util_mac_sources = [ "gpu_info_util/SystemInfo_mac.mm" ]
libangle_gpu_info_util_x11_sources = libangle_includes = [
[
"gpu_info_util/SystemInfo_x11.cpp",
]
libangle_gpu_info_util_mac_sources =
[
"gpu_info_util/SystemInfo_mac.mm",
]
libangle_includes =
[
"../include/angle_gl.h", "../include/angle_gl.h",
"../include/export.h", "../include/export.h",
"../include/EGL/egl.h", "../include/EGL/egl.h",
...@@ -136,8 +109,7 @@ libangle_includes = ...@@ -136,8 +109,7 @@ libangle_includes =
"../include/platform/Platform.h", "../include/platform/Platform.h",
"../include/platform/WorkaroundsD3D.h", "../include/platform/WorkaroundsD3D.h",
] ]
libangle_sources = libangle_sources = [
[
"common/event_tracer.cpp", "common/event_tracer.cpp",
"common/event_tracer.h", "common/event_tracer.h",
"libANGLE/AttributeMap.cpp", "libANGLE/AttributeMap.cpp",
...@@ -314,8 +286,7 @@ libangle_sources = ...@@ -314,8 +286,7 @@ libangle_sources =
"libANGLE/validationES31.h", "libANGLE/validationES31.h",
"third_party/trace_event/trace_event.h", "third_party/trace_event/trace_event.h",
] ]
libangle_d3d_shared_sources = libangle_d3d_shared_sources = [
[
"libANGLE/renderer/d3d/BufferD3D.cpp", "libANGLE/renderer/d3d/BufferD3D.cpp",
"libANGLE/renderer/d3d/BufferD3D.h", "libANGLE/renderer/d3d/BufferD3D.h",
"libANGLE/renderer/d3d/CompilerD3D.cpp", "libANGLE/renderer/d3d/CompilerD3D.cpp",
...@@ -367,8 +338,7 @@ libangle_d3d_shared_sources = ...@@ -367,8 +338,7 @@ libangle_d3d_shared_sources =
"libANGLE/renderer/d3d/VertexDataManager.cpp", "libANGLE/renderer/d3d/VertexDataManager.cpp",
"libANGLE/renderer/d3d/VertexDataManager.h", "libANGLE/renderer/d3d/VertexDataManager.h",
] ]
libangle_d3d9_sources = libangle_d3d9_sources = [
[
"libANGLE/renderer/d3d/d3d9/Blit9.cpp", "libANGLE/renderer/d3d/d3d9/Blit9.cpp",
"libANGLE/renderer/d3d/d3d9/Blit9.h", "libANGLE/renderer/d3d/d3d9/Blit9.h",
"libANGLE/renderer/d3d/d3d9/Buffer9.cpp", "libANGLE/renderer/d3d/d3d9/Buffer9.cpp",
...@@ -421,8 +391,7 @@ libangle_d3d9_sources = ...@@ -421,8 +391,7 @@ libangle_d3d9_sources =
"libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp", "libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp",
"libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h", "libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h",
] ]
libangle_d3d11_sources = libangle_d3d11_sources = [
[
"libANGLE/renderer/d3d/d3d11/Blit11.cpp", "libANGLE/renderer/d3d/d3d11/Blit11.cpp",
"libANGLE/renderer/d3d/d3d11/Blit11.h", "libANGLE/renderer/d3d/d3d11/Blit11.h",
"libANGLE/renderer/d3d/d3d11/Buffer11.cpp", "libANGLE/renderer/d3d/d3d11/Buffer11.cpp",
...@@ -595,15 +564,13 @@ libangle_d3d11_sources = ...@@ -595,15 +564,13 @@ libangle_d3d11_sources =
"libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp", "libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp",
"libANGLE/renderer/d3d/d3d11/VertexBuffer11.h", "libANGLE/renderer/d3d/d3d11/VertexBuffer11.h",
] ]
libangle_d3d11_win32_sources = libangle_d3d11_win32_sources = [
[
"libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp", "libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp",
"libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h", "libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h",
"third_party/systeminfo/SystemInfo.cpp", "third_party/systeminfo/SystemInfo.cpp",
"third_party/systeminfo/SystemInfo.h", "third_party/systeminfo/SystemInfo.h",
] ]
libangle_d3d11_winrt_sources = libangle_d3d11_winrt_sources = [
[
"libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp", "libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp",
"libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h", "libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h",
"libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp", "libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp",
...@@ -613,8 +580,7 @@ libangle_d3d11_winrt_sources = ...@@ -613,8 +580,7 @@ libangle_d3d11_winrt_sources =
"libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp", "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp",
"libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h", "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h",
] ]
libangle_gl_sources = libangle_gl_sources = [
[
"libANGLE/renderer/gl/BlitGL.cpp", "libANGLE/renderer/gl/BlitGL.cpp",
"libANGLE/renderer/gl/BlitGL.h", "libANGLE/renderer/gl/BlitGL.h",
"libANGLE/renderer/gl/BufferGL.cpp", "libANGLE/renderer/gl/BufferGL.cpp",
...@@ -673,13 +639,11 @@ libangle_gl_sources = ...@@ -673,13 +639,11 @@ libangle_gl_sources =
"libANGLE/renderer/gl/renderergl_utils.cpp", "libANGLE/renderer/gl/renderergl_utils.cpp",
"libANGLE/renderer/gl/renderergl_utils.h", "libANGLE/renderer/gl/renderergl_utils.h",
] ]
libangle_gl_null_sources = libangle_gl_null_sources = [
[
"libANGLE/renderer/gl/null_functions.cpp", "libANGLE/renderer/gl/null_functions.cpp",
"libANGLE/renderer/gl/null_functions.h", "libANGLE/renderer/gl/null_functions.h",
] ]
libangle_gl_wgl_sources = libangle_gl_wgl_sources = [
[
"libANGLE/renderer/gl/wgl/ContextWGL.cpp", "libANGLE/renderer/gl/wgl/ContextWGL.cpp",
"libANGLE/renderer/gl/wgl/ContextWGL.h", "libANGLE/renderer/gl/wgl/ContextWGL.h",
"libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp", "libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp",
...@@ -702,8 +666,7 @@ libangle_gl_wgl_sources = ...@@ -702,8 +666,7 @@ libangle_gl_wgl_sources =
"libANGLE/renderer/gl/wgl/wgl_utils.h", "libANGLE/renderer/gl/wgl/wgl_utils.h",
"third_party/khronos/GL/wglext.h", "third_party/khronos/GL/wglext.h",
] ]
libangle_gl_glx_sources = libangle_gl_glx_sources = [
[
"libANGLE/renderer/gl/glx/DisplayGLX.cpp", "libANGLE/renderer/gl/glx/DisplayGLX.cpp",
"libANGLE/renderer/gl/glx/DisplayGLX.h", "libANGLE/renderer/gl/glx/DisplayGLX.h",
"libANGLE/renderer/gl/glx/FunctionsGLX.cpp", "libANGLE/renderer/gl/glx/FunctionsGLX.cpp",
...@@ -716,8 +679,7 @@ libangle_gl_glx_sources = ...@@ -716,8 +679,7 @@ libangle_gl_glx_sources =
"libANGLE/renderer/gl/glx/functionsglx_typedefs.h", "libANGLE/renderer/gl/glx/functionsglx_typedefs.h",
"libANGLE/renderer/gl/glx/platform_glx.h", "libANGLE/renderer/gl/glx/platform_glx.h",
] ]
libangle_gl_egl_sources = libangle_gl_egl_sources = [
[
"libANGLE/renderer/gl/egl/ContextEGL.cpp", "libANGLE/renderer/gl/egl/ContextEGL.cpp",
"libANGLE/renderer/gl/egl/ContextEGL.h", "libANGLE/renderer/gl/egl/ContextEGL.h",
"libANGLE/renderer/gl/egl/DisplayEGL.cpp", "libANGLE/renderer/gl/egl/DisplayEGL.cpp",
...@@ -738,25 +700,21 @@ libangle_gl_egl_sources = ...@@ -738,25 +700,21 @@ libangle_gl_egl_sources =
"libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp", "libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp",
"libANGLE/renderer/gl/egl/WindowSurfaceEGL.h", "libANGLE/renderer/gl/egl/WindowSurfaceEGL.h",
] ]
libangle_gl_egl_dl_sources = libangle_gl_egl_dl_sources = [
[
"libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp", "libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp",
"libANGLE/renderer/gl/egl/FunctionsEGLDL.h", "libANGLE/renderer/gl/egl/FunctionsEGLDL.h",
] ]
libangle_gl_ozone_sources = libangle_gl_ozone_sources = [
[
"libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp", "libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp",
"libANGLE/renderer/gl/egl/ozone/DisplayOzone.h", "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h",
"libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp", "libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp",
"libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h", "libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h",
] ]
libangle_gl_egl_android_sources = libangle_gl_egl_android_sources = [
[
"libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp", "libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp",
"libANGLE/renderer/gl/egl/android/DisplayAndroid.h", "libANGLE/renderer/gl/egl/android/DisplayAndroid.h",
] ]
libangle_gl_cgl_sources = libangle_gl_cgl_sources = [
[
"libANGLE/renderer/gl/cgl/DisplayCGL.mm", "libANGLE/renderer/gl/cgl/DisplayCGL.mm",
"libANGLE/renderer/gl/cgl/DisplayCGL.h", "libANGLE/renderer/gl/cgl/DisplayCGL.h",
"libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm", "libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm",
...@@ -766,8 +724,7 @@ libangle_gl_cgl_sources = ...@@ -766,8 +724,7 @@ libangle_gl_cgl_sources =
"libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm", "libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm",
"libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h", "libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h",
] ]
libangle_vulkan_sources = libangle_vulkan_sources = [
[
"libANGLE/renderer/vulkan/BufferVk.cpp", "libANGLE/renderer/vulkan/BufferVk.cpp",
"libANGLE/renderer/vulkan/BufferVk.h", "libANGLE/renderer/vulkan/BufferVk.h",
"libANGLE/renderer/vulkan/CommandGraph.cpp", "libANGLE/renderer/vulkan/CommandGraph.cpp",
...@@ -832,29 +789,25 @@ libangle_vulkan_sources = ...@@ -832,29 +789,25 @@ libangle_vulkan_sources =
"libANGLE/renderer/vulkan/vk_utils.cpp", "libANGLE/renderer/vulkan/vk_utils.cpp",
"libANGLE/renderer/vulkan/vk_utils.h", "libANGLE/renderer/vulkan/vk_utils.h",
] ]
libangle_vulkan_android_sources = libangle_vulkan_android_sources = [
[
"libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp", "libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp",
"libANGLE/renderer/vulkan/android/DisplayVkAndroid.h", "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h",
"libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp", "libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp",
"libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h", "libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h",
] ]
libangle_vulkan_win32_sources = libangle_vulkan_win32_sources = [
[
"libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp", "libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp",
"libANGLE/renderer/vulkan/win32/DisplayVkWin32.h", "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h",
"libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp", "libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp",
"libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h", "libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h",
] ]
libangle_vulkan_xcb_sources = libangle_vulkan_xcb_sources = [
[
"libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp", "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp",
"libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h", "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h",
"libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp", "libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp",
"libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h", "libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h",
] ]
libangle_null_sources = libangle_null_sources = [
[
"libANGLE/renderer/null/BufferNULL.cpp", "libANGLE/renderer/null/BufferNULL.cpp",
"libANGLE/renderer/null/BufferNULL.h", "libANGLE/renderer/null/BufferNULL.h",
"libANGLE/renderer/null/CompilerNULL.cpp", "libANGLE/renderer/null/CompilerNULL.cpp",
...@@ -896,8 +849,7 @@ libangle_null_sources = ...@@ -896,8 +849,7 @@ libangle_null_sources =
"libANGLE/renderer/null/VertexArrayNULL.cpp", "libANGLE/renderer/null/VertexArrayNULL.cpp",
"libANGLE/renderer/null/VertexArrayNULL.h", "libANGLE/renderer/null/VertexArrayNULL.h",
] ]
libglesv2_sources = libglesv2_sources = [
[
"common/angleutils.h", "common/angleutils.h",
"common/debug.h", "common/debug.h",
"libGLESv2/entry_points_egl.cpp", "libGLESv2/entry_points_egl.cpp",
...@@ -922,15 +874,13 @@ libglesv2_sources = ...@@ -922,15 +874,13 @@ libglesv2_sources =
"libGLESv2/proc_table_autogen.cpp", "libGLESv2/proc_table_autogen.cpp",
"libGLESv2/resource.h", "libGLESv2/resource.h",
] ]
libglesv1_cm_sources = libglesv1_cm_sources = [
[
"libGLESv1_CM/libGLESv1_CM.cpp", "libGLESv1_CM/libGLESv1_CM.cpp",
"libGLESv1_CM/libGLESv1_CM.def", "libGLESv1_CM/libGLESv1_CM.def",
"libGLESv1_CM/libGLESv1_CM.rc", "libGLESv1_CM/libGLESv1_CM.rc",
"libGLESv1_CM/resource.h", "libGLESv1_CM/resource.h",
] ]
libegl_sources = libegl_sources = [
[
"libEGL/libEGL.cpp", "libEGL/libEGL.cpp",
"libEGL/libEGL.rc", "libEGL/libEGL.rc",
"libEGL/resource.h", "libEGL/resource.h",
......
src/tests/BUILD.gn
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import("../../gni/angle.gni") import("../../gni/angle.gni")
import("//build/config/chromecast_build.gni") import("//build/config/chromecast_build.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("angle_unittests.gypi") import("angle_unittests.gni")
declare_args() { declare_args() {
# Don't build dEQP by default. # Don't build dEQP by default.
...@@ -110,7 +110,7 @@ test("angle_unittests") { ...@@ -110,7 +110,7 @@ test("angle_unittests") {
} }
if (is_win || is_linux || is_mac || is_android) { if (is_win || is_linux || is_mac || is_android) {
import("angle_end2end_tests.gypi") import("angle_end2end_tests.gni")
test("angle_end2end_tests") { test("angle_end2end_tests") {
include_dirs = [ include_dirs = [
...@@ -170,7 +170,7 @@ if (is_win || is_linux || is_mac || is_android) { ...@@ -170,7 +170,7 @@ if (is_win || is_linux || is_mac || is_android) {
] ]
} }
import("angle_white_box_tests.gypi") import("angle_white_box_tests.gni")
test("angle_white_box_tests") { test("angle_white_box_tests") {
include_dirs = [ include_dirs = [
...@@ -223,7 +223,7 @@ if (is_win || is_linux || is_mac || is_android) { ...@@ -223,7 +223,7 @@ if (is_win || is_linux || is_mac || is_android) {
} }
if (is_win || is_linux || is_android || is_mac) { if (is_win || is_linux || is_android || is_mac) {
import("angle_perftests.gypi") import("angle_perftests.gni")
test("angle_perftests") { test("angle_perftests") {
include_dirs = [ include_dirs = [
...@@ -487,7 +487,7 @@ if (build_angle_gles1_conform_tests) { ...@@ -487,7 +487,7 @@ if (build_angle_gles1_conform_tests) {
###----------------------------------------------------- ###-----------------------------------------------------
if (build_angle_deqp_tests) { if (build_angle_deqp_tests) {
import("deqp.gypi") import("deqp.gni")
config("angle_deqp_support") { config("angle_deqp_support") {
include_dirs = rebase_path(deqp_include_dirs, ".", "../..") include_dirs = rebase_path(deqp_include_dirs, ".", "../..")
......
src/tests/angle_end2end_tests.gypi → src/tests/angle_end2end_tests.gni
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,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.
angle_end2end_tests_sources = angle_end2end_tests_sources = [
[
"src/tests/gl_tests/AtomicCounterBufferTest.cpp", "src/tests/gl_tests/AtomicCounterBufferTest.cpp",
"src/tests/gl_tests/AttributeLayoutTest.cpp", "src/tests/gl_tests/AttributeLayoutTest.cpp",
"src/tests/gl_tests/BindGeneratesResourceTest.cpp", "src/tests/gl_tests/BindGeneratesResourceTest.cpp",
...@@ -139,11 +138,8 @@ angle_end2end_tests_sources = ...@@ -139,11 +138,8 @@ angle_end2end_tests_sources =
"src/tests/test_utils/gl_raii.h", "src/tests/test_utils/gl_raii.h",
] ]
angle_end2end_tests_mac_sources = angle_end2end_tests_mac_sources =
[ [ "src/tests/egl_tests/EGLIOSurfaceClientBufferTest.cpp" ]
"src/tests/egl_tests/EGLIOSurfaceClientBufferTest.cpp", angle_end2end_tests_win_sources = [
]
angle_end2end_tests_win_sources =
[
"src/tests/gl_tests/D3DImageFormatConversionTest.cpp", "src/tests/gl_tests/D3DImageFormatConversionTest.cpp",
"src/tests/egl_tests/EGLDeviceTest.cpp", "src/tests/egl_tests/EGLDeviceTest.cpp",
"src/tests/egl_tests/EGLPresentPathD3D11Test.cpp", "src/tests/egl_tests/EGLPresentPathD3D11Test.cpp",
...@@ -151,7 +147,4 @@ angle_end2end_tests_win_sources = ...@@ -151,7 +147,4 @@ angle_end2end_tests_win_sources =
"src/tests/egl_tests/EGLSyncControlTest.cpp", "src/tests/egl_tests/EGLSyncControlTest.cpp",
"src/tests/egl_tests/media/yuvtest.inl", "src/tests/egl_tests/media/yuvtest.inl",
] ]
angle_end2end_tests_x11_sources = angle_end2end_tests_x11_sources = [ "src/tests/egl_tests/EGLX11VisualTest.cpp" ]
[
"src/tests/egl_tests/EGLX11VisualTest.cpp",
]
src/tests/angle_perftests.gypi → src/tests/angle_perftests.gni
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,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.
angle_perf_tests_sources = angle_perf_tests_sources = [
[
"src/tests/perf_tests/ANGLEPerfTest.cpp", "src/tests/perf_tests/ANGLEPerfTest.cpp",
"src/tests/perf_tests/ANGLEPerfTest.h", "src/tests/perf_tests/ANGLEPerfTest.h",
"src/tests/perf_tests/BlitFramebufferPerf.cpp", "src/tests/perf_tests/BlitFramebufferPerf.cpp",
...@@ -40,17 +39,13 @@ angle_perf_tests_sources = ...@@ -40,17 +39,13 @@ angle_perf_tests_sources =
"src/tests/test_utils/draw_call_perf_utils.h", "src/tests/test_utils/draw_call_perf_utils.h",
] ]
angle_perf_tests_win_sources = angle_perf_tests_win_sources =
[ [ "src/tests/perf_tests/IndexDataManagerTest.cpp" ]
"src/tests/perf_tests/IndexDataManagerTest.cpp",
]
angle_perf_tests_vulkan_sources = angle_perf_tests_vulkan_sources =
[ [ "src/tests/perf_tests/VulkanPipelineCachePerf.cpp" ]
"src/tests/perf_tests/VulkanPipelineCachePerf.cpp",
]
# Currently Vulkan Command Buffer Perf Tests compile on Android/Linux # Currently Vulkan Command Buffer Perf Tests compile on Android/Linux
angle_perf_tests_vulkan_command_buffer_sources = angle_perf_tests_vulkan_command_buffer_sources = [
[
"src/tests/perf_tests/VulkanCommandBufferPerf.cpp", "src/tests/perf_tests/VulkanCommandBufferPerf.cpp",
"src/tests/test_utils/third_party/vulkan_command_buffer_utils.cpp", "src/tests/test_utils/third_party/vulkan_command_buffer_utils.cpp",
"src/tests/test_utils/third_party/vulkan_command_buffer_utils.h" "src/tests/test_utils/third_party/vulkan_command_buffer_utils.h",
] ]
src/tests/angle_unittests.gypi → src/tests/angle_unittests.gni
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,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.
angle_unittests_sources = angle_unittests_sources = [
[
"src/common/FixedVector_unittest.cpp", "src/common/FixedVector_unittest.cpp",
"src/common/Optional_unittest.cpp", "src/common/Optional_unittest.cpp",
"src/common/aligned_memory_unittest.cpp", "src/common/aligned_memory_unittest.cpp",
...@@ -121,9 +120,9 @@ angle_unittests_sources = ...@@ -121,9 +120,9 @@ angle_unittests_sources =
"src/tests/test_utils/ShaderCompileTreeTest.cpp", "src/tests/test_utils/ShaderCompileTreeTest.cpp",
"src/tests/test_utils/ShaderExtensionTest.h", "src/tests/test_utils/ShaderExtensionTest.h",
] ]
# TODO(jmadill): should probably call this windows sources # TODO(jmadill): should probably call this windows sources
angle_unittests_hlsl_sources = angle_unittests_hlsl_sources = [
[
"src/tests/compiler_tests/HLSLOutput_test.cpp", "src/tests/compiler_tests/HLSLOutput_test.cpp",
"src/tests/compiler_tests/UnrollFlatten_test.cpp", "src/tests/compiler_tests/UnrollFlatten_test.cpp",
] ]
src/tests/angle_white_box_tests.gypi → src/tests/angle_white_box_tests.gni
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,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.
angle_white_box_tests_sources = angle_white_box_tests_sources = [
[
"src/tests/util_tests/PrintSystemInfoTest.cpp", "src/tests/util_tests/PrintSystemInfoTest.cpp",
"src/tests/test_utils/angle_test_configs.cpp", "src/tests/test_utils/angle_test_configs.cpp",
"src/tests/test_utils/angle_test_configs.h", "src/tests/test_utils/angle_test_configs.h",
...@@ -13,11 +12,10 @@ angle_white_box_tests_sources = ...@@ -13,11 +12,10 @@ angle_white_box_tests_sources =
"src/tests/test_utils/ANGLETest.h", "src/tests/test_utils/ANGLETest.h",
"src/tests/test_utils/gl_raii.h", "src/tests/test_utils/gl_raii.h",
] ]
angle_white_box_tests_win_sources = angle_white_box_tests_win_sources = [
[
"src/tests/gl_tests/D3D11EmulatedIndexedBufferTest.cpp", "src/tests/gl_tests/D3D11EmulatedIndexedBufferTest.cpp",
"src/tests/gl_tests/D3D11FormatTablesTest.cpp", "src/tests/gl_tests/D3D11FormatTablesTest.cpp",
"src/tests/gl_tests/D3D11InputLayoutCacheTest.cpp", "src/tests/gl_tests/D3D11InputLayoutCacheTest.cpp",
"src/tests/gl_tests/D3DTextureTest.cpp", "src/tests/gl_tests/D3DTextureTest.cpp",
"src/tests/gl_tests/ErrorMessages.cpp" "src/tests/gl_tests/ErrorMessages.cpp",
] ]
src/tests/deqp.gypi → src/tests/deqp.gni
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
# leading underscore makes this a local variable # leading underscore makes this a local variable
_deqp_path = "third_party/deqp/src" _deqp_path = "third_party/deqp/src"
deqp_include_dirs = deqp_include_dirs = [
[
"$_deqp_path/executor", "$_deqp_path/executor",
"$_deqp_path/execserver", "$_deqp_path/execserver",
"$_deqp_path/framework/common", "$_deqp_path/framework/common",
...@@ -43,8 +42,7 @@ deqp_include_dirs = ...@@ -43,8 +42,7 @@ deqp_include_dirs =
"$_deqp_path/modules/glshared", "$_deqp_path/modules/glshared",
"$_deqp_path/modules/glusecases", "$_deqp_path/modules/glusecases",
] ]
deqp_gles2_sources = deqp_gles2_sources = [
[
"$_deqp_path/modules/gles2/accuracy/es2aAccuracyTests.cpp", "$_deqp_path/modules/gles2/accuracy/es2aAccuracyTests.cpp",
"$_deqp_path/modules/gles2/accuracy/es2aAccuracyTests.hpp", "$_deqp_path/modules/gles2/accuracy/es2aAccuracyTests.hpp",
"$_deqp_path/modules/gles2/accuracy/es2aTextureFilteringTests.cpp", "$_deqp_path/modules/gles2/accuracy/es2aTextureFilteringTests.cpp",
...@@ -257,8 +255,7 @@ deqp_gles2_sources = ...@@ -257,8 +255,7 @@ deqp_gles2_sources =
"$_deqp_path/modules/gles2/tes2TestPackage.hpp", "$_deqp_path/modules/gles2/tes2TestPackage.hpp",
"$_deqp_path/modules/gles2/tes2TestPackageEntry.cpp", "$_deqp_path/modules/gles2/tes2TestPackageEntry.cpp",
] ]
deqp_gles3_sources = deqp_gles3_sources = [
[
"$_deqp_path/modules/gles3/accuracy/es3aAccuracyTests.cpp", "$_deqp_path/modules/gles3/accuracy/es3aAccuracyTests.cpp",
"$_deqp_path/modules/gles3/accuracy/es3aAccuracyTests.hpp", "$_deqp_path/modules/gles3/accuracy/es3aAccuracyTests.hpp",
"$_deqp_path/modules/gles3/accuracy/es3aTextureFilteringTests.cpp", "$_deqp_path/modules/gles3/accuracy/es3aTextureFilteringTests.cpp",
...@@ -541,8 +538,7 @@ deqp_gles3_sources = ...@@ -541,8 +538,7 @@ deqp_gles3_sources =
"$_deqp_path/modules/gles3/tes3TestPackage.hpp", "$_deqp_path/modules/gles3/tes3TestPackage.hpp",
"$_deqp_path/modules/gles3/tes3TestPackageEntry.cpp", "$_deqp_path/modules/gles3/tes3TestPackageEntry.cpp",
] ]
deqp_gles31_sources = deqp_gles31_sources = [
[
"$_deqp_path/modules/gles31/functional/es31fAdvancedBlendTests.cpp", "$_deqp_path/modules/gles31/functional/es31fAdvancedBlendTests.cpp",
"$_deqp_path/modules/gles31/functional/es31fAdvancedBlendTests.hpp", "$_deqp_path/modules/gles31/functional/es31fAdvancedBlendTests.hpp",
"$_deqp_path/modules/gles31/functional/es31fAndroidExtensionPackES31ATests.cpp", "$_deqp_path/modules/gles31/functional/es31fAndroidExtensionPackES31ATests.cpp",
...@@ -751,10 +747,9 @@ deqp_gles31_sources = ...@@ -751,10 +747,9 @@ deqp_gles31_sources =
"$_deqp_path/modules/gles31/tes31TestCase.hpp", "$_deqp_path/modules/gles31/tes31TestCase.hpp",
"$_deqp_path/modules/gles31/tes31TestPackage.cpp", "$_deqp_path/modules/gles31/tes31TestPackage.cpp",
"$_deqp_path/modules/gles31/tes31TestPackage.hpp", "$_deqp_path/modules/gles31/tes31TestPackage.hpp",
"$_deqp_path/modules/gles31/tes31TestPackageEntry.cpp" "$_deqp_path/modules/gles31/tes31TestPackageEntry.cpp",
] ]
deqp_egl_sources = deqp_egl_sources = [
[
"$_deqp_path/modules/egl/teglAndroidUtil.cpp", "$_deqp_path/modules/egl/teglAndroidUtil.cpp",
"$_deqp_path/modules/egl/teglAndroidUtil.hpp", "$_deqp_path/modules/egl/teglAndroidUtil.hpp",
"$_deqp_path/modules/egl/teglApiCase.cpp", "$_deqp_path/modules/egl/teglApiCase.cpp",
...@@ -859,8 +854,7 @@ deqp_egl_sources = ...@@ -859,8 +854,7 @@ deqp_egl_sources =
"$_deqp_path/modules/egl/teglWideColorTests.cpp", "$_deqp_path/modules/egl/teglWideColorTests.cpp",
"$_deqp_path/modules/egl/teglWideColorTests.hpp", "$_deqp_path/modules/egl/teglWideColorTests.hpp",
] ]
deqp_libtester_decpp_sources = deqp_libtester_decpp_sources = [
[
"$_deqp_path/framework/delibs/decpp/deArrayBuffer.cpp", "$_deqp_path/framework/delibs/decpp/deArrayBuffer.cpp",
"$_deqp_path/framework/delibs/decpp/deBlockBuffer.cpp", "$_deqp_path/framework/delibs/decpp/deBlockBuffer.cpp",
"$_deqp_path/framework/delibs/decpp/deCommandLine.cpp", "$_deqp_path/framework/delibs/decpp/deCommandLine.cpp",
...@@ -886,8 +880,7 @@ deqp_libtester_decpp_sources = ...@@ -886,8 +880,7 @@ deqp_libtester_decpp_sources =
"$_deqp_path/framework/delibs/decpp/deThreadSafeRingBuffer.cpp", "$_deqp_path/framework/delibs/decpp/deThreadSafeRingBuffer.cpp",
"$_deqp_path/framework/delibs/decpp/deUniquePtr.cpp", "$_deqp_path/framework/delibs/decpp/deUniquePtr.cpp",
] ]
deqp_libtester_sources = deqp_libtester_sources = [
[
"$_deqp_path/execserver/xsDefs.cpp", "$_deqp_path/execserver/xsDefs.cpp",
"$_deqp_path/execserver/xsExecutionServer.cpp", "$_deqp_path/execserver/xsExecutionServer.cpp",
"$_deqp_path/execserver/xsPosixFileReader.cpp", "$_deqp_path/execserver/xsPosixFileReader.cpp",
...@@ -996,6 +989,7 @@ deqp_libtester_sources = ...@@ -996,6 +989,7 @@ deqp_libtester_sources =
"$_deqp_path/framework/egl/egluGLContextFactory.cpp", "$_deqp_path/framework/egl/egluGLContextFactory.cpp",
"$_deqp_path/framework/egl/egluGLFunctionLoader.cpp", "$_deqp_path/framework/egl/egluGLFunctionLoader.cpp",
"$_deqp_path/framework/egl/egluGLUtil.cpp", "$_deqp_path/framework/egl/egluGLUtil.cpp",
# TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564 # TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564
#"$_deqp_path/framework/egl/egluNativeDisplay.cpp", #"$_deqp_path/framework/egl/egluNativeDisplay.cpp",
"src/tests/deqp_support/egluNativeDisplay_override.cpp", "src/tests/deqp_support/egluNativeDisplay_override.cpp",
...@@ -1006,6 +1000,7 @@ deqp_libtester_sources = ...@@ -1006,6 +1000,7 @@ deqp_libtester_sources =
"$_deqp_path/framework/egl/egluStaticESLibrary.cpp", "$_deqp_path/framework/egl/egluStaticESLibrary.cpp",
"$_deqp_path/framework/egl/egluStrUtil.cpp", "$_deqp_path/framework/egl/egluStrUtil.cpp",
"$_deqp_path/framework/egl/egluUnique.cpp", "$_deqp_path/framework/egl/egluUnique.cpp",
# TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564 # TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564
#"$_deqp_path/framework/egl/egluUtil.cpp", #"$_deqp_path/framework/egl/egluUtil.cpp",
"src/tests/deqp_support/egluUtil_override.cpp", "src/tests/deqp_support/egluUtil_override.cpp",
...@@ -1126,32 +1121,29 @@ deqp_libtester_sources = ...@@ -1126,32 +1121,29 @@ deqp_libtester_sources =
"$_deqp_path/modules/glshared/glsVertexArrayTests.cpp", "$_deqp_path/modules/glshared/glsVertexArrayTests.cpp",
"src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp", "src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp",
"src/tests/deqp_support/tcuANGLENativeDisplayFactory.h", "src/tests/deqp_support/tcuANGLENativeDisplayFactory.h",
# TODO(jmadill): integrate with dEQP # TODO(jmadill): integrate with dEQP
"src/tests/deqp_support/tcuRandomOrderExecutor.cpp", "src/tests/deqp_support/tcuRandomOrderExecutor.cpp",
"src/tests/deqp_support/tcuRandomOrderExecutor.h", "src/tests/deqp_support/tcuRandomOrderExecutor.h",
] ]
deqp_libtester_sources_win = deqp_libtester_sources_win = [
[
"$_deqp_path/framework/delibs/dethread/win32/deMutexWin32.c", "$_deqp_path/framework/delibs/dethread/win32/deMutexWin32.c",
"$_deqp_path/framework/delibs/dethread/win32/deSemaphoreWin32.c", "$_deqp_path/framework/delibs/dethread/win32/deSemaphoreWin32.c",
"$_deqp_path/framework/delibs/dethread/win32/deThreadLocalWin32.c", "$_deqp_path/framework/delibs/dethread/win32/deThreadLocalWin32.c",
"$_deqp_path/framework/delibs/dethread/win32/deThreadWin32.c", "$_deqp_path/framework/delibs/dethread/win32/deThreadWin32.c",
] ]
deqp_libtester_sources_unix = deqp_libtester_sources_unix = [
[
"$_deqp_path/framework/delibs/dethread/unix/deMutexUnix.c", "$_deqp_path/framework/delibs/dethread/unix/deMutexUnix.c",
"$_deqp_path/framework/delibs/dethread/unix/deNamedSemaphoreUnix.c", "$_deqp_path/framework/delibs/dethread/unix/deNamedSemaphoreUnix.c",
"$_deqp_path/framework/delibs/dethread/unix/deSemaphoreUnix.c", "$_deqp_path/framework/delibs/dethread/unix/deSemaphoreUnix.c",
"$_deqp_path/framework/delibs/dethread/unix/deThreadLocalUnix.c", "$_deqp_path/framework/delibs/dethread/unix/deThreadLocalUnix.c",
"$_deqp_path/framework/delibs/dethread/unix/deThreadUnix.c", "$_deqp_path/framework/delibs/dethread/unix/deThreadUnix.c",
] ]
deqp_libtester_sources_android = deqp_libtester_sources_android = [
[
"$_deqp_path/framework/platform/android/tcuAndroidInternals.cpp", "$_deqp_path/framework/platform/android/tcuAndroidInternals.cpp",
"$_deqp_path/framework/platform/android/tcuAndroidInternals.hpp", "$_deqp_path/framework/platform/android/tcuAndroidInternals.hpp",
] ]
deqp_gpu_test_expectations_sources = deqp_gpu_test_expectations_sources = [
[
"third_party/gpu_test_expectations/gpu_info.cc", "third_party/gpu_test_expectations/gpu_info.cc",
"third_party/gpu_test_expectations/gpu_info.h", "third_party/gpu_test_expectations/gpu_info.h",
"third_party/gpu_test_expectations/gpu_test_config.cc", "third_party/gpu_test_expectations/gpu_test_config.cc",
...@@ -1159,8 +1151,7 @@ deqp_gpu_test_expectations_sources = ...@@ -1159,8 +1151,7 @@ deqp_gpu_test_expectations_sources =
"third_party/gpu_test_expectations/gpu_test_expectations_parser.cc", "third_party/gpu_test_expectations/gpu_test_expectations_parser.cc",
"third_party/gpu_test_expectations/gpu_test_expectations_parser.h", "third_party/gpu_test_expectations/gpu_test_expectations_parser.h",
] ]
deqp_gpu_test_expectations_sources_mac = deqp_gpu_test_expectations_sources_mac = [
[
"third_party/gpu_test_expectations/gpu_test_config_mac.mm", "third_party/gpu_test_expectations/gpu_test_config_mac.mm",
"third_party/gpu_test_expectations/gpu_test_config_mac.h", "third_party/gpu_test_expectations/gpu_test_config_mac.h",
] ]
util/util.gyp → util/util.gni
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,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.
util_sources = util_sources = [
[
"com_utils.h", "com_utils.h",
"keyboard.h", "keyboard.h",
"geometry_utils.cpp", "geometry_utils.cpp",
...@@ -24,8 +23,7 @@ util_sources = ...@@ -24,8 +23,7 @@ util_sources =
"OSWindow.h", "OSWindow.h",
"Timer.h", "Timer.h",
] ]
util_win32_sources = util_win32_sources = [
[
"windows/win32/Win32_system_utils.cpp", "windows/win32/Win32_system_utils.cpp",
"windows/win32/Win32Pixmap.cpp", "windows/win32/Win32Pixmap.cpp",
"windows/win32/Win32Pixmap.h", "windows/win32/Win32Pixmap.h",
...@@ -35,8 +33,7 @@ util_win32_sources = ...@@ -35,8 +33,7 @@ util_win32_sources =
"windows/WindowsTimer.cpp", "windows/WindowsTimer.cpp",
"windows/WindowsTimer.h", "windows/WindowsTimer.h",
] ]
util_winrt_sources = util_winrt_sources = [
[
"windows/winrt/WinRT_system_utils.cpp", "windows/winrt/WinRT_system_utils.cpp",
"windows/winrt/WinRTPixmap.cpp", "windows/winrt/WinRTPixmap.cpp",
"windows/winrt/WinRTWindow.cpp", "windows/winrt/WinRTWindow.cpp",
...@@ -45,27 +42,23 @@ util_winrt_sources = ...@@ -45,27 +42,23 @@ util_winrt_sources =
"windows/WindowsTimer.cpp", "windows/WindowsTimer.cpp",
"windows/WindowsTimer.h", "windows/WindowsTimer.h",
] ]
util_linux_sources = util_linux_sources = [
[
"linux/LinuxTimer.cpp", "linux/LinuxTimer.cpp",
"linux/LinuxTimer.h", "linux/LinuxTimer.h",
"posix/Posix_system_utils.cpp", "posix/Posix_system_utils.cpp",
] ]
util_x11_sources = util_x11_sources = [
[
"x11/X11Pixmap.cpp", "x11/X11Pixmap.cpp",
"x11/X11Pixmap.h", "x11/X11Pixmap.h",
"x11/X11Window.cpp", "x11/X11Window.cpp",
"x11/X11Window.h", "x11/X11Window.h",
] ]
util_ozone_sources = util_ozone_sources = [
[
"ozone/OzonePixmap.cpp", "ozone/OzonePixmap.cpp",
"ozone/OzoneWindow.cpp", "ozone/OzoneWindow.cpp",
"ozone/OzoneWindow.h", "ozone/OzoneWindow.h",
] ]
util_osx_sources = util_osx_sources = [
[
"osx/OSXTimer.cpp", "osx/OSXTimer.cpp",
"osx/OSXTimer.h", "osx/OSXTimer.h",
"osx/OSXPixmap.mm", "osx/OSXPixmap.mm",
...@@ -74,8 +67,7 @@ util_osx_sources = ...@@ -74,8 +67,7 @@ util_osx_sources =
"osx/OSXWindow.h", "osx/OSXWindow.h",
"posix/Posix_system_utils.cpp", "posix/Posix_system_utils.cpp",
] ]
util_android_sources = util_android_sources = [
[
"android/AndroidPixmap.cpp", "android/AndroidPixmap.cpp",
"android/AndroidWindow.cpp", "android/AndroidWindow.cpp",
"android/AndroidWindow.h", "android/AndroidWindow.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