Hash :
175d918a
Author :
Date :
2018-12-16T19:53:23
Revert "Load correct libGLESv2 on Linux and Mac." This reverts commit dd815b623e60a1e1550f328104ffcd7caf20fde1. Reason for revert: Broke https://luci-milo.appspot.com/p/chromium/builders/luci.chromium.ci/win-rel/8006 Original change's description: > Load correct libGLESv2 on Linux and Mac. > > libEGL was implicitly loading libGLESv2 on startup. This is bad > because on platforms like Linux and Mac we could sometimes use the > incorrect rpath. This in turn meant we needed workarounds like using > "_angle" extensions to our shared objects to get the correct loading > behaviour. > > Fix this by loading libGLESv2 dynamically in libEGL. We build the > loader automatically from egl.xml. The loader itself is lazily > initialized on every EGL entry point call. This is necessary because > on Linux, etc, there is no equivalent to Windows' DLLMain. > > We also use an EGL.h with different generation options so we have the > proper function pointer types. A README is included for instructions > on how to regenerate EGL.h. > > The entry point generation script is refactored into a helper class > that is used in the loader generator. Also adds the libGLESv2 versions > of the EGL entry points in the DEF file on Windows. This allows them to > be imported properly in 32-bit configurations. > > Also fixes up some errors in ANGLE's entry point definitions. Also > includes a clang-format disable rule for the Khronos headers. > > This CL will help us to run ANGLE tests against native drivers. > > Bug: angleproject:2871 > Change-Id: Id6ecf969308f17b1be4083538428c9c1a1836572 > Reviewed-on: https://chromium-review.googlesource.com/c/1370725 > Commit-Queue: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Geoff Lang <geofflang@chromium.org> TBR=ynovikov@chromium.org,geofflang@chromium.org,jmadill@chromium.org Change-Id: I921b3c45435ab4f05cbc2d1c1172b4185d6257b0 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:2871 Reviewed-on: https://chromium-review.googlesource.com/c/1378887 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228
# Copyright 2017 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("../gni/angle.gni")
executable("shader_translator") {
sources = [
"shader_translator/shader_translator.cpp",
]
include_dirs = [ "../include" ]
deps = [
"../:translator",
]
}
config("sample_util_config") {
include_dirs = [ "sample_util" ]
}
static_library("sample_util") {
sources = [
"sample_util/SampleApplication.cpp",
"sample_util/SampleApplication.h",
"sample_util/texture_utils.cpp",
"sample_util/texture_utils.h",
"sample_util/tga_utils.cpp",
"sample_util/tga_utils.h",
]
deps = [
"../:angle_common",
"../:angle_util",
"../:libEGL${angle_libs_suffix}",
"../:libGLESv1_CM${angle_libs_suffix}",
"../:libGLESv2${angle_libs_suffix}",
]
public_configs = [ ":sample_util_config" ]
}
template("angle_sample") {
if (defined(invoker.data)) {
copy(target_name + "_data") {
sources = invoker.data
outputs = [
"$root_out_dir/{{source_file_part}}",
]
}
}
executable(target_name) {
deps = [
":sample_util",
"../:angle_util",
]
if (defined(invoker.data)) {
deps += [ ":${target_name}_data" ]
}
sources = invoker.sources
}
}
angle_sample("hello_triangle") {
sources = [
"hello_triangle/HelloTriangle.cpp",
]
}
angle_sample("mip_map_2d") {
sources = [
"mip_map_2d/MipMap2D.cpp",
]
}
angle_sample("multi_texture") {
sources = [
"multi_texture/MultiTexture.cpp",
]
data = [
"multi_texture/basemap.tga",
"multi_texture/lightmap.tga",
]
}
angle_sample("multi_window") {
sources = [
"multi_window/MultiWindow.cpp",
]
}
angle_sample("multiple_draw_buffers") {
sources = [
"multiple_draw_buffers/MultipleDrawBuffers.cpp",
]
data = [
"multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl",
"multiple_draw_buffers/multiple_draw_buffers_fs.glsl",
"multiple_draw_buffers/multiple_draw_buffers_vs.glsl",
]
}
angle_sample("multiview") {
sources = [
"multiview/Multiview.cpp",
]
}
angle_sample("particle_system") {
sources = [
"particle_system/ParticleSystem.cpp",
]
data = [
"particle_system/smoke.tga",
]
}
angle_sample("post_sub_buffer") {
sources = [
"post_sub_buffer/PostSubBuffer.cpp",
]
}
angle_sample("simple_instancing") {
sources = [
"simple_instancing/SimpleInstancing.cpp",
]
}
angle_sample("simple_texture_2d") {
sources = [
"simple_texture_2d/SimpleTexture2D.cpp",
]
}
angle_sample("simple_texture_cubemap") {
sources = [
"simple_texture_cubemap/SimpleTextureCubemap.cpp",
]
}
angle_sample("simple_vertex_shader") {
sources = [
"simple_vertex_shader/SimpleVertexShader.cpp",
]
}
angle_sample("stencil_operations") {
sources = [
"stencil_operations/StencilOperations.cpp",
]
}
angle_sample("tex_redef_microbench") {
sources = [
"tex_redef_microbench/TexRedefMicroBench.cpp",
]
}
angle_sample("texture_wrap") {
sources = [
"texture_wrap/TextureWrap.cpp",
]
}
angle_sample("tri_fan_microbench") {
sources = [
"tri_fan_microbench/TriFanMicroBench.cpp",
]
}
angle_sample("window_test") {
sources = [
"WindowTest/WindowTest.cpp",
]
}
angle_sample("gles1_hello_triangle") {
sources = [
"gles1/HelloTriangle.cpp",
]
}
angle_sample("gles1_simple_texture_2d") {
sources = [
"gles1/SimpleTexture2D.cpp",
]
}
angle_sample("gles1_simple_lighting") {
sources = [
"gles1/SimpleLighting.cpp",
]
}
angle_sample("gles1_flat_shading") {
sources = [
"gles1/FlatShading.cpp",
]
}
angle_sample("gles1_draw_texture") {
sources = [
"gles1/DrawTexture.cpp",
]
}
group("all") {
testonly = true
deps = [
":hello_triangle",
":mip_map_2d",
":multi_texture",
":multi_window",
":multiple_draw_buffers",
":multiview",
":particle_system",
":post_sub_buffer",
":sample_util",
":simple_instancing",
":simple_texture_2d",
":simple_texture_cubemap",
":simple_vertex_shader",
":stencil_operations",
":tex_redef_microbench",
":texture_wrap",
":tri_fan_microbench",
":window_test",
]
}