зеркало из https://github.com/AvaloniaUI/angle.git
Generate openGL32.dll in a separate output folder
This is to avoid loading it locally and so that the pdb works Bug: angleproject:3641 Change-Id: I2ce93ace47d1e6a1013d38964e5919084ad4ff7f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1704634 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Clemen Deng <clemendeng@google.com>
This commit is contained in:
Родитель
ec9ff8ce39
Коммит
6e7dd1ef42
5
BUILD.gn
5
BUILD.gn
|
@ -792,9 +792,8 @@ if (is_win) {
|
|||
angle_shared_library("libGL") {
|
||||
sources = libgl_sources
|
||||
|
||||
# Need to rename dll to openGL32.dll when using
|
||||
# On Windows we noticed the NVIDIA driver was internally loading the wrong openGL32.dll
|
||||
output_name = "libGL"
|
||||
output_name = "openGL32"
|
||||
output_dir = "$root_out_dir/angle_libs"
|
||||
|
||||
configs += [
|
||||
":angle_gl_visibility_config",
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"scripts/entry_point_packed_gl_enums.json":
|
||||
"08665ca9ebf22fa759c1ce0e965a200d",
|
||||
"scripts/generate_entry_points.py":
|
||||
"4d9a6b0c9bf8fe51e8d81bad1f5678a2",
|
||||
"82eb8bd96b46bf0141fbcac17c71a97c",
|
||||
"scripts/gl.xml":
|
||||
"b470cb06b06cbbe7adb2c8129ec85708",
|
||||
"scripts/gl_angle_ext.xml":
|
||||
|
@ -144,7 +144,7 @@
|
|||
"src/libGL/libGL_autogen.cpp":
|
||||
"2ee47347a7d1f3f85944c772398c7ef8",
|
||||
"src/libGL/libGL_autogen.def":
|
||||
"7160e2f1be4a51d96166d12ebed31686",
|
||||
"8ff022ce11382a0b4adbd05b559ad59c",
|
||||
"src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
|
||||
"d9882eb5eb7002955c0e6969288dc595",
|
||||
"src/libGLESv2/entry_points_gles_1_0_autogen.h":
|
||||
|
|
|
@ -1102,14 +1102,14 @@ def write_capture_helper_source(all_param_types):
|
|||
out.close()
|
||||
|
||||
|
||||
def write_windows_def_file(data_source_name, lib, folder, exports):
|
||||
def write_windows_def_file(data_source_name, lib, libexport, folder, exports):
|
||||
|
||||
content = template_windows_def_file.format(
|
||||
script_name=os.path.basename(sys.argv[0]),
|
||||
data_source_name=data_source_name,
|
||||
exports="\n".join(exports),
|
||||
year=date.today().year,
|
||||
lib=lib)
|
||||
lib=libexport)
|
||||
|
||||
path = path_to(folder, "%s_autogen.def" % lib)
|
||||
|
||||
|
@ -1634,9 +1634,10 @@ def main():
|
|||
|
||||
everything = "Khronos and ANGLE XML files"
|
||||
|
||||
write_windows_def_file(everything, "libGLESv2", "libGLESv2", libgles_ep_exports)
|
||||
write_windows_def_file(everything, "libGLESv2_with_capture", "libGLESv2", libgles_ep_exports)
|
||||
write_windows_def_file(everything, "libGL", "libGL", libgl_ep_exports)
|
||||
write_windows_def_file(everything, "libGLESv2", "libGLESv2", "libGLESv2", libgles_ep_exports)
|
||||
write_windows_def_file(everything, "libGLESv2_with_capture", "libGLESv2_with_capture",
|
||||
"libGLESv2", libgles_ep_exports)
|
||||
write_windows_def_file(everything, "libGL", "openGL32", "libGL", libgl_ep_exports)
|
||||
|
||||
all_gles_param_types = sorted(all_gles_param_types)
|
||||
write_capture_helper_header(all_gles_param_types)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
; Copyright 2019 The ANGLE Project Authors. All rights reserved.
|
||||
; Use of this source code is governed by a BSD-style license that can be
|
||||
; found in the LICENSE file.
|
||||
LIBRARY libGL
|
||||
LIBRARY openGL32
|
||||
EXPORTS
|
||||
|
||||
; GL 1.0
|
||||
|
|
Загрузка…
Ссылка в новой задаче