From cb8b4a5716ba08ec797010a6c9c247034db13c1f Mon Sep 17 00:00:00 2001 From: Clemen Deng Date: Thu, 4 Jul 2019 16:05:25 -0400 Subject: [PATCH] Rename "opengl32" to "libGL" Bug: angleproject:3651 Change-Id: I1af052da9bc2f64f2f29ea411902272987f21a0e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1688178 Commit-Queue: Clemen Deng Reviewed-by: Geoff Lang --- BUILD.gn | 8 +- scripts/gen_proc_table.py | 26 ++-- scripts/generate_entry_points.py | 122 +++++++++--------- scripts/run_code_generation_hashes.json | 96 +++++++------- .../entry_points_gl_1_0_autogen.cpp | 2 +- .../entry_points_gl_1_0_autogen.h | 6 +- .../entry_points_gl_1_1_autogen.cpp | 2 +- .../entry_points_gl_1_1_autogen.h | 6 +- .../entry_points_gl_1_2_autogen.cpp | 2 +- .../entry_points_gl_1_2_autogen.h | 6 +- .../entry_points_gl_1_3_autogen.cpp | 2 +- .../entry_points_gl_1_3_autogen.h | 6 +- .../entry_points_gl_1_4_autogen.cpp | 2 +- .../entry_points_gl_1_4_autogen.h | 6 +- .../entry_points_gl_1_5_autogen.cpp | 2 +- .../entry_points_gl_1_5_autogen.h | 6 +- .../entry_points_gl_2_0_autogen.cpp | 2 +- .../entry_points_gl_2_0_autogen.h | 6 +- .../entry_points_gl_2_1_autogen.cpp | 2 +- .../entry_points_gl_2_1_autogen.h | 6 +- .../entry_points_gl_3_0_autogen.cpp | 2 +- .../entry_points_gl_3_0_autogen.h | 6 +- .../entry_points_gl_3_1_autogen.cpp | 2 +- .../entry_points_gl_3_1_autogen.h | 6 +- src/{openGL32 => libGL}/entry_points_wgl.cpp | 2 +- src/{openGL32 => libGL}/entry_points_wgl.h | 6 +- src/{openGL32/openGL32.rc => libGL/libGL.rc} | 4 +- .../libGL_autogen.cpp} | 42 +++--- .../libGL_autogen.def} | 20 +-- src/{openGL32 => libGL}/proc_table_wgl.h | 6 +- .../proc_table_wgl_autogen.cpp | 24 ++-- src/{openGL32 => libGL}/resource.h | 2 +- src/libGLESv2.gni | 58 ++++----- 33 files changed, 248 insertions(+), 248 deletions(-) rename src/{openGL32 => libGL}/entry_points_gl_1_0_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_1_0_autogen.h (99%) rename src/{openGL32 => libGL}/entry_points_gl_1_1_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_1_1_autogen.h (97%) rename src/{openGL32 => libGL}/entry_points_gl_1_2_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_1_2_autogen.h (94%) rename src/{openGL32 => libGL}/entry_points_gl_1_3_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_1_3_autogen.h (98%) rename src/{openGL32 => libGL}/entry_points_gl_1_4_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_1_4_autogen.h (96%) rename src/{openGL32 => libGL}/entry_points_gl_1_5_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_1_5_autogen.h (94%) rename src/{openGL32 => libGL}/entry_points_gl_2_0_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_2_0_autogen.h (98%) rename src/{openGL32 => libGL}/entry_points_gl_2_1_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_2_1_autogen.h (93%) rename src/{openGL32 => libGL}/entry_points_gl_3_0_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_3_0_autogen.h (98%) rename src/{openGL32 => libGL}/entry_points_gl_3_1_autogen.cpp (99%) rename src/{openGL32 => libGL}/entry_points_gl_3_1_autogen.h (96%) rename src/{openGL32 => libGL}/entry_points_wgl.cpp (99%) rename src/{openGL32 => libGL}/entry_points_wgl.h (93%) rename src/{openGL32/openGL32.rc => libGL/libGL.rc} (95%) rename src/{openGL32/openGL32_autogen.cpp => libGL/libGL_autogen.cpp} (99%) rename src/{openGL32/openGL32_autogen.def => libGL/libGL_autogen.def} (98%) rename src/{openGL32 => libGL}/proc_table_wgl.h (86%) rename src/{openGL32 => libGL}/proc_table_wgl_autogen.cpp (98%) rename src/{openGL32 => libGL}/resource.h (93%) diff --git a/BUILD.gn b/BUILD.gn index 6991573a4..4e1ecaa92 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -785,9 +785,9 @@ angle_libGLESv2("libGLESv2_with_capture") { } if (is_win) { - angle_shared_library("openGL32") { - sources = opengl32_sources - output_name = "openGL32${angle_libs_suffix}" + angle_shared_library("libGL") { + sources = libgl_sources + output_name = "openGL32" configs += [ ":angle_gl_visibility_config", @@ -797,7 +797,7 @@ if (is_win) { defines = [ "ANGLE_CAPTURE_ENABLED=0", - "OPENGL32_IMPLEMENTATION", + "LIBGL_IMPLEMENTATION", ] deps = [ diff --git a/scripts/gen_proc_table.py b/scripts/gen_proc_table.py index a412920ec..361836222 100644 --- a/scripts/gen_proc_table.py +++ b/scripts/gen_proc_table.py @@ -12,7 +12,7 @@ from datetime import date import registry_xml out_file_name_gles = "../src/libGLESv2/proc_table_egl_autogen.cpp" -out_file_name_gl = "../src/openGL32/proc_table_wgl_autogen.cpp" +out_file_name_gl = "../src/libGL/proc_table_wgl_autogen.cpp" # The EGL_ANGLE_explicit_context extension is generated differently from other extensions. # Toggle generation here. @@ -57,19 +57,19 @@ includes_gles = """#include "libGLESv2/proc_table_egl.h" #include "platform/Platform.h" """ -includes_gl = """#include "openGL32/proc_table_wgl.h" +includes_gl = """#include "libGL/proc_table_wgl.h" -#include "openGL32/entry_points_wgl.h" -#include "openGL32/entry_points_gl_1_0_autogen.h" -#include "openGL32/entry_points_gl_1_1_autogen.h" -#include "openGL32/entry_points_gl_1_2_autogen.h" -#include "openGL32/entry_points_gl_1_3_autogen.h" -#include "openGL32/entry_points_gl_1_4_autogen.h" -#include "openGL32/entry_points_gl_1_5_autogen.h" -#include "openGL32/entry_points_gl_2_0_autogen.h" -#include "openGL32/entry_points_gl_2_1_autogen.h" -#include "openGL32/entry_points_gl_3_0_autogen.h" -#include "openGL32/entry_points_gl_3_1_autogen.h" +#include "libGL/entry_points_wgl.h" +#include "libGL/entry_points_gl_1_0_autogen.h" +#include "libGL/entry_points_gl_1_1_autogen.h" +#include "libGL/entry_points_gl_1_2_autogen.h" +#include "libGL/entry_points_gl_1_3_autogen.h" +#include "libGL/entry_points_gl_1_4_autogen.h" +#include "libGL/entry_points_gl_1_5_autogen.h" +#include "libGL/entry_points_gl_2_0_autogen.h" +#include "libGL/entry_points_gl_2_1_autogen.h" +#include "libGL/entry_points_gl_3_0_autogen.h" +#include "libGL/entry_points_gl_3_1_autogen.h" #include "platform/Platform.h" """ diff --git a/scripts/generate_entry_points.py b/scripts/generate_entry_points.py index 7b2d6793c..4cebad39c 100755 --- a/scripts/generate_entry_points.py +++ b/scripts/generate_entry_points.py @@ -340,7 +340,7 @@ template_header_includes_gl32 = """#include #include "windows.h" """ -template_sources_includes_gl32 = """#include "openGL32/entry_points_{}_autogen.h" +template_sources_includes_gl32 = """#include "libGL/entry_points_{}_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.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, lib_export, 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=lib_export) path = path_to(folder, "%s_autogen.def" % lib) @@ -1224,28 +1224,28 @@ def main(): '../src/libGLESv2/libGLESv2_autogen.cpp', '../src/libGLESv2/libGLESv2_autogen.def', '../src/libGLESv2/libGLESv2_with_capture_autogen.def', - '../src/openGL32/entry_points_gl_1_0_autogen.cpp', - '../src/openGL32/entry_points_gl_1_0_autogen.h', - '../src/openGL32/entry_points_gl_1_1_autogen.cpp', - '../src/openGL32/entry_points_gl_1_1_autogen.h', - '../src/openGL32/entry_points_gl_1_2_autogen.cpp', - '../src/openGL32/entry_points_gl_1_2_autogen.h', - '../src/openGL32/entry_points_gl_1_3_autogen.cpp', - '../src/openGL32/entry_points_gl_1_3_autogen.h', - '../src/openGL32/entry_points_gl_1_4_autogen.cpp', - '../src/openGL32/entry_points_gl_1_4_autogen.h', - '../src/openGL32/entry_points_gl_1_5_autogen.cpp', - '../src/openGL32/entry_points_gl_1_5_autogen.h', - '../src/openGL32/entry_points_gl_2_0_autogen.cpp', - '../src/openGL32/entry_points_gl_2_0_autogen.h', - '../src/openGL32/entry_points_gl_2_1_autogen.cpp', - '../src/openGL32/entry_points_gl_2_1_autogen.h', - '../src/openGL32/entry_points_gl_3_0_autogen.cpp', - '../src/openGL32/entry_points_gl_3_0_autogen.h', - '../src/openGL32/entry_points_gl_3_1_autogen.cpp', - '../src/openGL32/entry_points_gl_3_1_autogen.h', - '../src/openGL32/openGL32_autogen.cpp', - '../src/openGL32/openGL32_autogen.def', + '../src/libGL/entry_points_gl_1_0_autogen.cpp', + '../src/libGL/entry_points_gl_1_0_autogen.h', + '../src/libGL/entry_points_gl_1_1_autogen.cpp', + '../src/libGL/entry_points_gl_1_1_autogen.h', + '../src/libGL/entry_points_gl_1_2_autogen.cpp', + '../src/libGL/entry_points_gl_1_2_autogen.h', + '../src/libGL/entry_points_gl_1_3_autogen.cpp', + '../src/libGL/entry_points_gl_1_3_autogen.h', + '../src/libGL/entry_points_gl_1_4_autogen.cpp', + '../src/libGL/entry_points_gl_1_4_autogen.h', + '../src/libGL/entry_points_gl_1_5_autogen.cpp', + '../src/libGL/entry_points_gl_1_5_autogen.h', + '../src/libGL/entry_points_gl_2_0_autogen.cpp', + '../src/libGL/entry_points_gl_2_0_autogen.h', + '../src/libGL/entry_points_gl_2_1_autogen.cpp', + '../src/libGL/entry_points_gl_2_1_autogen.h', + '../src/libGL/entry_points_gl_3_0_autogen.cpp', + '../src/libGL/entry_points_gl_3_0_autogen.h', + '../src/libGL/entry_points_gl_3_1_autogen.cpp', + '../src/libGL/entry_points_gl_3_1_autogen.h', + '../src/libGL/libGL_autogen.cpp', + '../src/libGL/libGL_autogen.def', ] if sys.argv[1] == 'inputs': @@ -1453,14 +1453,13 @@ def main(): "\n".join(glext_protos)) # Now we generate entry points for the desktop implementation - # OpenGL32 gldecls = {} gldecls['core'] = {} for ver in [(1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5), (2, 0), (2, 1), (3, 0), (3, 1)]: gldecls['core'][ver] = [] - opengl32_ep_defs = [] - opengl32_ep_exports = [] + libgl_ep_defs = [] + libgl_ep_exports = [] glxml = registry_xml.RegistryXML('gl.xml') @@ -1475,27 +1474,27 @@ def main(): glxml.AddCommands(feature_name, version) - all_opengl32_commands = glxml.commands[version] - just_opengl32_commands = [ + all_libgl_commands = glxml.commands[version] + just_libgl_commands = [ cmd for cmd in glxml.commands[version] if cmd not in all_commands_no_suffix ] - just_opengl32_commands_suffix = [ + just_libgl_commands_suffix = [ cmd for cmd in glxml.commands[version] if cmd not in all_commands_with_suffix ] all_commands32 = glxml.all_commands # Validation duplicates handled with suffix _, _, _, validation_protos32, _, _, _ = get_entry_points( - all_commands32, just_opengl32_commands_suffix, False, False, all_gles_param_types) - decls32, defs32, opengl32_defs, _, _, _, _ = get_entry_points( - all_commands32, all_opengl32_commands, False, False, all_gles_param_types) + all_commands32, just_libgl_commands_suffix, False, False, all_gles_param_types) + decls_gl, defs_gl, libgl_defs, _, _, _, _ = get_entry_points( + all_commands32, all_libgl_commands, False, False, all_gles_param_types) # Write the version as a comment before the first EP. - opengl32_defs.insert(0, "\n// OpenGL32 %s" % comment) - opengl32_ep_exports.append("\n ; OpenGL32 %s" % comment) + libgl_defs.insert(0, "\n// GL %s" % comment) + libgl_ep_exports.append("\n ; GL %s" % comment) - opengl32_ep_defs += opengl32_defs - opengl32_ep_exports += get_exports(all_opengl32_commands) + libgl_ep_defs += libgl_defs + libgl_ep_exports += get_exports(all_libgl_commands) minor_if_not_zero = minor_version if minor_version != 0 else "" @@ -1504,14 +1503,13 @@ def main(): minor_if_not_zero) # Entry point files - write_file(annotation, "GL " + comment, template_entry_point_header, "\n".join(decls32), - "h", header_includes, "openGL32", "gl.xml") - write_file(annotation, "GL " + comment, template_entry_point_source, "\n".join(defs32), - "cpp", source_includes, "openGL32", "gl.xml") + write_file(annotation, "GL " + comment, template_entry_point_header, "\n".join(decls_gl), + "h", header_includes, "libGL", "gl.xml") + write_file(annotation, "GL " + comment, template_entry_point_source, "\n".join(defs_gl), + "cpp", source_includes, "libGL", "gl.xml") gldecls['core'][(major_version, minor_version)] = get_decls( - context_decl_format, all_commands32, just_opengl32_commands, all_commands_no_suffix, - []) + context_decl_format, all_commands32, just_libgl_commands, all_commands_no_suffix, []) # Validation files validation_annotation = "GL%s%s" % (major_version, minor_if_not_zero) @@ -1536,13 +1534,13 @@ def main(): all_commands32, wgl_commands, False, True, wgl_param_types) # Write the version as a comment before the first EP. - opengl32_ep_exports.append("\n ; WGL %s" % comment) + libgl_ep_exports.append("\n ; WGL %s" % comment) # Other versions of these functions are used wgl_commands.remove("wglUseFontBitmaps") wgl_commands.remove("wglUseFontOutlines") - opengl32_ep_exports += get_exports(wgl_commands) + libgl_ep_exports += get_exports(wgl_commands) header_includes = template_header_includes.format(major="", minor="") header_includes += """ @@ -1615,29 +1613,31 @@ def main(): source_includes = """ #include "angle_gl.h" - #include "openGL32/entry_points_gl_1_0_autogen.h" - #include "openGL32/entry_points_gl_1_1_autogen.h" - #include "openGL32/entry_points_gl_1_2_autogen.h" - #include "openGL32/entry_points_gl_1_3_autogen.h" - #include "openGL32/entry_points_gl_1_4_autogen.h" - #include "openGL32/entry_points_gl_1_5_autogen.h" - #include "openGL32/entry_points_gl_2_0_autogen.h" - #include "openGL32/entry_points_gl_2_1_autogen.h" - #include "openGL32/entry_points_gl_3_0_autogen.h" - #include "openGL32/entry_points_gl_3_1_autogen.h" + #include "libGL/entry_points_gl_1_0_autogen.h" + #include "libGL/entry_points_gl_1_1_autogen.h" + #include "libGL/entry_points_gl_1_2_autogen.h" + #include "libGL/entry_points_gl_1_3_autogen.h" + #include "libGL/entry_points_gl_1_4_autogen.h" + #include "libGL/entry_points_gl_1_5_autogen.h" + #include "libGL/entry_points_gl_2_0_autogen.h" + #include "libGL/entry_points_gl_2_1_autogen.h" + #include "libGL/entry_points_gl_3_0_autogen.h" + #include "libGL/entry_points_gl_3_1_autogen.h" #include "common/event_tracer.h" """ - write_export_files("\n".join([item for item in opengl32_ep_defs]), source_includes, - "gl.xml and wgl.xml", "openGL32", "Windows GL") + write_export_files("\n".join([item for item in libgl_ep_defs]), source_includes, + "gl.xml and wgl.xml", "libGL", "Windows GL") libgles_ep_exports += get_egl_exports() 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, "openGL32", "openGL32", opengl32_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) diff --git a/scripts/run_code_generation_hashes.json b/scripts/run_code_generation_hashes.json index 912df1ef7..bb8056075 100644 --- a/scripts/run_code_generation_hashes.json +++ b/scripts/run_code_generation_hashes.json @@ -94,7 +94,7 @@ "GL/EGL entry points:scripts/entry_point_packed_gl_enums.json": "08665ca9ebf22fa759c1ce0e965a200d", "GL/EGL entry points:scripts/generate_entry_points.py": - "b19e7ebed619b1a41702849c1d741e0d", + "9d9b4797c1da3644923e83396a040b97", "GL/EGL entry points:scripts/gl.xml": "b470cb06b06cbbe7adb2c8129ec85708", "GL/EGL entry points:scripts/gl_angle_ext.xml": @@ -189,6 +189,50 @@ "8eb20c13d38138483d42f898400ef176", "GL/EGL entry points:src/libANGLE/validationGL3_autogen.h": "1bd2846baa868d579bc4f619dc59a93c", + "GL/EGL entry points:src/libGL/entry_points_gl_1_0_autogen.cpp": + "65efdf7fcf3d7b12f936db5c6c7f1c32", + "GL/EGL entry points:src/libGL/entry_points_gl_1_0_autogen.h": + "ba9a7d0ce72bca6f11d12b3a8a3e95c1", + "GL/EGL entry points:src/libGL/entry_points_gl_1_1_autogen.cpp": + "7b3230b667a6ff00933f58223d958f89", + "GL/EGL entry points:src/libGL/entry_points_gl_1_1_autogen.h": + "1b675cfae8fa5e5d79032d480b9d098f", + "GL/EGL entry points:src/libGL/entry_points_gl_1_2_autogen.cpp": + "247f0973fb17a46cf02d97fe3647ff86", + "GL/EGL entry points:src/libGL/entry_points_gl_1_2_autogen.h": + "55ae51cd45fb87f44479abe7918ccc45", + "GL/EGL entry points:src/libGL/entry_points_gl_1_3_autogen.cpp": + "fdbffcd6b9bc4e6765cfa027c0645564", + "GL/EGL entry points:src/libGL/entry_points_gl_1_3_autogen.h": + "5cd2206947c56f33948eab34a85b9d18", + "GL/EGL entry points:src/libGL/entry_points_gl_1_4_autogen.cpp": + "8a4db0a0dd18a3d43bff54d77aa5d56e", + "GL/EGL entry points:src/libGL/entry_points_gl_1_4_autogen.h": + "3a2922db3bd9637a067b61f3099989d2", + "GL/EGL entry points:src/libGL/entry_points_gl_1_5_autogen.cpp": + "d5964ecec41afd6a0da980e1aedf9abd", + "GL/EGL entry points:src/libGL/entry_points_gl_1_5_autogen.h": + "ba307366eed3707a79e682aba990c2ba", + "GL/EGL entry points:src/libGL/entry_points_gl_2_0_autogen.cpp": + "73a6c7a872080b6c0b056159e9bcfcc0", + "GL/EGL entry points:src/libGL/entry_points_gl_2_0_autogen.h": + "1e9622afa89718fc65d2801848780691", + "GL/EGL entry points:src/libGL/entry_points_gl_2_1_autogen.cpp": + "c1e596d66b764e76cccbd4f726312d9b", + "GL/EGL entry points:src/libGL/entry_points_gl_2_1_autogen.h": + "4a368fe42f9b690ccec8a0492e9d0f2d", + "GL/EGL entry points:src/libGL/entry_points_gl_3_0_autogen.cpp": + "891bb91af9a61dddb10602a8d59392fc", + "GL/EGL entry points:src/libGL/entry_points_gl_3_0_autogen.h": + "a04b4fe60f275cbb405858498cc3a411", + "GL/EGL entry points:src/libGL/entry_points_gl_3_1_autogen.cpp": + "3c8d595677596847aa1e8e625d5f0fe2", + "GL/EGL entry points:src/libGL/entry_points_gl_3_1_autogen.h": + "0bd4aaf736f40589f668fdd381b87788", + "GL/EGL entry points:src/libGL/libGL_autogen.cpp": + "2ee47347a7d1f3f85944c772398c7ef8", + "GL/EGL entry points:src/libGL/libGL_autogen.def": + "8ff022ce11382a0b4adbd05b559ad59c", "GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.cpp": "d9882eb5eb7002955c0e6969288dc595", "GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.h": @@ -215,50 +259,6 @@ "fca8c7d5ec90a68a6ad062fc4edf67e4", "GL/EGL entry points:src/libGLESv2/libGLESv2_with_capture_autogen.def": "45eecb859db4e21d7591e5819ebd81dd", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_0_autogen.cpp": - "f388cf1698bfd71f25939123f7a3952c", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_0_autogen.h": - "8e91307664a1049e2db42d651fd42be7", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_1_autogen.cpp": - "f65fbeda26f604854f12d26ab12bc5b1", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_1_autogen.h": - "0f011b953435f9e83e61b6826209753b", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_2_autogen.cpp": - "4151b24a282c8bd208b540f7cef66f8c", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_2_autogen.h": - "1a6a2956bc3dbb4703378b3142778ff2", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_3_autogen.cpp": - "b8368e4652929d3bde0a534581fc5ee7", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_3_autogen.h": - "1e0fd2fdb8e46c635432c4f558f1bdf3", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_4_autogen.cpp": - "0058f2e4df2a9b9a51c6411ea7b7b37c", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_4_autogen.h": - "54fef88d63c0c0e99489120d2d16109a", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_5_autogen.cpp": - "c4a2f5718ecb77b57f2d532da3965be2", - "GL/EGL entry points:src/openGL32/entry_points_gl_1_5_autogen.h": - "13f8c37ceaea5fd4bda59ddc8a0fe7b2", - "GL/EGL entry points:src/openGL32/entry_points_gl_2_0_autogen.cpp": - "adde9e6cbbc307630b0334436cb59987", - "GL/EGL entry points:src/openGL32/entry_points_gl_2_0_autogen.h": - "127e74bf62c027d9e45b5639bef75901", - "GL/EGL entry points:src/openGL32/entry_points_gl_2_1_autogen.cpp": - "7bdbfb2f47d6c18c4caa889139d2a2cb", - "GL/EGL entry points:src/openGL32/entry_points_gl_2_1_autogen.h": - "11b3e2a032ad44b6cdd977e3d2c81232", - "GL/EGL entry points:src/openGL32/entry_points_gl_3_0_autogen.cpp": - "72c1cefaa62898b564926d4bfb12f22d", - "GL/EGL entry points:src/openGL32/entry_points_gl_3_0_autogen.h": - "e57885db7752cfa8304975e487f652cf", - "GL/EGL entry points:src/openGL32/entry_points_gl_3_1_autogen.cpp": - "6121303d87596b520e3cd7f26eb051a0", - "GL/EGL entry points:src/openGL32/entry_points_gl_3_1_autogen.h": - "7e52688552b82d6aaff263a63de9018d", - "GL/EGL entry points:src/openGL32/openGL32_autogen.cpp": - "e61b400467d91519d168a9544f863c6d", - "GL/EGL entry points:src/openGL32/openGL32_autogen.def": - "927bd64e7971581eb2d0042f69e8975c", "GL/EGL/WGL loader:scripts/egl.xml": "842e24514c4cfe09fba703c17a0fd292", "GL/EGL/WGL loader:scripts/egl_angle_ext.xml": @@ -568,7 +568,7 @@ "proc table:scripts/egl_angle_ext.xml": "fc2e249239fb1365f6d145cdf1a3cfcf", "proc table:scripts/gen_proc_table.py": - "b41bdf1c5dacfba6089a66b903ea6d13", + "3c988387fd8d368ea3a660b869867660", "proc table:scripts/gl.xml": "b470cb06b06cbbe7adb2c8129ec85708", "proc table:scripts/gl_angle_ext.xml": @@ -577,10 +577,10 @@ "24fa69f5641ed09c8e8a2f9c64fd0260", "proc table:scripts/wgl.xml": "aa96419c582af2f6673430e2847693f4", + "proc table:src/libGL/proc_table_wgl_autogen.cpp": + "62d8f224776d738d5ee259a5f84528e1", "proc table:src/libGLESv2/proc_table_egl_autogen.cpp": "35653e6a70519374b768c7240081fbd1", - "proc table:src/openGL32/proc_table_wgl_autogen.cpp": - "cadecfe9956fc200c643b635b425c15a", "uniform type:src/common/gen_uniform_type_table.py": "a741cc301b1617ab0e4d29b35f1d3b96", "uniform type:src/common/uniform_type_info_autogen.cpp": diff --git a/src/openGL32/entry_points_gl_1_0_autogen.cpp b/src/libGL/entry_points_gl_1_0_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_1_0_autogen.cpp rename to src/libGL/entry_points_gl_1_0_autogen.cpp index aa4cce25f..35e992174 100644 --- a/src/openGL32/entry_points_gl_1_0_autogen.cpp +++ b/src/libGL/entry_points_gl_1_0_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_1_0_autogen.cpp: // Defines the GL 1.0 entry points. -#include "openGL32/entry_points_gl_1_0_autogen.h" +#include "libGL/entry_points_gl_1_0_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_1_0_autogen.h b/src/libGL/entry_points_gl_1_0_autogen.h similarity index 99% rename from src/openGL32/entry_points_gl_1_0_autogen.h rename to src/libGL/entry_points_gl_1_0_autogen.h index ab40bf4ce..46cdcbbfd 100644 --- a/src/openGL32/entry_points_gl_1_0_autogen.h +++ b/src/libGL/entry_points_gl_1_0_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_1_0_autogen.h: // Defines the GL 1.0 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_1_0_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_1_0_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_1_0_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_1_0_AUTOGEN_H_ #include #include "angle_gl.h" @@ -394,4 +394,4 @@ ANGLE_EXPORT void GL_APIENTRY Vertex4sv(const GLshort *v); ANGLE_EXPORT void GL_APIENTRY Viewport(GLint x, GLint y, GLsizei width, GLsizei height); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_1_0_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_1_0_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_gl_1_1_autogen.cpp b/src/libGL/entry_points_gl_1_1_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_1_1_autogen.cpp rename to src/libGL/entry_points_gl_1_1_autogen.cpp index b7b81552f..02d7b3c47 100644 --- a/src/openGL32/entry_points_gl_1_1_autogen.cpp +++ b/src/libGL/entry_points_gl_1_1_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_1_1_autogen.cpp: // Defines the GL 1.1 entry points. -#include "openGL32/entry_points_gl_1_1_autogen.h" +#include "libGL/entry_points_gl_1_1_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_1_1_autogen.h b/src/libGL/entry_points_gl_1_1_autogen.h similarity index 97% rename from src/openGL32/entry_points_gl_1_1_autogen.h rename to src/libGL/entry_points_gl_1_1_autogen.h index c58789b8d..aa711ac8f 100644 --- a/src/openGL32/entry_points_gl_1_1_autogen.h +++ b/src/libGL/entry_points_gl_1_1_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_1_1_autogen.h: // Defines the GL 1.1 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_1_1_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_1_1_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_1_1_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_1_1_AUTOGEN_H_ #include #include "angle_gl.h" @@ -102,4 +102,4 @@ ANGLE_EXPORT void GL_APIENTRY VertexPointer(GLint size, const void *pointer); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_1_1_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_1_1_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_gl_1_2_autogen.cpp b/src/libGL/entry_points_gl_1_2_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_1_2_autogen.cpp rename to src/libGL/entry_points_gl_1_2_autogen.cpp index 7365d6831..bcdce301e 100644 --- a/src/openGL32/entry_points_gl_1_2_autogen.cpp +++ b/src/libGL/entry_points_gl_1_2_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_1_2_autogen.cpp: // Defines the GL 1.2 entry points. -#include "openGL32/entry_points_gl_1_2_autogen.h" +#include "libGL/entry_points_gl_1_2_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_1_2_autogen.h b/src/libGL/entry_points_gl_1_2_autogen.h similarity index 94% rename from src/openGL32/entry_points_gl_1_2_autogen.h rename to src/libGL/entry_points_gl_1_2_autogen.h index 686d19af1..ea46f8b41 100644 --- a/src/openGL32/entry_points_gl_1_2_autogen.h +++ b/src/libGL/entry_points_gl_1_2_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_1_2_autogen.h: // Defines the GL 1.2 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_1_2_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_1_2_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_1_2_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_1_2_AUTOGEN_H_ #include #include "angle_gl.h" @@ -57,4 +57,4 @@ ANGLE_EXPORT void GL_APIENTRY TexSubImage3D(GLenum target, const void *pixels); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_1_2_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_1_2_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_gl_1_3_autogen.cpp b/src/libGL/entry_points_gl_1_3_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_1_3_autogen.cpp rename to src/libGL/entry_points_gl_1_3_autogen.cpp index 8cf1b02aa..31216d870 100644 --- a/src/openGL32/entry_points_gl_1_3_autogen.cpp +++ b/src/libGL/entry_points_gl_1_3_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_1_3_autogen.cpp: // Defines the GL 1.3 entry points. -#include "openGL32/entry_points_gl_1_3_autogen.h" +#include "libGL/entry_points_gl_1_3_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_1_3_autogen.h b/src/libGL/entry_points_gl_1_3_autogen.h similarity index 98% rename from src/openGL32/entry_points_gl_1_3_autogen.h rename to src/libGL/entry_points_gl_1_3_autogen.h index f55a4f113..73f14efd0 100644 --- a/src/openGL32/entry_points_gl_1_3_autogen.h +++ b/src/libGL/entry_points_gl_1_3_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_1_3_autogen.h: // Defines the GL 1.3 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_1_3_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_1_3_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_1_3_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_1_3_AUTOGEN_H_ #include #include "angle_gl.h" @@ -115,4 +115,4 @@ ANGLE_EXPORT void GL_APIENTRY MultiTexCoord4sv(GLenum target, const GLshort *v); ANGLE_EXPORT void GL_APIENTRY SampleCoverage(GLfloat value, GLboolean invert); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_1_3_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_1_3_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_gl_1_4_autogen.cpp b/src/libGL/entry_points_gl_1_4_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_1_4_autogen.cpp rename to src/libGL/entry_points_gl_1_4_autogen.cpp index 585df0ba6..934167519 100644 --- a/src/openGL32/entry_points_gl_1_4_autogen.cpp +++ b/src/libGL/entry_points_gl_1_4_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_1_4_autogen.cpp: // Defines the GL 1.4 entry points. -#include "openGL32/entry_points_gl_1_4_autogen.h" +#include "libGL/entry_points_gl_1_4_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_1_4_autogen.h b/src/libGL/entry_points_gl_1_4_autogen.h similarity index 96% rename from src/openGL32/entry_points_gl_1_4_autogen.h rename to src/libGL/entry_points_gl_1_4_autogen.h index f14061710..b419bda75 100644 --- a/src/openGL32/entry_points_gl_1_4_autogen.h +++ b/src/libGL/entry_points_gl_1_4_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_1_4_autogen.h: // Defines the GL 1.4 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_1_4_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_1_4_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_1_4_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_1_4_AUTOGEN_H_ #include #include "angle_gl.h" @@ -81,4 +81,4 @@ ANGLE_EXPORT void GL_APIENTRY WindowPos3s(GLshort x, GLshort y, GLshort z); ANGLE_EXPORT void GL_APIENTRY WindowPos3sv(const GLshort *v); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_1_4_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_1_4_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_gl_1_5_autogen.cpp b/src/libGL/entry_points_gl_1_5_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_1_5_autogen.cpp rename to src/libGL/entry_points_gl_1_5_autogen.cpp index 95918813c..892da69f0 100644 --- a/src/openGL32/entry_points_gl_1_5_autogen.cpp +++ b/src/libGL/entry_points_gl_1_5_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_1_5_autogen.cpp: // Defines the GL 1.5 entry points. -#include "openGL32/entry_points_gl_1_5_autogen.h" +#include "libGL/entry_points_gl_1_5_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_1_5_autogen.h b/src/libGL/entry_points_gl_1_5_autogen.h similarity index 94% rename from src/openGL32/entry_points_gl_1_5_autogen.h rename to src/libGL/entry_points_gl_1_5_autogen.h index a28fc3776..864689188 100644 --- a/src/openGL32/entry_points_gl_1_5_autogen.h +++ b/src/libGL/entry_points_gl_1_5_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_1_5_autogen.h: // Defines the GL 1.5 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_1_5_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_1_5_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_1_5_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_1_5_AUTOGEN_H_ #include #include "angle_gl.h" @@ -49,4 +49,4 @@ ANGLE_EXPORT void *GL_APIENTRY MapBuffer(GLenum target, GLenum access); ANGLE_EXPORT GLboolean GL_APIENTRY UnmapBuffer(GLenum target); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_1_5_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_1_5_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_gl_2_0_autogen.cpp b/src/libGL/entry_points_gl_2_0_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_2_0_autogen.cpp rename to src/libGL/entry_points_gl_2_0_autogen.cpp index 0a292c8de..679e6ad0b 100644 --- a/src/openGL32/entry_points_gl_2_0_autogen.cpp +++ b/src/libGL/entry_points_gl_2_0_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_2_0_autogen.cpp: // Defines the GL 2.0 entry points. -#include "openGL32/entry_points_gl_2_0_autogen.h" +#include "libGL/entry_points_gl_2_0_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_2_0_autogen.h b/src/libGL/entry_points_gl_2_0_autogen.h similarity index 98% rename from src/openGL32/entry_points_gl_2_0_autogen.h rename to src/libGL/entry_points_gl_2_0_autogen.h index d6495ad54..67bea723d 100644 --- a/src/openGL32/entry_points_gl_2_0_autogen.h +++ b/src/libGL/entry_points_gl_2_0_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_2_0_autogen.h: // Defines the GL 2.0 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_2_0_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_2_0_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_2_0_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_2_0_AUTOGEN_H_ #include #include "angle_gl.h" @@ -163,4 +163,4 @@ ANGLE_EXPORT void GL_APIENTRY VertexAttribPointer(GLuint index, const void *pointer); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_2_0_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_2_0_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_gl_2_1_autogen.cpp b/src/libGL/entry_points_gl_2_1_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_2_1_autogen.cpp rename to src/libGL/entry_points_gl_2_1_autogen.cpp index 73bf7a08c..01a519f08 100644 --- a/src/openGL32/entry_points_gl_2_1_autogen.cpp +++ b/src/libGL/entry_points_gl_2_1_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_2_1_autogen.cpp: // Defines the GL 2.1 entry points. -#include "openGL32/entry_points_gl_2_1_autogen.h" +#include "libGL/entry_points_gl_2_1_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_2_1_autogen.h b/src/libGL/entry_points_gl_2_1_autogen.h similarity index 93% rename from src/openGL32/entry_points_gl_2_1_autogen.h rename to src/libGL/entry_points_gl_2_1_autogen.h index 7fb38ab94..2e48e5467 100644 --- a/src/openGL32/entry_points_gl_2_1_autogen.h +++ b/src/libGL/entry_points_gl_2_1_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_2_1_autogen.h: // Defines the GL 2.1 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_2_1_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_2_1_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_2_1_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_2_1_AUTOGEN_H_ #include #include "angle_gl.h" @@ -45,4 +45,4 @@ ANGLE_EXPORT void GL_APIENTRY UniformMatrix4x3fv(GLint location, const GLfloat *value); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_2_1_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_2_1_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_gl_3_0_autogen.cpp b/src/libGL/entry_points_gl_3_0_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_3_0_autogen.cpp rename to src/libGL/entry_points_gl_3_0_autogen.cpp index 630e4e5c0..582e9498d 100644 --- a/src/openGL32/entry_points_gl_3_0_autogen.cpp +++ b/src/libGL/entry_points_gl_3_0_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_3_0_autogen.cpp: // Defines the GL 3.0 entry points. -#include "openGL32/entry_points_gl_3_0_autogen.h" +#include "libGL/entry_points_gl_3_0_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_3_0_autogen.h b/src/libGL/entry_points_gl_3_0_autogen.h similarity index 98% rename from src/openGL32/entry_points_gl_3_0_autogen.h rename to src/libGL/entry_points_gl_3_0_autogen.h index f27319059..186f74148 100644 --- a/src/openGL32/entry_points_gl_3_0_autogen.h +++ b/src/libGL/entry_points_gl_3_0_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_3_0_autogen.h: // Defines the GL 3.0 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_3_0_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_3_0_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_3_0_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_3_0_AUTOGEN_H_ #include #include "angle_gl.h" @@ -167,4 +167,4 @@ ANGLE_EXPORT void GL_APIENTRY VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_3_0_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_3_0_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_gl_3_1_autogen.cpp b/src/libGL/entry_points_gl_3_1_autogen.cpp similarity index 99% rename from src/openGL32/entry_points_gl_3_1_autogen.cpp rename to src/libGL/entry_points_gl_3_1_autogen.cpp index c62deb4a2..2740ab28e 100644 --- a/src/openGL32/entry_points_gl_3_1_autogen.cpp +++ b/src/libGL/entry_points_gl_3_1_autogen.cpp @@ -8,7 +8,7 @@ // entry_points_gl_3_1_autogen.cpp: // Defines the GL 3.1 entry points. -#include "openGL32/entry_points_gl_3_1_autogen.h" +#include "libGL/entry_points_gl_3_1_autogen.h" #include "libANGLE/Context.h" #include "libANGLE/Context.inl.h" diff --git a/src/openGL32/entry_points_gl_3_1_autogen.h b/src/libGL/entry_points_gl_3_1_autogen.h similarity index 96% rename from src/openGL32/entry_points_gl_3_1_autogen.h rename to src/libGL/entry_points_gl_3_1_autogen.h index 7e6bc3184..621f1dac8 100644 --- a/src/openGL32/entry_points_gl_3_1_autogen.h +++ b/src/libGL/entry_points_gl_3_1_autogen.h @@ -8,8 +8,8 @@ // entry_points_gl_3_1_autogen.h: // Defines the GL 3.1 entry points. -#ifndef OPENGL32_ENTRY_POINTS_GL_3_1_AUTOGEN_H_ -#define OPENGL32_ENTRY_POINTS_GL_3_1_AUTOGEN_H_ +#ifndef LIBGL_ENTRY_POINTS_GL_3_1_AUTOGEN_H_ +#define LIBGL_ENTRY_POINTS_GL_3_1_AUTOGEN_H_ #include #include "angle_gl.h" @@ -65,4 +65,4 @@ ANGLE_EXPORT void GL_APIENTRY UniformBlockBinding(GLuint program, GLuint uniformBlockBinding); } // namespace gl -#endif // OPENGL32_ENTRY_POINTS_GL_3_1_AUTOGEN_H_ +#endif // LIBGL_ENTRY_POINTS_GL_3_1_AUTOGEN_H_ diff --git a/src/openGL32/entry_points_wgl.cpp b/src/libGL/entry_points_wgl.cpp similarity index 99% rename from src/openGL32/entry_points_wgl.cpp rename to src/libGL/entry_points_wgl.cpp index cc2859ddf..47740759e 100644 --- a/src/openGL32/entry_points_wgl.cpp +++ b/src/libGL/entry_points_wgl.cpp @@ -19,8 +19,8 @@ #include "libANGLE/Thread.h" #include "libANGLE/queryutils.h" #include "libANGLE/validationEGL.h" +#include "libGL/proc_table_wgl.h" #include "libGLESv2/global_state.h" -#include "openGL32/proc_table_wgl.h" using namespace wgl; using namespace egl; diff --git a/src/openGL32/entry_points_wgl.h b/src/libGL/entry_points_wgl.h similarity index 93% rename from src/openGL32/entry_points_wgl.h rename to src/libGL/entry_points_wgl.h index 9be9ad20f..527184efb 100644 --- a/src/openGL32/entry_points_wgl.h +++ b/src/libGL/entry_points_wgl.h @@ -5,8 +5,8 @@ // // entry_points_wgl.h: Declares the exported WGL functions. -#ifndef OPENGL32_WGL_H_ -#define OPENGL32_WGL_H_ +#ifndef LIBGL_WGL_H_ +#define LIBGL_WGL_H_ // Define _GDI32_ so that wingdi.h doesn't declare functions as imports #ifndef _GDI32_ @@ -37,4 +37,4 @@ BOOL GL_APIENTRY wglSwapBuffers(HDC hdc); } // extern "C" -#endif // OPENGL32_WGL_H_ +#endif // LIBGL_WGL_H_ diff --git a/src/openGL32/openGL32.rc b/src/libGL/libGL.rc similarity index 95% rename from src/openGL32/openGL32.rc rename to src/libGL/libGL.rc index 06bc94806..2f25f3ee5 100644 --- a/src/openGL32/openGL32.rc +++ b/src/libGL/libGL.rc @@ -70,9 +70,9 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "FileDescription", "ANGLE openGL32 Dynamic Link Library" + VALUE "FileDescription", "ANGLE OpenGL32 Dynamic Link Library" VALUE "FileVersion", ANGLE_VERSION_STRING - VALUE "InternalName", "openGL32" + VALUE "InternalName", "libGL" VALUE "LegalCopyright", "Copyright (C) 2019 Google Inc." VALUE "OriginalFilename", "openGL32.dll" VALUE "PrivateBuild", ANGLE_VERSION_STRING diff --git a/src/openGL32/openGL32_autogen.cpp b/src/libGL/libGL_autogen.cpp similarity index 99% rename from src/openGL32/openGL32_autogen.cpp rename to src/libGL/libGL_autogen.cpp index 117ee9354..f99932542 100644 --- a/src/openGL32/openGL32_autogen.cpp +++ b/src/libGL/libGL_autogen.cpp @@ -5,26 +5,26 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// openGL32.cpp: Implements the exported Windows GL functions. +// libGL.cpp: Implements the exported Windows GL functions. #include "angle_gl.h" -#include "openGL32/entry_points_gl_1_0_autogen.h" -#include "openGL32/entry_points_gl_1_1_autogen.h" -#include "openGL32/entry_points_gl_1_2_autogen.h" -#include "openGL32/entry_points_gl_1_3_autogen.h" -#include "openGL32/entry_points_gl_1_4_autogen.h" -#include "openGL32/entry_points_gl_1_5_autogen.h" -#include "openGL32/entry_points_gl_2_0_autogen.h" -#include "openGL32/entry_points_gl_2_1_autogen.h" -#include "openGL32/entry_points_gl_3_0_autogen.h" -#include "openGL32/entry_points_gl_3_1_autogen.h" +#include "libGL/entry_points_gl_1_0_autogen.h" +#include "libGL/entry_points_gl_1_1_autogen.h" +#include "libGL/entry_points_gl_1_2_autogen.h" +#include "libGL/entry_points_gl_1_3_autogen.h" +#include "libGL/entry_points_gl_1_4_autogen.h" +#include "libGL/entry_points_gl_1_5_autogen.h" +#include "libGL/entry_points_gl_2_0_autogen.h" +#include "libGL/entry_points_gl_2_1_autogen.h" +#include "libGL/entry_points_gl_3_0_autogen.h" +#include "libGL/entry_points_gl_3_1_autogen.h" #include "common/event_tracer.h" extern "C" { -// OpenGL32 1.0 +// GL 1.0 void GL_APIENTRY glAccum(GLenum op, GLfloat value) { return gl::Accum(op, value); @@ -1610,7 +1610,7 @@ void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height) return gl::Viewport(x, y, width, height); } -// OpenGL32 1.1 +// GL 1.1 GLboolean GL_APIENTRY glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences) @@ -1798,7 +1798,7 @@ void GL_APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const return gl::VertexPointer(size, type, stride, pointer); } -// OpenGL32 1.2 +// GL 1.2 void GL_APIENTRY glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, @@ -1853,7 +1853,7 @@ void GL_APIENTRY glTexSubImage3D(GLenum target, type, pixels); } -// OpenGL32 1.3 +// GL 1.3 void GL_APIENTRY glActiveTexture(GLenum texture) { return gl::ActiveTexture(texture); @@ -2133,7 +2133,7 @@ void GL_APIENTRY glSampleCoverage(GLfloat value, GLboolean invert) return gl::SampleCoverage(value, invert); } -// OpenGL32 1.4 +// GL 1.4 void GL_APIENTRY glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { return gl::BlendColor(red, green, blue, alpha); @@ -2382,7 +2382,7 @@ void GL_APIENTRY glWindowPos3sv(const GLshort *v) return gl::WindowPos3sv(v); } -// OpenGL32 1.5 +// GL 1.5 void GL_APIENTRY glBeginQuery(GLenum target, GLuint id) { return gl::BeginQuery(target, id); @@ -2478,7 +2478,7 @@ GLboolean GL_APIENTRY glUnmapBuffer(GLenum target) return gl::UnmapBuffer(target); } -// OpenGL32 2.0 +// GL 2.0 void GL_APIENTRY glAttachShader(GLuint program, GLuint shader) { return gl::AttachShader(program, shader); @@ -2982,7 +2982,7 @@ void GL_APIENTRY glVertexAttribPointer(GLuint index, return gl::VertexAttribPointer(index, size, type, normalized, stride, pointer); } -// OpenGL32 2.1 +// GL 2.1 void GL_APIENTRY glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, @@ -3031,7 +3031,7 @@ void GL_APIENTRY glUniformMatrix4x3fv(GLint location, return gl::UniformMatrix4x3fv(location, count, transpose, value); } -// OpenGL32 3.0 +// GL 3.0 void GL_APIENTRY glBeginConditionalRender(GLuint id, GLenum mode) { return gl::BeginConditionalRender(id, mode); @@ -3506,7 +3506,7 @@ glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, co return gl::VertexAttribIPointer(index, size, type, stride, pointer); } -// OpenGL32 3.1 +// GL 3.1 void GL_APIENTRY glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, diff --git a/src/openGL32/openGL32_autogen.def b/src/libGL/libGL_autogen.def similarity index 98% rename from src/openGL32/openGL32_autogen.def rename to src/libGL/libGL_autogen.def index 6a4fa97b2..0610fa445 100644 --- a/src/openGL32/openGL32_autogen.def +++ b/src/libGL/libGL_autogen.def @@ -7,7 +7,7 @@ LIBRARY openGL32 EXPORTS - ; OpenGL32 1.0 + ; GL 1.0 glAccum glAlphaFunc glBegin @@ -315,7 +315,7 @@ EXPORTS glVertex4sv glViewport - ; OpenGL32 1.1 + ; GL 1.1 glAreTexturesResident glArrayElement glBindTexture @@ -347,13 +347,13 @@ EXPORTS glTexSubImage2D glVertexPointer - ; OpenGL32 1.2 + ; GL 1.2 glCopyTexSubImage3D glDrawRangeElements glTexImage3D glTexSubImage3D - ; OpenGL32 1.3 + ; GL 1.3 glActiveTexture glClientActiveTexture glCompressedTexImage1D @@ -401,7 +401,7 @@ EXPORTS glMultiTexCoord4sv glSampleCoverage - ; OpenGL32 1.4 + ; GL 1.4 glBlendColor glBlendEquation glBlendFuncSeparate @@ -450,7 +450,7 @@ EXPORTS glWindowPos3s glWindowPos3sv - ; OpenGL32 1.5 + ; GL 1.5 glBeginQuery glBindBuffer glBufferData @@ -471,7 +471,7 @@ EXPORTS glMapBuffer glUnmapBuffer - ; OpenGL32 2.0 + ; GL 2.0 glAttachShader glBindAttribLocation glBlendEquationSeparate @@ -566,7 +566,7 @@ EXPORTS glVertexAttrib4usv glVertexAttribPointer - ; OpenGL32 2.1 + ; GL 2.1 glUniformMatrix2x3fv glUniformMatrix2x4fv glUniformMatrix3x2fv @@ -574,7 +574,7 @@ EXPORTS glUniformMatrix4x2fv glUniformMatrix4x3fv - ; OpenGL32 3.0 + ; GL 3.0 glBeginConditionalRender glBeginTransformFeedback glBindBufferBase @@ -660,7 +660,7 @@ EXPORTS glVertexAttribI4usv glVertexAttribIPointer - ; OpenGL32 3.1 + ; GL 3.1 glCopyBufferSubData glDrawArraysInstanced glDrawElementsInstanced diff --git a/src/openGL32/proc_table_wgl.h b/src/libGL/proc_table_wgl.h similarity index 86% rename from src/openGL32/proc_table_wgl.h rename to src/libGL/proc_table_wgl.h index 43791ef8d..d5fd6e6c3 100644 --- a/src/openGL32/proc_table_wgl.h +++ b/src/libGL/proc_table_wgl.h @@ -7,8 +7,8 @@ // Mapping from a string entry point name to function address. // -#ifndef OPENGL32_PROC_TABLE_H_ -#define OPENGL32_PROC_TABLE_H_ +#ifndef LIBGL_PROC_TABLE_H_ +#define LIBGL_PROC_TABLE_H_ // Define _GDI32_ so that wingdi.h doesn't declare functions as imports #ifndef _GDI32_ @@ -29,4 +29,4 @@ extern wgl::ProcEntry g_procTable[]; extern size_t g_numProcs; } // namespace wgl -#endif // OPENGL32_PROC_TABLE_H_ +#endif // LIBGL_PROC_TABLE_H_ diff --git a/src/openGL32/proc_table_wgl_autogen.cpp b/src/libGL/proc_table_wgl_autogen.cpp similarity index 98% rename from src/openGL32/proc_table_wgl_autogen.cpp rename to src/libGL/proc_table_wgl_autogen.cpp index 97de1d84c..d53fe23e1 100644 --- a/src/openGL32/proc_table_wgl_autogen.cpp +++ b/src/libGL/proc_table_wgl_autogen.cpp @@ -9,19 +9,19 @@ // Mapping from a string entry point name to function address. // -#include "openGL32/proc_table_wgl.h" +#include "libGL/proc_table_wgl.h" -#include "openGL32/entry_points_gl_1_0_autogen.h" -#include "openGL32/entry_points_gl_1_1_autogen.h" -#include "openGL32/entry_points_gl_1_2_autogen.h" -#include "openGL32/entry_points_gl_1_3_autogen.h" -#include "openGL32/entry_points_gl_1_4_autogen.h" -#include "openGL32/entry_points_gl_1_5_autogen.h" -#include "openGL32/entry_points_gl_2_0_autogen.h" -#include "openGL32/entry_points_gl_2_1_autogen.h" -#include "openGL32/entry_points_gl_3_0_autogen.h" -#include "openGL32/entry_points_gl_3_1_autogen.h" -#include "openGL32/entry_points_wgl.h" +#include "libGL/entry_points_gl_1_0_autogen.h" +#include "libGL/entry_points_gl_1_1_autogen.h" +#include "libGL/entry_points_gl_1_2_autogen.h" +#include "libGL/entry_points_gl_1_3_autogen.h" +#include "libGL/entry_points_gl_1_4_autogen.h" +#include "libGL/entry_points_gl_1_5_autogen.h" +#include "libGL/entry_points_gl_2_0_autogen.h" +#include "libGL/entry_points_gl_2_1_autogen.h" +#include "libGL/entry_points_gl_3_0_autogen.h" +#include "libGL/entry_points_gl_3_1_autogen.h" +#include "libGL/entry_points_wgl.h" #include "platform/Platform.h" #define P(FUNC) reinterpret_cast(FUNC) diff --git a/src/openGL32/resource.h b/src/libGL/resource.h similarity index 93% rename from src/openGL32/resource.h rename to src/libGL/resource.h index 7308c2ecf..d0fa3a87a 100644 --- a/src/openGL32/resource.h +++ b/src/libGL/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by libGLESv2.rc +// Used by libGL.rc // Next default values for new objects // diff --git a/src/libGLESv2.gni b/src/libGLESv2.gni index 27dab4040..845038901 100644 --- a/src/libGLESv2.gni +++ b/src/libGLESv2.gni @@ -972,41 +972,41 @@ libangle_null_sources = [ "src/libANGLE/renderer/null/VertexArrayNULL.h", ] -opengl32_sources = [ +libgl_sources = [ "src/common/angleutils.h", "src/common/debug.h", "src/libANGLE/entry_points_enum_autogen.h", "src/libANGLE/entry_points_utils.h", "src/libGLESv2/global_state.cpp", "src/libGLESv2/global_state.h", - "src/openGL32/entry_points_gl_1_0_autogen.cpp", - "src/openGL32/entry_points_gl_1_0_autogen.h", - "src/openGL32/entry_points_gl_1_1_autogen.cpp", - "src/openGL32/entry_points_gl_1_1_autogen.h", - "src/openGL32/entry_points_gl_1_2_autogen.cpp", - "src/openGL32/entry_points_gl_1_2_autogen.h", - "src/openGL32/entry_points_gl_1_3_autogen.cpp", - "src/openGL32/entry_points_gl_1_3_autogen.h", - "src/openGL32/entry_points_gl_1_4_autogen.cpp", - "src/openGL32/entry_points_gl_1_4_autogen.h", - "src/openGL32/entry_points_gl_1_5_autogen.cpp", - "src/openGL32/entry_points_gl_1_5_autogen.h", - "src/openGL32/entry_points_gl_2_0_autogen.cpp", - "src/openGL32/entry_points_gl_2_0_autogen.h", - "src/openGL32/entry_points_gl_2_1_autogen.cpp", - "src/openGL32/entry_points_gl_2_1_autogen.h", - "src/openGL32/entry_points_gl_3_0_autogen.cpp", - "src/openGL32/entry_points_gl_3_0_autogen.h", - "src/openGL32/entry_points_gl_3_1_autogen.cpp", - "src/openGL32/entry_points_gl_3_1_autogen.h", - "src/openGL32/entry_points_wgl.cpp", - "src/openGL32/entry_points_wgl.h", - "src/openGL32/openGL32_autogen.cpp", - "src/openGL32/openGL32_autogen.def", - "src/openGL32/openGL32.rc", - "src/openGL32/proc_table_wgl.h", - "src/openGL32/proc_table_wgl_autogen.cpp", - "src/openGL32/resource.h", + "src/libGL/entry_points_gl_1_0_autogen.cpp", + "src/libGL/entry_points_gl_1_0_autogen.h", + "src/libGL/entry_points_gl_1_1_autogen.cpp", + "src/libGL/entry_points_gl_1_1_autogen.h", + "src/libGL/entry_points_gl_1_2_autogen.cpp", + "src/libGL/entry_points_gl_1_2_autogen.h", + "src/libGL/entry_points_gl_1_3_autogen.cpp", + "src/libGL/entry_points_gl_1_3_autogen.h", + "src/libGL/entry_points_gl_1_4_autogen.cpp", + "src/libGL/entry_points_gl_1_4_autogen.h", + "src/libGL/entry_points_gl_1_5_autogen.cpp", + "src/libGL/entry_points_gl_1_5_autogen.h", + "src/libGL/entry_points_gl_2_0_autogen.cpp", + "src/libGL/entry_points_gl_2_0_autogen.h", + "src/libGL/entry_points_gl_2_1_autogen.cpp", + "src/libGL/entry_points_gl_2_1_autogen.h", + "src/libGL/entry_points_gl_3_0_autogen.cpp", + "src/libGL/entry_points_gl_3_0_autogen.h", + "src/libGL/entry_points_gl_3_1_autogen.cpp", + "src/libGL/entry_points_gl_3_1_autogen.h", + "src/libGL/entry_points_wgl.cpp", + "src/libGL/entry_points_wgl.h", + "src/libGL/libGL_autogen.cpp", + "src/libGL/libGL_autogen.def", + "src/libGL/libGL.rc", + "src/libGL/proc_table_wgl.h", + "src/libGL/proc_table_wgl_autogen.cpp", + "src/libGL/resource.h", ] libglesv2_sources = [