c: moves global static handle out of getter, initializes handle by de…

…fault
aragajaga · Oct 21, 2022 · 24ddbba · 24ddbba
1 parent e0b64d9
commit 24ddbba
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/glad/generator/c/templates/base_template.c b/glad/generator/c/templates/base_template.c
@@ -20,7 +20,8 @@ extern "C" {
 
 {% block variables %}
 {% if options.mx_global %}
-Glad{{ feature_set.name|api }}Context* {{ global_context }};
+{% call template_utils.zero_initialized() %}Glad{{ feature_set.name|api }}Context {{ global_context }}_static{% endcall %}
+Glad{{ feature_set.name|api }}Context* {{ global_context }} = &{{ global_context }}_static;
 {% endif %}
 {% endblock %}
 

diff --git a/glad/generator/c/templates/gl.c b/glad/generator/c/templates/gl.c
@@ -230,9 +230,6 @@ int gladLoad{{ api|api }}(GLADloadfunc load) {
 
 {% if options.mx_global %}
 Glad{{ feature_set.name|api }}Context* gladGet{{ feature_set.name|api }}Context() {
-    static Glad{{ feature_set.name|api }}Context default_context;
-    if (!{{ global_context }})
-        {{ global_context }} = &default_context;
     return {{ global_context }};
 }
 

diff --git a/glad/generator/c/templates/vk.c b/glad/generator/c/templates/vk.c
@@ -228,9 +228,6 @@ int gladLoad{{ api|api }}(VkPhysicalDevice physical_device, GLADloadfunc load) {
 
 {% if options.mx_global %}
 Glad{{ feature_set.name|api }}Context* gladGet{{ feature_set.name|api }}Context() {
-    static Glad{{ feature_set.name|api }}Context default_context;
-    if (!{{ global_context }})
-        {{ global_context }} = &default_context;
     return {{ global_context }};
 }