From a23b3d26f407ee9647e49f2802c5da5d26e752ad Mon Sep 17 00:00:00 2001 From: David Korth Date: Thu, 12 Sep 2019 00:21:29 -0400 Subject: [PATCH] GLExtensions.cpp: Use arrays of `const char *const` instead of `std::string`. The strings end up being copied, so we might as well initialize the std::string in the unordered_map directly. --- .../Common/GL/GLExtensions/GLExtensions.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp index 641559a29a..37cea21ebd 100644 --- a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp @@ -2198,7 +2198,7 @@ static void InitExtensionList(GLContext* context) default: case 450: { - std::string gl450exts[] = { + static const char* const gl450exts[] = { "GL_ARB_ES3_1_compatibility", "GL_ARB_clip_control", "GL_ARB_conditional_render_inverted", @@ -2216,7 +2216,7 @@ static void InitExtensionList(GLContext* context) } case 440: { - std::string gl440exts[] = { + static const char* const gl440exts[] = { "GL_ARB_buffer_storage", "GL_ARB_clear_texture", "GL_ARB_enhanced_layouts", @@ -2232,7 +2232,7 @@ static void InitExtensionList(GLContext* context) } case 430: { - std::string gl430exts[] = { + static const char* const gl430exts[] = { "GL_ARB_ES3_compatibility", "GL_ARB_arrays_of_arrays", "GL_ARB_clear_buffer_object", @@ -2260,7 +2260,7 @@ static void InitExtensionList(GLContext* context) } case 420: { - std::string gl420exts[] = { + static const char* const gl420exts[] = { "GL_ARB_base_instance", "GL_ARB_compressed_texture_pixel_storage", "GL_ARB_conservative_depth", @@ -2280,7 +2280,7 @@ static void InitExtensionList(GLContext* context) } case 410: { - std::string gl410exts[] = { + static const char* const gl410exts[] = { "GL_ARB_ES2_compatibility", "GL_ARB_get_program_binary", "GL_ARB_separate_shader_objects", @@ -2294,7 +2294,7 @@ static void InitExtensionList(GLContext* context) } case 400: { - std::string gl400exts[] = { + static const char* const gl400exts[] = { "GL_ARB_draw_indirect", "GL_ARB_gpu_shader5", "GL_ARB_gpu_shader_fp64", @@ -2314,7 +2314,7 @@ static void InitExtensionList(GLContext* context) } case 330: { - std::string gl330exts[] = { + static const char* const gl330exts[] = { "GL_ARB_shader_bit_encoding", "GL_ARB_blend_func_extended", "GL_ARB_explicit_attrib_location", @@ -2332,7 +2332,7 @@ static void InitExtensionList(GLContext* context) } case 320: { - std::string gl320exts[] = { + static const char* const gl320exts[] = { "GL_ARB_geometry_shader4", "GL_ARB_sync", "GL_ARB_vertex_array_bgra", @@ -2350,7 +2350,7 @@ static void InitExtensionList(GLContext* context) case 310: { // Can't add NV_primitive_restart since function name changed - std::string gl310exts[] = { + static const char* const gl310exts[] = { "GL_ARB_draw_instanced", "GL_ARB_copy_buffer", "GL_ARB_texture_buffer_object", @@ -2366,7 +2366,7 @@ static void InitExtensionList(GLContext* context) { // Quite a lot of these had their names changed when merged in to core // Disable the ones that have - std::string gl300exts[] = { + static const char* const gl300exts[] = { "GL_ARB_map_buffer_range", "GL_ARB_color_buffer_float", "GL_ARB_texture_float",