Edit

kc3-lang/angle/gni

Branch :

  • Show log

    Commit

  • Author : Jamie Madill
    Date : 2017-04-07 14:54:10
    Hash : 03b333b4
    Message : Vulkan: Fix Clang warning and fix build. The data_deps section for angle_vulkan was referencing a variable that didn't exist (no warning for this). Fix the deps which also then exposes the build problem with the layers with Clang in 32-bit. Also fix not propagating the Win32 defines to the layer utils. BUG=chromium:708835 Change-Id: I4a457bfabf1ca735d3f3f3d8b0f0823cfa834b84 Reviewed-on: https://chromium-review.googlesource.com/470087 Commit-Queue: Jamie Madill <jmadill@chromium.org> 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
      angle_enable_vulkan = true
    
      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
    }