Load correct opengl32.dll

BUILD.gn

@@ -791,7 +791,10 @@ angle_libGLESv2("libGLESv2_with_capture") {
 if (is_win) {
   angle_shared_library("libGL") {
     sources = libgl_sources
-    output_name = "openGL32"
+
+    # 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"
 
     configs += [
       ":angle_gl_visibility_config",

scripts/code_generation_hashes/GL_EGL_entry_points.json

@@ -6,7 +6,7 @@
   "scripts/entry_point_packed_gl_enums.json":
     "08665ca9ebf22fa759c1ce0e965a200d",
   "scripts/generate_entry_points.py":
-    "9d9b4797c1da3644923e83396a040b97",
+    "4d9a6b0c9bf8fe51e8d81bad1f5678a2",
   "scripts/gl.xml":
     "b470cb06b06cbbe7adb2c8129ec85708",
   "scripts/gl_angle_ext.xml":
@@ -144,7 +144,7 @@
   "src/libGL/libGL_autogen.cpp":
     "2ee47347a7d1f3f85944c772398c7ef8",
   "src/libGL/libGL_autogen.def":
-    "8ff022ce11382a0b4adbd05b559ad59c",
+    "7160e2f1be4a51d96166d12ebed31686",
   "src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
     "d9882eb5eb7002955c0e6969288dc595",
   "src/libGLESv2/entry_points_gles_1_0_autogen.h":

scripts/generate_entry_points.py

@@ -1102,14 +1102,14 @@ def write_capture_helper_source(all_param_types):
         out.close()
 
 
-def write_windows_def_file(data_source_name, lib, lib_export, folder, exports):
+def write_windows_def_file(data_source_name, lib, 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_export)
+        lib=lib)
 
     path = path_to(folder, "%s_autogen.def" % lib)
 
@@ -1634,10 +1634,9 @@ def main():
 
     everything = "Khronos and ANGLE XML files"
 
-    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)
+    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)
 
     all_gles_param_types = sorted(all_gles_param_types)
     write_capture_helper_header(all_gles_param_types)

src/libGL/libGL_autogen.def

@@ -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 openGL32
+LIBRARY libGL
 EXPORTS
 
     ; GL 1.0

src/tests/perf_tests/ANGLEPerfTest.cpp

@@ -375,7 +375,7 @@ ANGLERenderTest::ANGLERenderTest(const std::string &name, const RenderTestParams
 #if defined(ANGLE_USE_UTIL_LOADER) && defined(ANGLE_PLATFORM_WINDOWS)
             mGLWindow = WGLWindow::New(testParams.majorVersion, testParams.minorVersion);
             mEntryPointsLib.reset(
-                angle::OpenSharedLibrary("opengl32", angle::SearchType::ApplicationDir));
+                angle::OpenSharedLibrary("opengl32", angle::SearchType::SystemDir));
 #else
             std::cout << "WGL driver not available. Skipping test." << std::endl;
             mSkipTest = true;