kc3-lang/angle/gni

Branch : - branch - main - tag -

• Show log

  Commit

• Author : Geoff Lang
  Date : 2017-03-28 15:47:21
  Hash : 795e7573
  Message : Revert "Roll vulkan-validation-layers. (2/2)" This reverts commit 2feaa5e0ac6b779e13254c84b41de436f5d14765. Reason for revert: Broke the Chrome Windows builders. Build: https://build.chromium.org/p/chromium/builders/Win/builds/53432 Error: src\third_party\vulkan-validation-layers\src\include\vulkan\vk_layer.h(39): fatal error C1083: Cannot open include file: 'vk_layer_dispatch_table.h': No such file or directory Original change's description: > Roll vulkan-validation-layers. (2/2) > > https://android.googlesource.com/platform/external/vulkan-validation-layers.git/+log/bcb80d06bbdc09..f47c534fee2f26f > > This CL re-enables Vulkan with the new build files. > > In particular, this roll contains a fix for a vs2017 signed/unsigned > mismatch warning as error. > > BUG=chromium:683729 > > Change-Id: Id38e10f97702cac5a51ee194c81972861f15db21 > Reviewed-on: https://chromium-review.googlesource.com/457278 > Commit-Queue: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> > TBR=geofflang@chromium.org,jmadill@chromium.org,bungeman@chromium.org,cwallez@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. BUG=chromium:683729 Change-Id: Ic60f22496fc57904132d574a2fb2c1ca4d875b3e Reviewed-on: https://chromium-review.googlesource.com/461999 Reviewed-by: Geoff Lang <geofflang@chromium.org>

• angle.gni

• # Copyright 2015 The Chromium Authors. All rights reserved.
  # Use of this source code is governed by a BSD-style license that can be
  # found in the LICENSE file.
  
  import("//build/config/ui.gni")  # import the use_x11 variable
  import("//ui/ozone/ozone.gni")
  
  angle_enable_d3d9 = false
  angle_enable_d3d11 = false
  angle_enable_gl = false
  angle_enable_vulkan = false
  angle_enable_null = true
  
  if (is_win) {
    angle_enable_d3d9 = true
    angle_enable_d3d11 = true
    angle_enable_gl = true
    # TODO(jmadill): Re-enable Vulkan after roll.
    angle_enable_vulkan = false
  
    import("//build/config/win/visual_studio_version.gni")
  } else if (is_linux && use_x11 && !is_chromeos) {
    angle_enable_gl = true
  } else if (is_mac || ozone_platform_gbm) {
    angle_enable_gl = true
  } else if (is_android) {
    angle_enable_gl = true
  }
  
  angle_enable_essl = true
  angle_enable_glsl = true
  angle_enable_hlsl = false
  
  if (angle_enable_d3d9 || angle_enable_d3d11) {
    angle_enable_hlsl = true
  }