Skip to content

A
angle
Commit 468dfed3 by Michael Spang Committed by Commit Bot
Options

Reformat GN files

Otherwise this blocks the CQ at presubmit. Bug: angleproject:3492 Change-Id: I3cf77c72daa358f5e1eabecf1dcb8808a1dc9e07 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2068538 Commit-Queue: Michael Spang <spang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent eacec98a
Showing with 207 additions and 339 deletions
android/angle_apk.gni
...@@ -31,9 +31,7 @@ if (enable_java_templates) { ...@@ -31,9 +31,7 @@ if (enable_java_templates) {
android_assets("${invoker.package_name}_assets") { android_assets("${invoker.package_name}_assets") {
disable_compression = true disable_compression = true
sources = [ sources = [ "src/feature_support_util/a4a_rules.json" ]
"src/feature_support_util/a4a_rules.json",
]
} }
android_apk(target_name) { android_apk(target_name) {
...@@ -42,9 +40,7 @@ if (enable_java_templates) { ...@@ -42,9 +40,7 @@ if (enable_java_templates) {
android_manifest_dep = ":$manifest_target_name" android_manifest_dep = ":$manifest_target_name"
min_sdk_version = 26 min_sdk_version = 26
target_sdk_version = 28 target_sdk_version = 28
deps = [ deps = [ ":${invoker.package_name}_assets" ]
":${invoker.package_name}_assets",
]
if (symbol_level != 0) { if (symbol_level != 0) {
deps += [ ":compressed_symbols" ] deps += [ ":compressed_symbols" ]
if (android_64bit_target_cpu) { if (android_64bit_target_cpu) {
......
samples/BUILD.gn
...@@ -48,9 +48,7 @@ template("angle_sample") { ...@@ -48,9 +48,7 @@ template("angle_sample") {
if (defined(invoker.data)) { if (defined(invoker.data)) {
copy(target_name + "_data") { copy(target_name + "_data") {
sources = invoker.data sources = invoker.data
outputs = [ outputs = [ "$root_out_dir/{{source_file_part}}" ]
"$root_out_dir/{{source_file_part}}",
]
} }
} }
...@@ -62,9 +60,7 @@ template("angle_sample") { ...@@ -62,9 +60,7 @@ template("angle_sample") {
"defines", "defines",
"sources", "sources",
]) ])
deps = [ deps = [ ":sample_util" ]
":sample_util",
]
if (defined(invoker.data)) { if (defined(invoker.data)) {
deps += [ ":${target_name}_data" ] deps += [ ":${target_name}_data" ]
} }
...@@ -76,21 +72,15 @@ template("angle_sample") { ...@@ -76,21 +72,15 @@ template("angle_sample") {
} }
angle_sample("hello_triangle") { angle_sample("hello_triangle") {
sources = [ sources = [ "hello_triangle/HelloTriangle.cpp" ]
"hello_triangle/HelloTriangle.cpp",
]
} }
angle_sample("mip_map_2d") { angle_sample("mip_map_2d") {
sources = [ sources = [ "mip_map_2d/MipMap2D.cpp" ]
"mip_map_2d/MipMap2D.cpp",
]
} }
angle_sample("multi_texture") { angle_sample("multi_texture") {
sources = [ sources = [ "multi_texture/MultiTexture.cpp" ]
"multi_texture/MultiTexture.cpp",
]
data = [ data = [
"multi_texture/basemap.tga", "multi_texture/basemap.tga",
"multi_texture/lightmap.tga", "multi_texture/lightmap.tga",
...@@ -98,15 +88,11 @@ angle_sample("multi_texture") { ...@@ -98,15 +88,11 @@ angle_sample("multi_texture") {
} }
angle_sample("multi_window") { angle_sample("multi_window") {
sources = [ sources = [ "multi_window/MultiWindow.cpp" ]
"multi_window/MultiWindow.cpp",
]
} }
angle_sample("multiple_draw_buffers") { angle_sample("multiple_draw_buffers") {
sources = [ sources = [ "multiple_draw_buffers/MultipleDrawBuffers.cpp" ]
"multiple_draw_buffers/MultipleDrawBuffers.cpp",
]
data = [ data = [
"multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl", "multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl",
"multiple_draw_buffers/multiple_draw_buffers_fs.glsl", "multiple_draw_buffers/multiple_draw_buffers_fs.glsl",
...@@ -115,108 +101,72 @@ angle_sample("multiple_draw_buffers") { ...@@ -115,108 +101,72 @@ angle_sample("multiple_draw_buffers") {
} }
angle_sample("multiview") { angle_sample("multiview") {
sources = [ sources = [ "multiview/Multiview.cpp" ]
"multiview/Multiview.cpp",
]
} }
angle_sample("particle_system") { angle_sample("particle_system") {
sources = [ sources = [ "particle_system/ParticleSystem.cpp" ]
"particle_system/ParticleSystem.cpp", data = [ "particle_system/smoke.tga" ]
]
data = [
"particle_system/smoke.tga",
]
} }
angle_sample("post_sub_buffer") { angle_sample("post_sub_buffer") {
sources = [ sources = [ "post_sub_buffer/PostSubBuffer.cpp" ]
"post_sub_buffer/PostSubBuffer.cpp",
]
} }
angle_sample("simple_instancing") { angle_sample("simple_instancing") {
sources = [ sources = [ "simple_instancing/SimpleInstancing.cpp" ]
"simple_instancing/SimpleInstancing.cpp",
]
} }
angle_sample("simple_texture_2d") { angle_sample("simple_texture_2d") {
sources = [ sources = [ "simple_texture_2d/SimpleTexture2D.cpp" ]
"simple_texture_2d/SimpleTexture2D.cpp",
]
} }
angle_sample("simple_texture_cubemap") { angle_sample("simple_texture_cubemap") {
sources = [ sources = [ "simple_texture_cubemap/SimpleTextureCubemap.cpp" ]
"simple_texture_cubemap/SimpleTextureCubemap.cpp",
]
} }
angle_sample("simple_vertex_shader") { angle_sample("simple_vertex_shader") {
sources = [ sources = [ "simple_vertex_shader/SimpleVertexShader.cpp" ]
"simple_vertex_shader/SimpleVertexShader.cpp",
]
} }
angle_sample("stencil_operations") { angle_sample("stencil_operations") {
sources = [ sources = [ "stencil_operations/StencilOperations.cpp" ]
"stencil_operations/StencilOperations.cpp",
]
} }
angle_sample("tex_redef_microbench") { angle_sample("tex_redef_microbench") {
sources = [ sources = [ "tex_redef_microbench/TexRedefMicroBench.cpp" ]
"tex_redef_microbench/TexRedefMicroBench.cpp",
]
} }
angle_sample("texture_wrap") { angle_sample("texture_wrap") {
sources = [ sources = [ "texture_wrap/TextureWrap.cpp" ]
"texture_wrap/TextureWrap.cpp",
]
} }
angle_sample("tri_fan_microbench") { angle_sample("tri_fan_microbench") {
sources = [ sources = [ "tri_fan_microbench/TriFanMicroBench.cpp" ]
"tri_fan_microbench/TriFanMicroBench.cpp",
]
} }
angle_sample("window_test") { angle_sample("window_test") {
sources = [ sources = [ "WindowTest/WindowTest.cpp" ]
"WindowTest/WindowTest.cpp",
]
} }
angle_sample("gles1_hello_triangle") { angle_sample("gles1_hello_triangle") {
sources = [ sources = [ "gles1/HelloTriangle.cpp" ]
"gles1/HelloTriangle.cpp",
]
} }
angle_sample("gles1_simple_texture_2d") { angle_sample("gles1_simple_texture_2d") {
sources = [ sources = [ "gles1/SimpleTexture2D.cpp" ]
"gles1/SimpleTexture2D.cpp",
]
} }
angle_sample("gles1_simple_lighting") { angle_sample("gles1_simple_lighting") {
sources = [ sources = [ "gles1/SimpleLighting.cpp" ]
"gles1/SimpleLighting.cpp",
]
} }
angle_sample("gles1_flat_shading") { angle_sample("gles1_flat_shading") {
sources = [ sources = [ "gles1/FlatShading.cpp" ]
"gles1/FlatShading.cpp",
]
} }
angle_sample("gles1_draw_texture") { angle_sample("gles1_draw_texture") {
sources = [ sources = [ "gles1/DrawTexture.cpp" ]
"gles1/DrawTexture.cpp",
]
} }
if (angle_build_capture_replay_sample) { if (angle_build_capture_replay_sample) {
......
scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"scripts/gen_vk_gl_cts_build.py": "scripts/gen_vk_gl_cts_build.py":
"51d73f5dda6cd0afac2b241bf95805dd", "51d73f5dda6cd0afac2b241bf95805dd",
"src/tests/deqp_support/BUILD.gn": "src/tests/deqp_support/BUILD.gn":
"aac9fd64107cccdd0f3d47d37974ba67", "860cc9b728dc35454b0d527651cc47de",
"src/tests/deqp_support/deqp_data_autogen.gni": "src/tests/deqp_support/deqp_data_autogen.gni":
"3a74e9e404a9b1a4ff1a78d8a640c472", "3a74e9e404a9b1a4ff1a78d8a640c472",
"third_party/VK-GL-CTS/src/CMakeLists.txt": "third_party/VK-GL-CTS/src/CMakeLists.txt":
......
src/common/fuchsia_egl/BUILD.gn
...@@ -11,20 +11,12 @@ config("config") { ...@@ -11,20 +11,12 @@ config("config") {
} }
angle_shared_library("fuchsia_egl") { angle_shared_library("fuchsia_egl") {
sources = [ sources = [ "fuchsia_egl.c" ]
"fuchsia_egl.c", public = [ "fuchsia_egl.h" ]
] public_configs = [ ":config" ]
public = [ deps = [ ":backend" ]
"fuchsia_egl.h",
]
public_configs = [":config"]
deps = [
":backend",
]
} }
angle_source_set("backend") { angle_source_set("backend") {
public = [ public = [ "fuchsia_egl_backend.h" ]
"fuchsia_egl_backend.h",
]
} }
src/libANGLE/renderer/metal/BUILD.gn
...@@ -17,8 +17,8 @@ _metal_backend_sources = [ ...@@ -17,8 +17,8 @@ _metal_backend_sources = [
"ContextMtl.h", "ContextMtl.h",
"ContextMtl.mm", "ContextMtl.mm",
"DisplayMtl.h", "DisplayMtl.h",
"DisplayMtl_api.h",
"DisplayMtl.mm", "DisplayMtl.mm",
"DisplayMtl_api.h",
"FrameBufferMtl.h", "FrameBufferMtl.h",
"FrameBufferMtl.mm", "FrameBufferMtl.mm",
"ProgramMtl.h", "ProgramMtl.h",
...@@ -54,8 +54,8 @@ _metal_backend_sources = [ ...@@ -54,8 +54,8 @@ _metal_backend_sources = [
"mtl_state_cache.mm", "mtl_state_cache.mm",
"mtl_utils.h", "mtl_utils.h",
"mtl_utils.mm", "mtl_utils.mm",
"shaders/mtl_default_shaders_src_autogen.inc",
"shaders/compiled/mtl_default_shaders.inc", "shaders/compiled/mtl_default_shaders.inc",
"shaders/mtl_default_shaders_src_autogen.inc",
] ]
config("angle_metal_backend_config") { config("angle_metal_backend_config") {
...@@ -83,9 +83,7 @@ angle_source_set("angle_metal_backend") { ...@@ -83,9 +83,7 @@ angle_source_set("angle_metal_backend") {
"${angle_root}:libANGLE_headers", "${angle_root}:libANGLE_headers",
] ]
deps = [ deps = [ "${angle_spirv_cross_dir}/gn:spirv_cross_sources" ]
"${angle_spirv_cross_dir}/gn:spirv_cross_sources",
]
objc_flags = [ objc_flags = [
"-Wno-nullability-completeness", "-Wno-nullability-completeness",
......
src/tests/BUILD.gn
...@@ -24,9 +24,7 @@ angle_test("test_utils_unittest_helper") { ...@@ -24,9 +24,7 @@ angle_test("test_utils_unittest_helper") {
"test_utils/runner/TestSuite_unittest.cpp", "test_utils/runner/TestSuite_unittest.cpp",
] ]
deps = [ deps = [ "$angle_root:angle_common" ]
"$angle_root:angle_common",
]
} }
test_expectations_sources = [ test_expectations_sources = [
...@@ -81,9 +79,7 @@ angle_test("angle_unittests") { ...@@ -81,9 +79,7 @@ angle_test("angle_unittests") {
if (!is_android && !is_fuchsia) { if (!is_android && !is_fuchsia) {
# SystemUtils.RunApp, the only unittest using a helper binary, is not supported on these # SystemUtils.RunApp, the only unittest using a helper binary, is not supported on these
# platforms yet. # platforms yet.
data_deps = [ data_deps = [ ":test_utils_unittest_helper" ]
":test_utils_unittest_helper",
]
} }
} }
...@@ -477,9 +473,7 @@ if (build_angle_gles1_conform_tests) { ...@@ -477,9 +473,7 @@ if (build_angle_gles1_conform_tests) {
} }
angle_test("angle_gles1_conformance_tests") { angle_test("angle_gles1_conformance_tests") {
deps = [ deps = [ ":angle_gles1_conformance_no_gtest" ]
":angle_gles1_conformance_no_gtest",
]
include_dirs = [ "." ] include_dirs = [ "." ]
...@@ -543,7 +537,8 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -543,7 +537,8 @@ if (build_angle_deqp_tests && !is_fuchsia) {
"/wd4701", # potentially uninit used "/wd4701", # potentially uninit used
"/wd4702", # unreachable code "/wd4702", # unreachable code
"/wd4706", # assignment within conditional expression "/wd4706", # assignment within conditional expression
"/wd4834", # discarding return value of function with 'nodiscard' attribute "/wd4834", # discarding return value of function with 'nodiscard'
# attribute
"/wd4838", # conversion requires a narrowing conversion "/wd4838", # conversion requires a narrowing conversion
"/wd4996", # deprecated "/wd4996", # deprecated
] ]
...@@ -571,10 +566,12 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -571,10 +566,12 @@ if (build_angle_deqp_tests && !is_fuchsia) {
cflags_c = [ "-Wno-unused-local-typedef" ] cflags_c = [ "-Wno-unused-local-typedef" ]
cflags_cc = [ cflags_cc = [
"-Wno-sizeof-array-div", # https://gitlab.khronos.org/Tracker/vk-gl-cts/issues/2127 "-Wno-sizeof-array-div", # https://gitlab.khronos.org/Tracker/vk-gl-cts/issues/2127
"-Wno-string-conversion", # implicit conversion turns string literal into bool "-Wno-string-conversion", # implicit conversion turns string literal
# into bool
"-Wno-unused-function", "-Wno-unused-function",
"-Wno-unused-local-typedef", "-Wno-unused-local-typedef",
"-Wno-unused-result", # ignoring return value of function declared with 'nodiscard' attribute "-Wno-unused-result", # ignoring return value of function declared with
# 'nodiscard' attribute
] ]
} }
...@@ -704,9 +701,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -704,9 +701,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
":angle_deqp_support", ":angle_deqp_support",
] ]
public_deps = [ public_deps = [ ":angle_deqp_framework_debase" ]
":angle_deqp_framework_debase",
]
} }
config("angle_deqp_framework_common_config") { config("angle_deqp_framework_common_config") {
...@@ -737,9 +732,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -737,9 +732,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
angle_deqp_source_set("angle_deqp_framework_opengl") { angle_deqp_source_set("angle_deqp_framework_opengl") {
sources = deqp_framework_opengl_sources sources = deqp_framework_opengl_sources
public_configs = [ ":angle_deqp_framework_opengl_config" ] public_configs = [ ":angle_deqp_framework_opengl_config" ]
public_deps = [ public_deps = [ ":angle_deqp_framework_common" ]
":angle_deqp_framework_common",
]
} }
config("angle_deqp_framework_egl_config") { config("angle_deqp_framework_egl_config") {
...@@ -752,9 +745,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -752,9 +745,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
angle_deqp_source_set("angle_deqp_framework_egl") { angle_deqp_source_set("angle_deqp_framework_egl") {
sources = deqp_framework_egl_sources sources = deqp_framework_egl_sources
public_configs = [ ":angle_deqp_framework_egl_config" ] public_configs = [ ":angle_deqp_framework_egl_config" ]
public_deps = [ public_deps = [ ":angle_deqp_framework_opengl" ]
":angle_deqp_framework_opengl",
]
} }
config("angle_deqp_framework_qphelper_config") { config("angle_deqp_framework_qphelper_config") {
...@@ -776,9 +767,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -776,9 +767,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
angle_deqp_source_set("angle_deqp_glshared") { angle_deqp_source_set("angle_deqp_glshared") {
sources = deqp_glshared_sources sources = deqp_glshared_sources
public_deps = [ public_deps = [ ":angle_deqp_framework_opengl" ]
":angle_deqp_framework_opengl",
]
public_configs = [ ":angle_deqp_glshared_config" ] public_configs = [ ":angle_deqp_glshared_config" ]
} }
...@@ -855,12 +844,8 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -855,12 +844,8 @@ if (build_angle_deqp_tests && !is_fuchsia) {
if (!build_with_chromium) { if (!build_with_chromium) {
angle_executable("angle_deqp_${_api}_no_gtest") { angle_executable("angle_deqp_${_api}_no_gtest") {
testonly = true testonly = true
sources = [ sources = [ "deqp_support/angle_deqp_tests_main.cpp" ]
"deqp_support/angle_deqp_tests_main.cpp", deps = [ ":$shared_library_name" ]
]
deps = [
":$shared_library_name",
]
} }
} }
...@@ -873,9 +858,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -873,9 +858,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
] ]
# Must be included outside of the source set for the define # Must be included outside of the source set for the define
sources = [ sources = [ "deqp_support/angle_deqp_gtest.cpp" ]
"deqp_support/angle_deqp_gtest.cpp",
]
main = "angle_deqp_tests_main" main = "angle_deqp_tests_main"
data = [ data = [
...@@ -909,9 +892,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -909,9 +892,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
data = angle_deqp_data_gles31 data = angle_deqp_data_gles31
} else { } else {
# Make sure we include something so that angle_deqp_libtester_main.cpp can find something. # Make sure we include something so that angle_deqp_libtester_main.cpp can find something.
data = [ data = [ "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/misc.test" ]
"$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/misc.test",
]
} }
} }
} }
...@@ -953,7 +934,8 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -953,7 +934,8 @@ if (build_angle_deqp_tests && !is_fuchsia) {
"$deqp_path/external/openglcts/modules/glesext", "$deqp_path/external/openglcts/modules/glesext",
] ]
if (is_clang) { if (is_clang) {
cflags = [ "-Wno-header-hygiene" ] # using namespace directive in global context in header cflags = [ "-Wno-header-hygiene" ] # using namespace directive in global
# context in header
} }
} }
...@@ -978,9 +960,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -978,9 +960,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
template("angle_deqp_khr_gtest") { template("angle_deqp_khr_gtest") {
angle_deqp_gtest(target_name) { angle_deqp_gtest(target_name) {
forward_variables_from(invoker, "*") forward_variables_from(invoker, "*")
deps = [ deps = [ ":angle_deqp_khr_common" ]
":angle_deqp_khr_common",
]
deps += angle_deqp_data_copy_targets deps += angle_deqp_data_copy_targets
data = angle_deqp_external_openglcts_data_gles3 data = angle_deqp_external_openglcts_data_gles3
mustpass_dir = _khronos_mustpass mustpass_dir = _khronos_mustpass
......
src/tests/angle_end2end_tests.gni
...@@ -3,14 +3,32 @@ ...@@ -3,14 +3,32 @@
# found in the LICENSE file. # found in the LICENSE file.
angle_end2end_tests_sources = [ angle_end2end_tests_sources = [
"egl_tests/EGLAndroidFrameBufferTargetTest.cpp",
"egl_tests/EGLBackwardsCompatibleContextTest.cpp",
"egl_tests/EGLBlobCacheTest.cpp",
"egl_tests/EGLChooseConfigTest.cpp",
"egl_tests/EGLContextCompatibilityTest.cpp",
"egl_tests/EGLContextSharingTest.cpp",
"egl_tests/EGLCreateContextAttribsTest.cpp",
"egl_tests/EGLDebugTest.cpp",
"egl_tests/EGLNoConfigContextTest.cpp",
"egl_tests/EGLPrintEGLinfoTest.cpp",
"egl_tests/EGLProgramCacheControlTest.cpp",
"egl_tests/EGLQueryContextTest.cpp",
"egl_tests/EGLRecordableTest.cpp",
"egl_tests/EGLRobustnessTest.cpp",
"egl_tests/EGLSanityCheckTest.cpp",
"egl_tests/EGLSurfaceTest.cpp",
"egl_tests/EGLSurfacelessContextTest.cpp",
"egl_tests/EGLSyncTest.cpp",
"gl_tests/AtomicCounterBufferTest.cpp", "gl_tests/AtomicCounterBufferTest.cpp",
"gl_tests/AttributeLayoutTest.cpp", "gl_tests/AttributeLayoutTest.cpp",
"gl_tests/BPTCCompressedTextureTest.cpp",
"gl_tests/BindGeneratesResourceTest.cpp", "gl_tests/BindGeneratesResourceTest.cpp",
"gl_tests/BindUniformLocationTest.cpp", "gl_tests/BindUniformLocationTest.cpp",
"gl_tests/BlendFuncExtendedTest.cpp", "gl_tests/BlendFuncExtendedTest.cpp",
"gl_tests/BlendMinMaxTest.cpp", "gl_tests/BlendMinMaxTest.cpp",
"gl_tests/BlitFramebufferANGLETest.cpp", "gl_tests/BlitFramebufferANGLETest.cpp",
"gl_tests/BPTCCompressedTextureTest.cpp",
"gl_tests/BufferDataTest.cpp", "gl_tests/BufferDataTest.cpp",
"gl_tests/BuiltinVariableTest.cpp", "gl_tests/BuiltinVariableTest.cpp",
"gl_tests/ClearTest.cpp", "gl_tests/ClearTest.cpp",
...@@ -20,9 +38,11 @@ angle_end2end_tests_sources = [ ...@@ -20,9 +38,11 @@ angle_end2end_tests_sources = [
"gl_tests/ContextLostTest.cpp", "gl_tests/ContextLostTest.cpp",
"gl_tests/CopyCompressedTextureTest.cpp", "gl_tests/CopyCompressedTextureTest.cpp",
"gl_tests/CopyTexImageTest.cpp", "gl_tests/CopyTexImageTest.cpp",
"gl_tests/CopyTextureTest.cpp",
"gl_tests/CopyTexture3DTest.cpp", "gl_tests/CopyTexture3DTest.cpp",
"gl_tests/CopyTextureTest.cpp",
"gl_tests/CubeMapTextureTest.cpp", "gl_tests/CubeMapTextureTest.cpp",
"gl_tests/DXT1CompressedTextureTest.cpp",
"gl_tests/DXTSRGBCompressedTextureTest.cpp",
"gl_tests/DebugMarkerTest.cpp", "gl_tests/DebugMarkerTest.cpp",
"gl_tests/DebugTest.cpp", "gl_tests/DebugTest.cpp",
"gl_tests/DepthStencilFormatsTest.cpp", "gl_tests/DepthStencilFormatsTest.cpp",
...@@ -32,8 +52,6 @@ angle_end2end_tests_sources = [ ...@@ -32,8 +52,6 @@ angle_end2end_tests_sources = [
"gl_tests/DrawBaseVertexBaseInstanceTest.cpp", "gl_tests/DrawBaseVertexBaseInstanceTest.cpp",
"gl_tests/DrawBuffersTest.cpp", "gl_tests/DrawBuffersTest.cpp",
"gl_tests/DrawElementsTest.cpp", "gl_tests/DrawElementsTest.cpp",
"gl_tests/DXT1CompressedTextureTest.cpp",
"gl_tests/DXTSRGBCompressedTextureTest.cpp",
"gl_tests/ETCTextureTest.cpp", "gl_tests/ETCTextureTest.cpp",
"gl_tests/ExplicitContextTest.cpp", "gl_tests/ExplicitContextTest.cpp",
"gl_tests/FenceSyncTests.cpp", "gl_tests/FenceSyncTests.cpp",
...@@ -42,33 +60,9 @@ angle_end2end_tests_sources = [ ...@@ -42,33 +60,9 @@ angle_end2end_tests_sources = [
"gl_tests/FramebufferMultiviewTest.cpp", "gl_tests/FramebufferMultiviewTest.cpp",
"gl_tests/FramebufferRenderMipmapTest.cpp", "gl_tests/FramebufferRenderMipmapTest.cpp",
"gl_tests/FramebufferTest.cpp", "gl_tests/FramebufferTest.cpp",
"gl_tests/GLSLTest.cpp",
"gl_tests/GeometryShaderTest.cpp", "gl_tests/GeometryShaderTest.cpp",
"gl_tests/GetImageTest.cpp", "gl_tests/GetImageTest.cpp",
"gl_tests/gles1/AlphaFuncTest.cpp",
"gl_tests/gles1/BasicDrawTest.cpp",
"gl_tests/gles1/ClientActiveTextureTest.cpp",
"gl_tests/gles1/ClientStateEnable.cpp",
"gl_tests/gles1/ClipPlaneTest.cpp",
"gl_tests/gles1/CurrentColorTest.cpp",
"gl_tests/gles1/CurrentNormalTest.cpp",
"gl_tests/gles1/CurrentTextureCoordsTest.cpp",
"gl_tests/gles1/DrawTextureTest.cpp",
"gl_tests/gles1/FogTest.cpp",
"gl_tests/gles1/MaterialsTest.cpp",
"gl_tests/gles1/MatrixBuiltinsTest.cpp",
"gl_tests/gles1/MatrixLoadTest.cpp",
"gl_tests/gles1/MatrixModeTest.cpp",
"gl_tests/gles1/MatrixMultTest.cpp",
"gl_tests/gles1/MatrixStackTest.cpp",
"gl_tests/gles1/LightsTest.cpp",
"gl_tests/gles1/PointParameterTest.cpp",
"gl_tests/gles1/PointSpriteTest.cpp",
"gl_tests/gles1/ShadeModelTest.cpp",
"gl_tests/gles1/TextureEnvTest.cpp",
"gl_tests/gles1/TextureParameterTest.cpp",
"gl_tests/gles1/TextureTargetEnableTest.cpp",
"gl_tests/gles1/VertexPointerTest.cpp",
"gl_tests/GLSLTest.cpp",
"gl_tests/ImageTest.cpp", "gl_tests/ImageTest.cpp",
"gl_tests/IncompleteTextureTest.cpp", "gl_tests/IncompleteTextureTest.cpp",
"gl_tests/IndexBufferOffsetTest.cpp", "gl_tests/IndexBufferOffsetTest.cpp",
...@@ -78,29 +72,28 @@ angle_end2end_tests_sources = [ ...@@ -78,29 +72,28 @@ angle_end2end_tests_sources = [
"gl_tests/LinkAndRelinkTest.cpp", "gl_tests/LinkAndRelinkTest.cpp",
"gl_tests/MatrixTest.cpp", "gl_tests/MatrixTest.cpp",
"gl_tests/MaxTextureSizeTest.cpp", "gl_tests/MaxTextureSizeTest.cpp",
"gl_tests/MemorySizeTest.cpp",
"gl_tests/MemoryObjectTest.cpp", "gl_tests/MemoryObjectTest.cpp",
"gl_tests/MemorySizeTest.cpp",
"gl_tests/MipmapTest.cpp", "gl_tests/MipmapTest.cpp",
"gl_tests/MultiDrawTest.cpp", "gl_tests/MultiDrawTest.cpp",
"gl_tests/MultisampleCompatibilityTest.cpp", "gl_tests/MultisampleCompatibilityTest.cpp",
"gl_tests/MultisampledRenderToTextureTest.cpp",
"gl_tests/MultisampleTest.cpp", "gl_tests/MultisampleTest.cpp",
"gl_tests/MultisampledRenderToTextureTest.cpp",
"gl_tests/MultithreadingTest.cpp", "gl_tests/MultithreadingTest.cpp",
"gl_tests/MultiviewDrawTest.cpp", "gl_tests/MultiviewDrawTest.cpp",
"gl_tests/media/pixel.inc", "gl_tests/ObjectAllocationTest.cpp",
"gl_tests/OcclusionQueriesTest.cpp",
"gl_tests/PBOExtensionTest.cpp",
"gl_tests/PackUnpackTest.cpp", "gl_tests/PackUnpackTest.cpp",
"gl_tests/ParallelShaderCompileTest.cpp",
"gl_tests/PathRenderingTest.cpp", "gl_tests/PathRenderingTest.cpp",
"gl_tests/PbufferTest.cpp", "gl_tests/PbufferTest.cpp",
"gl_tests/PBOExtensionTest.cpp",
"gl_tests/PointSpritesTest.cpp", "gl_tests/PointSpritesTest.cpp",
"gl_tests/ProvokingVertexTest.cpp",
"gl_tests/ObjectAllocationTest.cpp",
"gl_tests/OcclusionQueriesTest.cpp",
"gl_tests/ParallelShaderCompileTest.cpp",
"gl_tests/ProgramBinaryTest.cpp", "gl_tests/ProgramBinaryTest.cpp",
"gl_tests/ProgramInterfaceTest.cpp", "gl_tests/ProgramInterfaceTest.cpp",
"gl_tests/ProgramParameterTest.cpp", "gl_tests/ProgramParameterTest.cpp",
"gl_tests/ProgramPipelineTest.cpp", "gl_tests/ProgramPipelineTest.cpp",
"gl_tests/ProvokingVertexTest.cpp",
"gl_tests/ReadPixelsTest.cpp", "gl_tests/ReadPixelsTest.cpp",
"gl_tests/RenderbufferMultisampleTest.cpp", "gl_tests/RenderbufferMultisampleTest.cpp",
"gl_tests/RendererTest.cpp", "gl_tests/RendererTest.cpp",
...@@ -108,13 +101,13 @@ angle_end2end_tests_sources = [ ...@@ -108,13 +101,13 @@ angle_end2end_tests_sources = [
"gl_tests/RobustBufferAccessBehaviorTest.cpp", "gl_tests/RobustBufferAccessBehaviorTest.cpp",
"gl_tests/RobustClientMemoryTest.cpp", "gl_tests/RobustClientMemoryTest.cpp",
"gl_tests/RobustResourceInitTest.cpp", "gl_tests/RobustResourceInitTest.cpp",
"gl_tests/SRGBFramebufferTest.cpp",
"gl_tests/SRGBTextureTest.cpp",
"gl_tests/SamplersTest.cpp", "gl_tests/SamplersTest.cpp",
"gl_tests/SemaphoreTest.cpp", "gl_tests/SemaphoreTest.cpp",
"gl_tests/ShaderStorageBufferTest.cpp", "gl_tests/ShaderStorageBufferTest.cpp",
"gl_tests/SimpleOperationTest.cpp", "gl_tests/SimpleOperationTest.cpp",
"gl_tests/SixteenBppTextureTest.cpp", "gl_tests/SixteenBppTextureTest.cpp",
"gl_tests/SRGBFramebufferTest.cpp",
"gl_tests/SRGBTextureTest.cpp",
"gl_tests/StateChangeTest.cpp", "gl_tests/StateChangeTest.cpp",
"gl_tests/SwizzleTest.cpp", "gl_tests/SwizzleTest.cpp",
"gl_tests/SyncQueriesTest.cpp", "gl_tests/SyncQueriesTest.cpp",
...@@ -131,53 +124,60 @@ angle_end2end_tests_sources = [ ...@@ -131,53 +124,60 @@ angle_end2end_tests_sources = [
"gl_tests/UnpackRowLength.cpp", "gl_tests/UnpackRowLength.cpp",
"gl_tests/VertexAttributeTest.cpp", "gl_tests/VertexAttributeTest.cpp",
"gl_tests/ViewportTest.cpp", "gl_tests/ViewportTest.cpp",
"gl_tests/WEBGLVideoTextureTest.cpp",
"gl_tests/WebGLCompatibilityTest.cpp", "gl_tests/WebGLCompatibilityTest.cpp",
"gl_tests/WebGLFramebufferTest.cpp", "gl_tests/WebGLFramebufferTest.cpp",
"gl_tests/WebGLReadOutsideFramebufferTest.cpp", "gl_tests/WebGLReadOutsideFramebufferTest.cpp",
"gl_tests/WEBGLVideoTextureTest.cpp", "gl_tests/gles1/AlphaFuncTest.cpp",
"egl_tests/EGLAndroidFrameBufferTargetTest.cpp", "gl_tests/gles1/BasicDrawTest.cpp",
"egl_tests/EGLBackwardsCompatibleContextTest.cpp", "gl_tests/gles1/ClientActiveTextureTest.cpp",
"egl_tests/EGLBlobCacheTest.cpp", "gl_tests/gles1/ClientStateEnable.cpp",
"egl_tests/EGLChooseConfigTest.cpp", "gl_tests/gles1/ClipPlaneTest.cpp",
"egl_tests/EGLContextCompatibilityTest.cpp", "gl_tests/gles1/CurrentColorTest.cpp",
"egl_tests/EGLContextSharingTest.cpp", "gl_tests/gles1/CurrentNormalTest.cpp",
"egl_tests/EGLCreateContextAttribsTest.cpp", "gl_tests/gles1/CurrentTextureCoordsTest.cpp",
"egl_tests/EGLDebugTest.cpp", "gl_tests/gles1/DrawTextureTest.cpp",
"egl_tests/EGLNoConfigContextTest.cpp", "gl_tests/gles1/FogTest.cpp",
"egl_tests/EGLPrintEGLinfoTest.cpp", "gl_tests/gles1/LightsTest.cpp",
"egl_tests/EGLProgramCacheControlTest.cpp", "gl_tests/gles1/MaterialsTest.cpp",
"egl_tests/EGLQueryContextTest.cpp", "gl_tests/gles1/MatrixBuiltinsTest.cpp",
"egl_tests/EGLRecordableTest.cpp", "gl_tests/gles1/MatrixLoadTest.cpp",
"egl_tests/EGLRobustnessTest.cpp", "gl_tests/gles1/MatrixModeTest.cpp",
"egl_tests/EGLSanityCheckTest.cpp", "gl_tests/gles1/MatrixMultTest.cpp",
"egl_tests/EGLSurfacelessContextTest.cpp", "gl_tests/gles1/MatrixStackTest.cpp",
"egl_tests/EGLSurfaceTest.cpp", "gl_tests/gles1/PointParameterTest.cpp",
"egl_tests/EGLSyncTest.cpp", "gl_tests/gles1/PointSpriteTest.cpp",
"gl_tests/gles1/ShadeModelTest.cpp",
"gl_tests/gles1/TextureEnvTest.cpp",
"gl_tests/gles1/TextureParameterTest.cpp",
"gl_tests/gles1/TextureTargetEnableTest.cpp",
"gl_tests/gles1/VertexPointerTest.cpp",
"gl_tests/media/pixel.inc",
"test_expectations/GPUTestExpectationsTest.cpp", "test_expectations/GPUTestExpectationsTest.cpp",
"test_utils/ANGLETest.cpp", "test_utils/ANGLETest.cpp",
"test_utils/ANGLETest.h", "test_utils/ANGLETest.h",
"test_utils/angle_test_platform.cpp",
"test_utils/angle_test_platform.h",
"test_utils/MultiviewTest.cpp", "test_utils/MultiviewTest.cpp",
"test_utils/MultiviewTest.h", "test_utils/MultiviewTest.h",
"test_utils/angle_test_configs.cpp", "test_utils/angle_test_configs.cpp",
"test_utils/angle_test_configs.h", "test_utils/angle_test_configs.h",
"test_utils/angle_test_instantiate.cpp", "test_utils/angle_test_instantiate.cpp",
"test_utils/angle_test_instantiate.h", "test_utils/angle_test_instantiate.h",
"test_utils/angle_test_platform.cpp",
"test_utils/angle_test_platform.h",
"test_utils/gl_raii.h", "test_utils/gl_raii.h",
] ]
angle_end2end_tests_mac_sources = [ angle_end2end_tests_mac_sources = [
"egl_tests/EGLDeviceCGLTest.cpp", "egl_tests/EGLDeviceCGLTest.cpp",
"egl_tests/EGLIOSurfaceClientBufferTest.cpp", "egl_tests/EGLIOSurfaceClientBufferTest.cpp",
"test_utils/angle_test_instantiate_apple.mm",
"test_utils/angle_test_instantiate_apple.h", "test_utils/angle_test_instantiate_apple.h",
"test_utils/angle_test_instantiate_apple.mm",
] ]
angle_end2end_tests_win_sources = [ angle_end2end_tests_win_sources = [
"gl_tests/D3DImageFormatConversionTest.cpp",
"egl_tests/EGLDeviceTest.cpp", "egl_tests/EGLDeviceTest.cpp",
"egl_tests/EGLPresentPathD3D11Test.cpp", "egl_tests/EGLPresentPathD3D11Test.cpp",
"egl_tests/EGLStreamTest.cpp", "egl_tests/EGLStreamTest.cpp",
"egl_tests/EGLSyncControlTest.cpp", "egl_tests/EGLSyncControlTest.cpp",
"egl_tests/media/yuvtest.inl", "egl_tests/media/yuvtest.inl",
"gl_tests/D3DImageFormatConversionTest.cpp",
] ]
angle_end2end_tests_x11_sources = [ "egl_tests/EGLX11VisualTest.cpp" ] angle_end2end_tests_x11_sources = [ "egl_tests/EGLX11VisualTest.cpp" ]
src/tests/angle_perftests.gni
...@@ -12,19 +12,19 @@ _angle_perf_test_common_sources = [ ...@@ -12,19 +12,19 @@ _angle_perf_test_common_sources = [
"perf_tests/third_party/perf/perf_result_reporter.h", "perf_tests/third_party/perf/perf_result_reporter.h",
"perf_tests/third_party/perf/perf_test.cc", "perf_tests/third_party/perf/perf_test.cc",
"perf_tests/third_party/perf/perf_test.h", "perf_tests/third_party/perf/perf_test.h",
"test_utils/angle_test_platform.cpp",
"test_utils/angle_test_platform.h",
"test_utils/angle_test_configs.cpp", "test_utils/angle_test_configs.cpp",
"test_utils/angle_test_configs.h", "test_utils/angle_test_configs.h",
"test_utils/angle_test_instantiate.cpp", "test_utils/angle_test_instantiate.cpp",
"test_utils/angle_test_instantiate.h", "test_utils/angle_test_instantiate.h",
"test_utils/angle_test_platform.cpp",
"test_utils/angle_test_platform.h",
"test_utils/gl_raii.h", "test_utils/gl_raii.h",
] ]
if (is_mac) { if (is_mac) {
_angle_perf_test_common_sources += [ _angle_perf_test_common_sources += [
"test_utils/angle_test_instantiate_apple.mm",
"test_utils/angle_test_instantiate_apple.h", "test_utils/angle_test_instantiate_apple.h",
"test_utils/angle_test_instantiate_apple.mm",
] ]
} }
...@@ -60,13 +60,15 @@ angle_perf_tests_sources = _angle_perf_test_common_sources + [ ...@@ -60,13 +60,15 @@ angle_perf_tests_sources = _angle_perf_test_common_sources + [
"test_utils/draw_call_perf_utils.h", "test_utils/draw_call_perf_utils.h",
] ]
angle_white_box_perf_tests_sources = _angle_perf_test_common_sources + [ angle_white_box_perf_tests_sources =
"angle_unittests_utils.h", _angle_perf_test_common_sources + [
"perf_tests/BitSetIteratorPerf.cpp", "angle_unittests_utils.h",
"perf_tests/CompilerPerf.cpp", "perf_tests/BitSetIteratorPerf.cpp",
"perf_tests/EGLInitializePerf.cpp", # Uses ANGLEGetDisplayPlatform, a non-standard EP. "perf_tests/CompilerPerf.cpp",
"perf_tests/ResultPerf.cpp", "perf_tests/EGLInitializePerf.cpp", # Uses ANGLEGetDisplayPlatform, a
] # non-standard EP.
"perf_tests/ResultPerf.cpp",
]
angle_white_box_perf_tests_win_sources = angle_white_box_perf_tests_win_sources =
[ "perf_tests/IndexDataManagerTest.cpp" ] [ "perf_tests/IndexDataManagerTest.cpp" ]
......
src/tests/angle_unittests.gni
...@@ -3,10 +3,12 @@ ...@@ -3,10 +3,12 @@
# found in the LICENSE file. # found in the LICENSE file.
angle_unittests_sources = [ angle_unittests_sources = [
"../../util/test_utils_unittest.cpp",
"../../util/test_utils_unittest_helper.h",
"../common/FastVector_unittest.cpp", "../common/FastVector_unittest.cpp",
"../common/FixedVector_unittest.cpp", "../common/FixedVector_unittest.cpp",
"../common/PoolAlloc_unittest.cpp",
"../common/Optional_unittest.cpp", "../common/Optional_unittest.cpp",
"../common/PoolAlloc_unittest.cpp",
"../common/aligned_memory_unittest.cpp", "../common/aligned_memory_unittest.cpp",
"../common/angleutils_unittest.cpp", "../common/angleutils_unittest.cpp",
"../common/bitset_utils_unittest.cpp", "../common/bitset_utils_unittest.cpp",
...@@ -17,6 +19,7 @@ angle_unittests_sources = [ ...@@ -17,6 +19,7 @@ angle_unittests_sources = [
"../common/system_utils_unittest.cpp", "../common/system_utils_unittest.cpp",
"../common/utilities_unittest.cpp", "../common/utilities_unittest.cpp",
"../common/vector_utils_unittest.cpp", "../common/vector_utils_unittest.cpp",
"../compiler/translator/span_unittest.cpp",
"../feature_support_util/feature_support_util_unittest.cpp", "../feature_support_util/feature_support_util_unittest.cpp",
"../gpu_info_util/SystemInfo_unittest.cpp", "../gpu_info_util/SystemInfo_unittest.cpp",
"../libANGLE/BinaryStream_unittest.cpp", "../libANGLE/BinaryStream_unittest.cpp",
...@@ -25,8 +28,8 @@ angle_unittests_sources = [ ...@@ -25,8 +28,8 @@ angle_unittests_sources = [
"../libANGLE/Fence_unittest.cpp", "../libANGLE/Fence_unittest.cpp",
"../libANGLE/HandleAllocator_unittest.cpp", "../libANGLE/HandleAllocator_unittest.cpp",
"../libANGLE/HandleRangeAllocator_unittest.cpp", "../libANGLE/HandleRangeAllocator_unittest.cpp",
"../libANGLE/Image_unittest.cpp",
"../libANGLE/ImageIndexIterator_unittest.cpp", "../libANGLE/ImageIndexIterator_unittest.cpp",
"../libANGLE/Image_unittest.cpp",
"../libANGLE/Observer_unittest.cpp", "../libANGLE/Observer_unittest.cpp",
"../libANGLE/Program_unittest.cpp", "../libANGLE/Program_unittest.cpp",
"../libANGLE/ResourceManager_unittest.cpp", "../libANGLE/ResourceManager_unittest.cpp",
...@@ -39,44 +42,45 @@ angle_unittests_sources = [ ...@@ -39,44 +42,45 @@ angle_unittests_sources = [
"../libANGLE/WorkerThread_unittest.cpp", "../libANGLE/WorkerThread_unittest.cpp",
"../libANGLE/renderer/BufferImpl_mock.h", "../libANGLE/renderer/BufferImpl_mock.h",
"../libANGLE/renderer/FramebufferImpl_mock.h", "../libANGLE/renderer/FramebufferImpl_mock.h",
"../libANGLE/renderer/ImageImpl_mock.h",
"../libANGLE/renderer/ProgramImpl_mock.h", "../libANGLE/renderer/ProgramImpl_mock.h",
"../libANGLE/renderer/RenderbufferImpl_mock.h", "../libANGLE/renderer/RenderbufferImpl_mock.h",
"../libANGLE/renderer/ImageImpl_mock.h",
"../libANGLE/renderer/TextureImpl_mock.h", "../libANGLE/renderer/TextureImpl_mock.h",
"../libANGLE/renderer/TransformFeedbackImpl_mock.h", "../libANGLE/renderer/TransformFeedbackImpl_mock.h",
"../libANGLE/renderer/serial_utils_unittest.cpp", "../libANGLE/renderer/serial_utils_unittest.cpp",
"../compiler/translator/span_unittest.cpp",
"angle_unittests_utils.h", "angle_unittests_utils.h",
"compiler_tests/API_test.cpp", "compiler_tests/API_test.cpp",
"compiler_tests/AppendixALimitations_test.cpp",
"compiler_tests/ARB_texture_rectangle_test.cpp", "compiler_tests/ARB_texture_rectangle_test.cpp",
"compiler_tests/AppendixALimitations_test.cpp",
"compiler_tests/AtomicCounter_test.cpp", "compiler_tests/AtomicCounter_test.cpp",
"compiler_tests/BufferVariables_test.cpp", "compiler_tests/BufferVariables_test.cpp",
"compiler_tests/CollectVariables_test.cpp", "compiler_tests/CollectVariables_test.cpp",
"compiler_tests/ConstantFolding_test.cpp",
"compiler_tests/ConstantFoldingNaN_test.cpp", "compiler_tests/ConstantFoldingNaN_test.cpp",
"compiler_tests/ConstantFoldingOverflow_test.cpp", "compiler_tests/ConstantFoldingOverflow_test.cpp",
"compiler_tests/ConstantFolding_test.cpp",
"compiler_tests/ConstructCompiler_test.cpp", "compiler_tests/ConstructCompiler_test.cpp",
"compiler_tests/DebugShaderPrecision_test.cpp", "compiler_tests/DebugShaderPrecision_test.cpp",
"compiler_tests/EmulateGLBaseVertexBaseInstance_test.cpp",
"compiler_tests/EmulateGLDrawID_test.cpp",
"compiler_tests/EmulateGLFragColorBroadcast_test.cpp",
"compiler_tests/ExpressionLimit_test.cpp",
"compiler_tests/EXT_YUV_target_test.cpp", "compiler_tests/EXT_YUV_target_test.cpp",
"compiler_tests/EXT_blend_func_extended_test.cpp", "compiler_tests/EXT_blend_func_extended_test.cpp",
"compiler_tests/EXT_frag_depth_test.cpp", "compiler_tests/EXT_frag_depth_test.cpp",
"compiler_tests/EXT_shader_texture_lod_test.cpp", "compiler_tests/EXT_shader_texture_lod_test.cpp",
"compiler_tests/EmulateGLBaseVertexBaseInstance_test.cpp",
"compiler_tests/EmulateGLDrawID_test.cpp",
"compiler_tests/EmulateGLFragColorBroadcast_test.cpp",
"compiler_tests/ExpressionLimit_test.cpp",
"compiler_tests/ExtensionDirective_test.cpp", "compiler_tests/ExtensionDirective_test.cpp",
"compiler_tests/FloatLex_test.cpp", "compiler_tests/FloatLex_test.cpp",
"compiler_tests/FragDepth_test.cpp", "compiler_tests/FragDepth_test.cpp",
"compiler_tests/GLSLCompatibilityOutput_test.cpp", "compiler_tests/GLSLCompatibilityOutput_test.cpp",
"compiler_tests/GlFragDataNotModified_test.cpp",
"compiler_tests/GeometryShader_test.cpp", "compiler_tests/GeometryShader_test.cpp",
"compiler_tests/GlFragDataNotModified_test.cpp",
"compiler_tests/ImmutableString_test.cpp", "compiler_tests/ImmutableString_test.cpp",
"compiler_tests/InitOutputVariables_test.cpp", "compiler_tests/InitOutputVariables_test.cpp",
"compiler_tests/IntermNode_test.cpp", "compiler_tests/IntermNode_test.cpp",
"compiler_tests/NV_draw_buffers_test.cpp", "compiler_tests/NV_draw_buffers_test.cpp",
"compiler_tests/OES_standard_derivatives_test.cpp", "compiler_tests/OES_standard_derivatives_test.cpp",
"compiler_tests/OVR_multiview2_test.cpp",
"compiler_tests/OVR_multiview_test.cpp",
"compiler_tests/Pack_Unpack_test.cpp", "compiler_tests/Pack_Unpack_test.cpp",
"compiler_tests/PruneEmptyCases_test.cpp", "compiler_tests/PruneEmptyCases_test.cpp",
"compiler_tests/PruneEmptyDeclarations_test.cpp", "compiler_tests/PruneEmptyDeclarations_test.cpp",
...@@ -92,20 +96,21 @@ angle_unittests_sources = [ ...@@ -92,20 +96,21 @@ angle_unittests_sources = [
"compiler_tests/SamplerMultisample_test.cpp", "compiler_tests/SamplerMultisample_test.cpp",
"compiler_tests/SamplerVideoWEBGL_test.cpp", "compiler_tests/SamplerVideoWEBGL_test.cpp",
"compiler_tests/ScalarizeVecAndMatConstructorArgs_test.cpp", "compiler_tests/ScalarizeVecAndMatConstructorArgs_test.cpp",
"compiler_tests/ShCompile_test.cpp",
"compiler_tests/ShaderImage_test.cpp", "compiler_tests/ShaderImage_test.cpp",
"compiler_tests/ShaderValidation_test.cpp", "compiler_tests/ShaderValidation_test.cpp",
"compiler_tests/ShaderVariable_test.cpp", "compiler_tests/ShaderVariable_test.cpp",
"compiler_tests/ShCompile_test.cpp",
"compiler_tests/TextureFunction_test.cpp", "compiler_tests/TextureFunction_test.cpp",
"compiler_tests/Type_test.cpp",
"compiler_tests/TypeTracking_test.cpp", "compiler_tests/TypeTracking_test.cpp",
"compiler_tests/Type_test.cpp",
"compiler_tests/UnfoldShortCircuitAST_test.cpp", "compiler_tests/UnfoldShortCircuitAST_test.cpp",
"compiler_tests/VariablePacker_test.cpp", "compiler_tests/VariablePacker_test.cpp",
"compiler_tests/VectorizeVectorScalarArithmetic_test.cpp", "compiler_tests/VectorizeVectorScalarArithmetic_test.cpp",
"compiler_tests/OVR_multiview_test.cpp",
"compiler_tests/OVR_multiview2_test.cpp",
"compiler_tests/WorkGroupSize_test.cpp", "compiler_tests/WorkGroupSize_test.cpp",
"test_expectations/GPUTestExpectationsParser_unittest.cpp", "preprocessor_tests/MockDiagnostics.h",
"preprocessor_tests/MockDirectiveHandler.h",
"preprocessor_tests/PreprocessorTest.cpp",
"preprocessor_tests/PreprocessorTest.h",
"preprocessor_tests/char_test.cpp", "preprocessor_tests/char_test.cpp",
"preprocessor_tests/comment_test.cpp", "preprocessor_tests/comment_test.cpp",
"preprocessor_tests/define_test.cpp", "preprocessor_tests/define_test.cpp",
...@@ -115,26 +120,21 @@ angle_unittests_sources = [ ...@@ -115,26 +120,21 @@ angle_unittests_sources = [
"preprocessor_tests/if_test.cpp", "preprocessor_tests/if_test.cpp",
"preprocessor_tests/input_test.cpp", "preprocessor_tests/input_test.cpp",
"preprocessor_tests/location_test.cpp", "preprocessor_tests/location_test.cpp",
"preprocessor_tests/MockDiagnostics.h",
"preprocessor_tests/MockDirectiveHandler.h",
"preprocessor_tests/number_test.cpp", "preprocessor_tests/number_test.cpp",
"preprocessor_tests/operator_test.cpp", "preprocessor_tests/operator_test.cpp",
"preprocessor_tests/pragma_test.cpp", "preprocessor_tests/pragma_test.cpp",
"preprocessor_tests/PreprocessorTest.cpp",
"preprocessor_tests/PreprocessorTest.h",
"preprocessor_tests/space_test.cpp", "preprocessor_tests/space_test.cpp",
"preprocessor_tests/token_test.cpp", "preprocessor_tests/token_test.cpp",
"preprocessor_tests/version_test.cpp", "preprocessor_tests/version_test.cpp",
"test_utils/angle_test_instantiate.h", "test_expectations/GPUTestExpectationsParser_unittest.cpp",
"test_utils/compiler_test.cpp",
"test_utils/compiler_test.h",
"test_utils/ConstantFoldingTest.h",
"test_utils/ConstantFoldingTest.cpp", "test_utils/ConstantFoldingTest.cpp",
"test_utils/ShaderCompileTreeTest.h", "test_utils/ConstantFoldingTest.h",
"test_utils/ShaderCompileTreeTest.cpp", "test_utils/ShaderCompileTreeTest.cpp",
"test_utils/ShaderCompileTreeTest.h",
"test_utils/ShaderExtensionTest.h", "test_utils/ShaderExtensionTest.h",
"../../util/test_utils_unittest.cpp", "test_utils/angle_test_instantiate.h",
"../../util/test_utils_unittest_helper.h", "test_utils/compiler_test.cpp",
"test_utils/compiler_test.h",
] ]
# TODO(jmadill): should probably call this windows sources # TODO(jmadill): should probably call this windows sources
......
src/tests/angle_white_box_tests.gni
...@@ -4,17 +4,17 @@ ...@@ -4,17 +4,17 @@
angle_white_box_tests_sources = [ angle_white_box_tests_sources = [
"egl_tests/EGLFeatureControlTest.cpp", "egl_tests/EGLFeatureControlTest.cpp",
"util_tests/PrintSystemInfoTest.cpp", "gl_tests/FormatPrintTest.cpp",
"test_utils/angle_test_platform.cpp", "test_utils/ANGLETest.cpp",
"test_utils/angle_test_platform.h", "test_utils/ANGLETest.h",
"test_utils/angle_test_configs.cpp", "test_utils/angle_test_configs.cpp",
"test_utils/angle_test_configs.h", "test_utils/angle_test_configs.h",
"test_utils/angle_test_instantiate.cpp", "test_utils/angle_test_instantiate.cpp",
"test_utils/angle_test_instantiate.h", "test_utils/angle_test_instantiate.h",
"test_utils/ANGLETest.cpp", "test_utils/angle_test_platform.cpp",
"test_utils/ANGLETest.h", "test_utils/angle_test_platform.h",
"test_utils/gl_raii.h", "test_utils/gl_raii.h",
"gl_tests/FormatPrintTest.cpp", "util_tests/PrintSystemInfoTest.cpp",
] ]
angle_white_box_tests_win_sources = [ angle_white_box_tests_win_sources = [
"egl_tests/EGLDirectCompositionTest.cpp", "egl_tests/EGLDirectCompositionTest.cpp",
...@@ -29,6 +29,6 @@ angle_white_box_tests_vulkan_sources = [ ...@@ -29,6 +29,6 @@ angle_white_box_tests_vulkan_sources = [
"gl_tests/VulkanUniformUpdatesTest.cpp", "gl_tests/VulkanUniformUpdatesTest.cpp",
] ]
angle_white_box_tests_mac_sources = [ angle_white_box_tests_mac_sources = [
"test_utils/angle_test_instantiate_apple.mm",
"test_utils/angle_test_instantiate_apple.h", "test_utils/angle_test_instantiate_apple.h",
"test_utils/angle_test_instantiate_apple.mm",
] ]
src/tests/deqp_support/BUILD.gn
...@@ -8,12 +8,9 @@ ...@@ -8,12 +8,9 @@
deqp_path = "../../../third_party/VK-GL-CTS/src" deqp_path = "../../../third_party/VK-GL-CTS/src"
copy("vk_gl_cts_data_data_gles2_data") { copy("vk_gl_cts_data_data_gles2_data") {
sources = [ sources = [ "$deqp_path/data/gles2/data/brick.png" ]
"$deqp_path/data/gles2/data/brick.png", outputs =
] [ "$root_gen_dir/vk_gl_cts_data/data/gles2/data/{{source_file_part}}" ]
outputs = [
"$root_gen_dir/vk_gl_cts_data/data/gles2/data/{{source_file_part}}",
]
} }
copy("vk_gl_cts_data_data_gles2_data_etc1") { copy("vk_gl_cts_data_data_gles2_data_etc1") {
...@@ -103,9 +100,8 @@ copy("vk_gl_cts_data_data_gles2_shaders") { ...@@ -103,9 +100,8 @@ copy("vk_gl_cts_data_data_gles2_shaders") {
"$deqp_path/data/gles2/shaders/scoping.test", "$deqp_path/data/gles2/shaders/scoping.test",
"$deqp_path/data/gles2/shaders/swizzles.test", "$deqp_path/data/gles2/shaders/swizzles.test",
] ]
outputs = [ outputs =
"$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/{{source_file_part}}", [ "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/{{source_file_part}}" ]
]
} }
copy("vk_gl_cts_data_data_gles31_data_tessellation") { copy("vk_gl_cts_data_data_gles31_data_tessellation") {
...@@ -166,9 +162,7 @@ copy("vk_gl_cts_data_data_gles31_data_tessellation") { ...@@ -166,9 +162,7 @@ copy("vk_gl_cts_data_data_gles31_data_tessellation") {
"$deqp_path/data/gles31/data/tessellation/user_defined_io_quads_ref.png", "$deqp_path/data/gles31/data/tessellation/user_defined_io_quads_ref.png",
"$deqp_path/data/gles31/data/tessellation/user_defined_io_triangles_ref.png", "$deqp_path/data/gles31/data/tessellation/user_defined_io_triangles_ref.png",
] ]
outputs = [ outputs = [ "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/{{source_file_part}}" ]
"$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/{{source_file_part}}",
]
} }
copy("vk_gl_cts_data_data_gles31_shaders_es31") { copy("vk_gl_cts_data_data_gles31_shaders_es31") {
...@@ -195,9 +189,7 @@ copy("vk_gl_cts_data_data_gles31_shaders_es31") { ...@@ -195,9 +189,7 @@ copy("vk_gl_cts_data_data_gles31_shaders_es31") {
"$deqp_path/data/gles31/shaders/es31/uniform_block.test", "$deqp_path/data/gles31/shaders/es31/uniform_block.test",
"$deqp_path/data/gles31/shaders/es31/uniform_location.test", "$deqp_path/data/gles31/shaders/es31/uniform_location.test",
] ]
outputs = [ outputs = [ "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/{{source_file_part}}" ]
"$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/{{source_file_part}}",
]
} }
copy("vk_gl_cts_data_data_gles31_shaders_es32") { copy("vk_gl_cts_data_data_gles31_shaders_es32") {
...@@ -223,18 +215,13 @@ copy("vk_gl_cts_data_data_gles31_shaders_es32") { ...@@ -223,18 +215,13 @@ copy("vk_gl_cts_data_data_gles31_shaders_es32") {
"$deqp_path/data/gles31/shaders/es32/uniform_block.test", "$deqp_path/data/gles31/shaders/es32/uniform_block.test",
"$deqp_path/data/gles31/shaders/es32/uniform_location.test", "$deqp_path/data/gles31/shaders/es32/uniform_location.test",
] ]
outputs = [ outputs = [ "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/{{source_file_part}}" ]
"$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/{{source_file_part}}",
]
} }
copy("vk_gl_cts_data_data_gles3_data") { copy("vk_gl_cts_data_data_gles3_data") {
sources = [ sources = [ "$deqp_path/data/gles3/data/brick.png" ]
"$deqp_path/data/gles3/data/brick.png", outputs =
] [ "$root_gen_dir/vk_gl_cts_data/data/gles3/data/{{source_file_part}}" ]
outputs = [
"$root_gen_dir/vk_gl_cts_data/data/gles3/data/{{source_file_part}}",
]
} }
copy("vk_gl_cts_data_data_gles3_data_etc1") { copy("vk_gl_cts_data_data_gles3_data_etc1") {
...@@ -328,15 +315,12 @@ copy("vk_gl_cts_data_data_gles3_shaders") { ...@@ -328,15 +315,12 @@ copy("vk_gl_cts_data_data_gles3_shaders") {
"$deqp_path/data/gles3/shaders/swizzles.test", "$deqp_path/data/gles3/shaders/swizzles.test",
"$deqp_path/data/gles3/shaders/uniform_block.test", "$deqp_path/data/gles3/shaders/uniform_block.test",
] ]
outputs = [ outputs =
"$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/{{source_file_part}}", [ "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/{{source_file_part}}" ]
]
} }
copy("vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz") { copy("vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz") {
sources = [ sources = [ "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/vertexShader.glsl" ]
"$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/vertexShader.glsl",
]
outputs = [ outputs = [
"$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/{{source_file_part}}", "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/{{source_file_part}}",
] ]
...@@ -349,9 +333,7 @@ copy( ...@@ -349,9 +333,7 @@ copy(
"$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/bubblesort_flag/variant_1.frag", "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/bubblesort_flag/variant_1.frag",
"$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/bubblesort_flag/variant_2.frag", "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/bubblesort_flag/variant_2.frag",
] ]
outputs = [ outputs = [ "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/bubblesort_flag/{{source_file_part}}" ]
"$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/bubblesort_flag/{{source_file_part}}",
]
} }
copy("vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_synthetic") { copy("vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_synthetic") {
...@@ -362,9 +344,7 @@ copy("vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_synthetic") { ...@@ -362,9 +344,7 @@ copy("vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_synthetic") {
"$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/synthetic/variant_3.frag", "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/synthetic/variant_3.frag",
"$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/synthetic/variant_4.frag", "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/synthetic/variant_4.frag",
] ]
outputs = [ outputs = [ "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/{{source_file_part}}" ]
"$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/{{source_file_part}}",
]
} }
copy("vk_gl_cts_data_external_openglcts_data_gles3") { copy("vk_gl_cts_data_external_openglcts_data_gles3") {
......
src/third_party/volk/BUILD.gn
...@@ -27,7 +27,5 @@ source_set("volk") { ...@@ -27,7 +27,5 @@ source_set("volk") {
":volk_config", ":volk_config",
":volk_internal_config", ":volk_internal_config",
] ]
public_deps = [ public_deps = [ "../../../third_party/vulkan-headers/src:vulkan_headers" ]
"../../../third_party/vulkan-headers/src:vulkan_headers",
]
} }
third_party/BUILD.gn
...@@ -25,14 +25,10 @@ group("jpeg") { ...@@ -25,14 +25,10 @@ group("jpeg") {
if (use_system_libjpeg) { if (use_system_libjpeg) {
public_configs = [ ":system_libjpeg_config" ] public_configs = [ ":system_libjpeg_config" ]
} else if (use_libjpeg_turbo) { } else if (use_libjpeg_turbo) {
public_deps = [ public_deps = [ "//third_party/libjpeg_turbo:libjpeg" ]
"//third_party/libjpeg_turbo:libjpeg",
]
public_configs = [ ":libjpeg_turbo_config" ] public_configs = [ ":libjpeg_turbo_config" ]
} else { } else {
public_deps = [ public_deps = [ "//third_party/libjpeg:libjpeg" ]
"//third_party/libjpeg:libjpeg",
]
} }
} }
......
third_party/glmark2/BUILD.gn
...@@ -73,9 +73,7 @@ group("glmark2_gles") { ...@@ -73,9 +73,7 @@ group("glmark2_gles") {
":glmark2_common_config", ":glmark2_common_config",
":glmark2_gles_config", ":glmark2_gles_config",
] ]
public_deps = [ public_deps = [ ":glmark2_glad_gles" ]
":glmark2_glad_gles",
]
} }
group("glmark2_gl") { group("glmark2_gl") {
...@@ -83,9 +81,7 @@ group("glmark2_gl") { ...@@ -83,9 +81,7 @@ group("glmark2_gl") {
":glmark2_common_config", ":glmark2_common_config",
":glmark2_gl_config", ":glmark2_gl_config",
] ]
public_deps = [ public_deps = [ ":glmark2_glad_gl" ]
":glmark2_glad_gl",
]
} }
# Supplies compatible headers on Win32. # Supplies compatible headers on Win32.
...@@ -156,23 +152,17 @@ template("glmark2_libmatrix") { ...@@ -156,23 +152,17 @@ template("glmark2_libmatrix") {
if (is_clang) { if (is_clang) {
cflags_cc = [ "-Wno-implicit-fallthrough" ] cflags_cc = [ "-Wno-implicit-fallthrough" ]
} }
public_deps = [ public_deps = [ ":glmark2_headers" ]
":glmark2_headers",
]
public_configs = [ ":glmark2_libmatrix_config" ] public_configs = [ ":glmark2_libmatrix_config" ]
} }
} }
glmark2_libmatrix("glmark2_libmatrix_gles") { glmark2_libmatrix("glmark2_libmatrix_gles") {
deps = [ deps = [ ":glmark2_gles" ]
":glmark2_gles",
]
} }
glmark2_libmatrix("glmark2_libmatrix_gl") { glmark2_libmatrix("glmark2_libmatrix_gl") {
deps = [ deps = [ ":glmark2_gl" ]
":glmark2_gl",
]
} }
config("glmark2_scene_ideas_config") { config("glmark2_scene_ideas_config") {
...@@ -345,9 +335,7 @@ template("glmark2_exe") { ...@@ -345,9 +335,7 @@ template("glmark2_exe") {
"src/src/canvas-generic.h", "src/src/canvas-generic.h",
"src/src/main.cpp", "src/src/main.cpp",
] ]
data = [ data = [ "src/data/" ]
"src/data/",
]
defines += [ "GLMARK_VERSION=\"${glmark2_version}\"" ] defines += [ "GLMARK_VERSION=\"${glmark2_version}\"" ]
...@@ -370,12 +358,8 @@ template("glmark2_exe") { ...@@ -370,12 +358,8 @@ template("glmark2_exe") {
} }
glmark2_exe("glmark2_angle") { glmark2_exe("glmark2_angle") {
sources = [ sources = [ "src/src/gl-state-egl.cpp" ]
"src/src/gl-state-egl.cpp", deps = [ ":glmark2_common_gles" ]
]
deps = [
":glmark2_common_gles",
]
data_deps = [ data_deps = [
"${angle_root}:libEGL", "${angle_root}:libEGL",
"${angle_root}:libGLESv2", "${angle_root}:libGLESv2",
...@@ -399,9 +383,7 @@ if (is_linux) { ...@@ -399,9 +383,7 @@ if (is_linux) {
"src/src/glad/include/glad/glx.h", "src/src/glad/include/glad/glx.h",
"src/src/glad/src/glx.c", "src/src/glad/src/glx.c",
] ]
deps = [ deps = [ ":glmark2_common_gl" ]
":glmark2_common_gl",
]
defines = [ "GLMARK2_USE_GLX" ] defines = [ "GLMARK2_USE_GLX" ]
} }
...@@ -410,12 +392,8 @@ if (is_linux) { ...@@ -410,12 +392,8 @@ if (is_linux) {
# opengl32.lib/opengl32.dll are not available on Windows ARM64. # opengl32.lib/opengl32.dll are not available on Windows ARM64.
if (is_win && target_cpu != "arm64") { if (is_win && target_cpu != "arm64") {
glmark2_exe("glmark2_wgl") { glmark2_exe("glmark2_wgl") {
sources = [ sources = [ "src/src/gl-state-wgl.cpp" ]
"src/src/gl-state-wgl.cpp", deps = [ ":glmark2_common_gl" ]
]
deps = [
":glmark2_common_gl",
]
libs = [ "opengl32.lib" ] libs = [ "opengl32.lib" ]
defines = [ "GLMARK2_USE_WGL" ] defines = [ "GLMARK2_USE_WGL" ]
......
third_party/libpng/BUILD.gn
...@@ -36,7 +36,5 @@ static_library("libpng") { ...@@ -36,7 +36,5 @@ static_library("libpng") {
} }
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
public_configs = [ ":libpng_config" ] public_configs = [ ":libpng_config" ]
deps = [ deps = [ "//third_party/zlib:zlib" ]
"//third_party/zlib:zlib",
]
} }
util/util.gni
...@@ -3,10 +3,19 @@ ...@@ -3,10 +3,19 @@
# found in the LICENSE file. # found in the LICENSE file.
util_sources = [ util_sources = [
"util/EGLPlatformParameters.h",
"util/EGLWindow.cpp",
"util/EGLWindow.h",
"util/Event.h",
"util/Matrix.cpp",
"util/Matrix.h",
"util/OSPixmap.h",
"util/OSWindow.cpp",
"util/OSWindow.h",
"util/com_utils.h", "util/com_utils.h",
"util/keyboard.h",
"util/geometry_utils.cpp", "util/geometry_utils.cpp",
"util/geometry_utils.h", "util/geometry_utils.h",
"util/keyboard.h",
"util/mouse.h", "util/mouse.h",
"util/random_utils.cpp", "util/random_utils.cpp",
"util/random_utils.h", "util/random_utils.h",
...@@ -14,15 +23,6 @@ util_sources = [ ...@@ -14,15 +23,6 @@ util_sources = [
"util/shader_utils.h", "util/shader_utils.h",
"util/util_export.h", "util/util_export.h",
"util/util_gl.h", "util/util_gl.h",
"util/Event.h",
"util/EGLPlatformParameters.h",
"util/EGLWindow.cpp",
"util/EGLWindow.h",
"util/Matrix.cpp",
"util/Matrix.h",
"util/OSPixmap.h",
"util/OSWindow.cpp",
"util/OSWindow.h",
] ]
if (is_win) { if (is_win) {
...@@ -57,10 +57,10 @@ util_ozone_sources = [ ...@@ -57,10 +57,10 @@ util_ozone_sources = [
] ]
util_osx_sources = [ util_osx_sources = [
"util/osx/OSXPixmap.mm",
"util/osx/OSXPixmap.h", "util/osx/OSXPixmap.h",
"util/osx/OSXWindow.mm", "util/osx/OSXPixmap.mm",
"util/osx/OSXWindow.h", "util/osx/OSXWindow.h",
"util/osx/OSXWindow.mm",
] ]
util_android_sources = [ util_android_sources = [
......
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