Mesa (master): mesa: reuse set_extension() for _mesa_extension_override_disables

Emil Velikov evelikov at kemper.freedesktop.org
Thu Nov 16 14:18:58 UTC 2017


Module: Mesa
Branch: master
Commit: a3f82876f4471b88158074766c6115e15642d734
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3f82876f4471b88158074766c6115e15642d734

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Oct 24 15:57:08 2017 +0100

mesa: reuse set_extension() for _mesa_extension_override_disables

We already use it for _mesa_extension_override_enables.
Improve consistency and use it for both extension lists.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/main/extensions.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 351ed1c4dd..2468e19bf9 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -287,12 +287,11 @@ _mesa_one_time_init_extension_overrides(void)
 
       i = name_to_index(ext);
       offset = set_extension(&_mesa_extension_override_enables, i, enable);
-      if (offset != 0 && (offset != o(dummy_true) || enable != GL_FALSE)) {
-         ((GLboolean *) &_mesa_extension_override_disables)[offset] = !enable;
+      offset = set_extension(&_mesa_extension_override_disables, i, !enable);
+      if (offset != 0)
          recognized = true;
-      } else {
+      else
          recognized = false;
-      }
 
       if (!recognized && enable) {
          strcat(extra_extensions, ext);




More information about the mesa-commit mailing list