Merge branch 'master' of https://github.com/google/angle

Author: hughsando

.clang-format

@@ -13,7 +13,26 @@ IndentWidth: 4
 ColumnLimit: 100
 
 # Always break before braces
-BreakBeforeBraces: Allman
+BreakBeforeBraces: Custom
+BraceWrapping:
+#  TODO(lujc) wait for clang-format-9 support in Chromium tools
+#  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+
+  # Keeps extern "C" blocks unindented.
+  AfterExternBlock: false
 
 # Indent case labels.
 IndentCaseLabels: true
@@ -33,3 +52,9 @@ AllowShortCaseLabelsOnASingleLine: false
 
 # Useful for spacing out functions in classes
 KeepEmptyLinesAtTheStartOfBlocks: true
+
+# Indent nested PP directives.
+IndentPPDirectives: AfterHash
+
+# Include blocks style
+IncludeBlocks: Preserve

.gitattributes

@@ -1,9 +1,17 @@
-*                  text=auto
-*.sln              eol=crlf
-*.vcxproj          eol=crlf
-*.vcxproj.filters  eol=crlf
-*.bat              eol=crlf
-*.rc               eol=crlf
-**/compiled/*.h    eol=crlf
-*.sh               eol=lf
-*.gn               eol=lf
+*                                          text=auto
+*.sln                                      eol=crlf
+*.vcxproj                                  eol=crlf
+*.vcxproj.filters                          eol=crlf
+*.bat                                      eol=crlf
+*.rc                                       eol=crlf
+**/compiled/*.h                            eol=crlf
+**/shaders/gen/*.inc                       eol=lf
+*.sh                                       eol=lf
+*.gn                                       eol=lf
+*.gni                                      eol=lf
+src/compiler/preprocessor/preprocessor_*.* eol=lf
+src/compiler/translator/glslang_*.*        eol=lf
+
+# Git conflict markers in the json file break the code generator.
+# Using a binary merge strategy forces conflicts without changing file contents.
+scripts/code_generation_hashes/*.json merge=binary

.gitignore

@@ -14,31 +14,59 @@
 *.TMP
 *.VC.db
 *.VC.opendb
+*.vcproj
 *.vcxproj
 *.vcxproj.filters
 *.vcxproj.user
 *.vsp
 *~
+.*.sw*
+.sw*
+.cipd
 .gclient
 .gclient_entries
+.git_cl_description_backup
 /src/tests/third_party/gles_conformance_tests
 /testing
+/third_party/android_ndk
+/third_party/catapult
 /third_party/cherry
-/third_party/deqp/src
+/third_party/fuchsia-sdk
 /third_party/gles1_conform
+/third_party/glmark2/src
 /third_party/glslang/src
-/third_party/googletest/src
-/third_party/gyp
+/third_party/googletest
+/third_party/jsoncpp
+/third_party/libjpeg_turbo
 /third_party/libpng/src
 /third_party/llvm-build
+/third_party/Python-Markdown
+/third_party/qemu-linux-x64
+/third_party/qemu-mac-x64
+/third_party/rapidjson/src
+/third_party/spirv-cross/src
 /third_party/spirv-headers/src
 /third_party/spirv-tools/src
+/third_party/SwiftShader
+/third_party/VK-GL-CTS/src
 /third_party/vulkan-headers/src
 /third_party/vulkan-loader/src
 /third_party/vulkan-tools/src
 /third_party/vulkan-validation-layers/src
+/third_party/yasm
 /third_party/zlib
-angle_internal
+/tools/clang
+/tools/flex-bison/linux/bison
+/tools/flex-bison/linux/flex
+/tools/flex-bison/windows/bison.exe
+/tools/flex-bison/windows/flex.exe
+/tools/flex-bison/windows/m4.exe
+/tools/flex-bison/windows/msys*.dll
+/tools/glslang/glslang_validator
+/tools/glslang/glslang_validator.exe
+/tools/md_browser
+/tools/memory
+angle_debug.txt
 build
 buildtools/
 debug.txt
@@ -49,13 +77,11 @@ Debug_x64/
 diag.txt
 ipch
 lib/*
-Makefile
 out
 patches-*
 Release/
 Release_ARM/
 Release_Win32/
 Release_x64/
 TestResults.qpa
-tools/clang
-tools/gyp
+.idea/

.gn

@@ -7,38 +7,34 @@
 # As a result this file will only affect stand-alone ANGLE builds,
 # not chromium builds.
 
-import("//dotfile_settings.gni")
 import("//build/dotfile_settings.gni")
+import("//dotfile_settings.gni")
 
 # Location of the build configuration file.
 buildconfig = "//build/config/BUILDCONFIG.gn"
 
-# The secondary source root is a parallel directory tree where
-# GN build files are placed when they can not be placed directly
-# in the source tree, e.g. for third party source trees.
-secondary_source = "//build/secondary/"
-
 # These are the targets to check headers for by default. The files in targets
 # matching these patterns (see "gn help label_pattern" for format) will have
 # their includes checked for proper dependencies when you run either
 # "gn check" or "gn gen --check".
-check_targets = []
+check_targets = [ "*" ]
 
 # These are the list of GN files that run exec_script. This whitelist exists
 # to force additional review for new uses of exec_script, which is strongly
 # discouraged except for gypi_to_gn calls.
 exec_script_whitelist = angle_dotfile_settings.exec_script_whitelist +
-                        build_dotfile_settings.exec_script_whitelist + [
+                        build_dotfile_settings.exec_script_whitelist +
+                        [
                           "//build/config/sysroot.gni",
                           "//build/config/win/BUILD.gn",
                           "//build/config/win/visual_studio_version.gni",
                           "//build/gn_helpers.py",
-                          "//build/gypi_to_gn.py",
+                          "//build_overrides/build.gni",
                         ]
 
 default_args = {
   use_custom_libcxx = false
-  clang_use_chrome_plugins = false
+  clang_use_chrome_plugins = true
   build_angle_deqp_tests = true
   use_sysroot = true
 }

.style.yapf

@@ -0,0 +1,4 @@
+[style]
+based_on_style = chromium
+column_limit = 99
+indent_width = 4

.yapfignore

@@ -0,0 +1 @@
+scripts/export_targets.py

AUTHORS

@@ -29,6 +29,10 @@ The Qt Company Ltd.
 Advanced Micro Devices, Inc.
 LG Electronics, Inc.
 IBM Inc.
+AdaptVis GmbH
+Samsung Electronics, Inc.
+Arm Ltd.
+Broadcom Inc.
 
 Jacek Caban
 Mark Callow
@@ -51,3 +55,11 @@ Nickolay Artamonov
 Ihsan Akmal
 Andrei Volykhin
 Jérôme Duval
+Руслан Ижбулатов
+Thomas Miller
+Till Rathmann
+Nick Shaforostov
+Jaime Bernardo
+Le Hoang Quyen
+Ethan Lee
+Renaud Lepage