From 04ef9efcdf1de5de7fc17cdc3aa6411757df9dd8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 12 Jul 2014 19:03:01 +0300
Subject: Simplify assignFunction and add two args function assignFunction2.

---
 src/render/mglfunctions.h | 13 +++++++++++--
 src/render/mglxinit.cpp   | 14 +++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'src/render')

diff --git a/src/render/mglfunctions.h b/src/render/mglfunctions.h
index bfddb5a2c..569f4aac4 100644
--- a/src/render/mglfunctions.h
+++ b/src/render/mglfunctions.h
@@ -36,7 +36,16 @@
     reinterpret_cast<const GLubyte*>(name))
 #endif
 
-#define assignFunction(func, name) \
+#define assignFunction(func) \
+    { \
+        m##func = reinterpret_cast<func##_t>(getFunction(#func)); \
+        if (m##func == nullptr) \
+            logger->log("function not found: " #func); \
+        else \
+            logger->log("assigned function: " #func); \
+    }
+
+#define assignFunction2(func, name) \
     { \
         m##func = reinterpret_cast<func##_t>(getFunction(name)); \
         if (m##func == nullptr) \
@@ -45,7 +54,7 @@
             logger->log(std::string("assigned function: ") + name); \
     }
 
-#define assignFunctionEmu(func, name) \
+#define assignFunctionEmu2(func, name) \
     { \
         m##func = reinterpret_cast<func##_t>(getFunction(name)); \
         if (m##func == nullptr) \
diff --git a/src/render/mglxinit.cpp b/src/render/mglxinit.cpp
index 8908b1b4f..e6763d45e 100644
--- a/src/render/mglxinit.cpp
+++ b/src/render/mglxinit.cpp
@@ -30,13 +30,13 @@
 
 void Glx::initFunctions()
 {
-    assignFunction(glXCreateContext, "glXCreateContext");
-    assignFunction(glXGetCurrentContext, "glXGetCurrentContext");
-    assignFunction(glXCreateContextAttribs, "glXCreateContextAttribsARB");
-    assignFunction(glXChooseFBConfig, "glXChooseFBConfig");
-    assignFunction(glXDestroyContext, "glXDestroyContext");
-    assignFunction(glXMakeCurrent, "glXMakeCurrent");
-    assignFunction(glXSwapBuffers, "glXSwapBuffers");
+    assignFunction2(glXCreateContext, "glXCreateContext");
+    assignFunction2(glXGetCurrentContext, "glXGetCurrentContext");
+    assignFunction2(glXCreateContextAttribs, "glXCreateContextAttribsARB");
+    assignFunction2(glXChooseFBConfig, "glXChooseFBConfig");
+    assignFunction2(glXDestroyContext, "glXDestroyContext");
+    assignFunction2(glXMakeCurrent, "glXMakeCurrent");
+    assignFunction2(glXSwapBuffers, "glXSwapBuffers");
 }
 
 #endif
-- 
cgit v1.2.3-70-g09d2