Merge branch 'master' of slp-info.sec.samsung.net:slp/pkgs/c/coregl

diff --combined src/coregl_internal.h
index b973b50,5b2df5a..e295554
--- 1/src/coregl_internal.h
--- 2/src/coregl_internal.h
+++ b/src/coregl_internal.h
@@@ -5,8 -5,6 +5,8 @@@
  
  #include "coregl.h"
  
 +#define unlikely(x) __builtin_expect(x, 0)
 +
  // Symbol definition for real
  #define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     extern RET_TYPE (*_sym_##FUNC_NAME) PARAM_LIST;
  # include "headers/sym.h"
@@@ -46,7 -44,7 +46,7 @@@ typedef GLuint       GLuintmask
  //#define COREGL_TRACE_ALL
  #define COREGL_TRACE_CONTEXT_INFO
  #define COREGL_TRACE_STATE_INFO
- #define COREGL_TRACE_APICALL_INFO
+ //#define COREGL_TRACE_APICALL_INFO
  
  #ifdef COREGL_TRACE_ALL
  #define COREGL_TRACE_CONTEXT_INFO   // Context state & thread state & Glue-context info
@@@ -92,11 -90,11 +92,11 @@@ typedef struct _Trace_Data Trace_Data
  
  #define _COREGL_WRAP_FUNC_BEGIN() \
        static void *trace_hint = NULL; \
 -      if (trace_api_flag == 1) \
 +      if (unlikely(trace_api_flag == 1)) \
                trace_hint = _COREGL_TRACE_API_BEGIN(__func__, trace_hint, 1);
  
  #define _COREGL_WRAP_FUNC_END() \
 -      if (trace_api_flag == 1) \
 +      if (unlikely(trace_api_flag == 1)) \
                _COREGL_TRACE_API_END(__func__, trace_hint, 1);
  
  typedef enum _CoreGL_Opt_Flag