Edit

kc3-lang/angle/gni

Branch :

  • Show log

    Commit

  • Author : Frédéric Wang
    Date : 2016-11-08 17:55:19
    Hash : 70697252
    Message : Ozone: Only set angle_enable_gl=1 for the DRM/GBM platform. Currently, the load of DRM dependencies and definition of ANGLE_USE_OZONE are conditioned by ozone_platform_gbm in the GN build files. However, angle_enable_gl is always turned on for use_ozone=1. As a consequence, use_ozone=1 and ozone_platform_gbm=0 (default on Linux Desktop) produces the following error: ../../third_party/angle/src/libANGLE/Display.cpp:52:9: error: Unsupported OpenGL platform. #error Unsupported OpenGL platform. ../../third_party/angle/src/libANGLE/Display.cpp:192:2: error: Unsupported OpenGL platform. #error Unsupported OpenGL platform. This CL turns off angle_enable_gl in that case to fix that build error. Change-Id: I42578f30f3353c083f52d4bd345dbe33f3f5e12e Reviewed-on: https://chromium-review.googlesource.com/408100 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Frank Henigman <fjhenigman@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@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
    }