Merged pull requests 138, 139, and 140

 - Default to hidden visibility for Regal and statically linked library dependencies.
 - Update boost headers to 1.56.0 to get newer compiler support for Visual Studio 2013
 - Add Linux support for abi-dumper output for Regal and Regalw shared library targets.
Don't include <machine/cpu-features.h> as this was causing compile issues on Android.
Fix the paths of ES & EGL libraries to load on Android.
Bump 'export'ed version to 4.5 and regen all the files.

Initial version of script to convert khronos xml files into Regal's .py format.
See https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api
Includes a lot of reconciliation of Regal's gl.py and Khronos gl.xml.

Author: Scott Nations

Makefile.apitrace

@@ -40,6 +40,8 @@ APITRACE.DEPS       := $(APITRACE.OBJS:.o=.d)
 
 -include $(APITRACE.DEPS)
 
+APITRACE.CFLAGS     += -fvisibility=hidden
+
 ifneq ($(filter linux%,$(SYSTEM)),)
 APITRACE.CFLAGS  += -DHAVE_X11=1
 endif

Makefile.glsloptlib

@@ -27,6 +27,8 @@ GLSLOPT.OBJS       := $(GLSLOPT.OBJS:.c=.o) $(GLSLOPT.OBJS:.cpp=.o)
 GLSLOPT.OBJS       := $(filter %.o,$(GLSLOPT.OBJS))
 GLSLOPT.DEPS       := $(GLSLOPT.OBJS:.o=.d)
 GLSLOPT.CFLAGS     := $(GLSLOPT.INCLUDE)
+GLSLOPT.CFLAGS     += -fvisibility=hidden
+
 # quiet build for this thirdparty code for now
 GLSLOPT.CFLAGS     += -Wno-sign-compare
 

Makefile.libpng

@@ -29,6 +29,8 @@ LIBPNG.DEPS       := $(LIBPNG.DEPS:.o=.d)
 
 -include $(LIBPNG.DEPS)
 
+LIBPNG.CFLAGS     += -fvisibility=hidden
+
 ifeq ($(filter-out linux% darwin% nacl%,$(SYSTEM)),)
 LIBPNG.CFLAGS     += -DHAVE_UNISTD_H
 endif

Makefile.pcrelib

@@ -29,6 +29,7 @@ PCRE.OBJS       := $(filter %.o,$(PCRE.OBJS))
 PCRE.DEPS       := $(PCRE.OBJS:.o=.d)
 PCRE.CFLAGS     := $(PCRE.INCLUDE)
 PCRE.CFLAGS     += -DHAVE_CONFIG_H
+PCRE.CFLAGS     += -fvisibility=hidden
 
 ifeq ($(MODE),release)
 PCRE.CFLAGS  += -DNDEBUG

Makefile.regal

@@ -16,7 +16,7 @@ include build/regal.inc
 #
 
 export:
-	python scripts/Export.py --api gl 4.4 --api wgl 4.4 --api glx 4.4 --api cgl 1.4 --api egl 1.0 --outdir .
+	python scripts/Export.py --api gl 4.5 --api wgl 4.5 --api glx 4.5 --api cgl 1.4 --api egl 1.0 --outdir .
 
 # Shared library target not currently supported for NaCL or emscripten
 
@@ -304,6 +304,9 @@ endif
 ifneq ($(STRIP),)
 	$(LOG_STRIP)$(STRIP) -x $@
 endif
+ifneq ($(ABIDUMP),)
+	$(LOG_ABIDUMP)$(ABIDUMP) $@ -o [email protected]
+endif
 endif
 
 tmp/$(SYSTEM)/regal/static/%.o: src/regal/%.cpp $(REGAL.HEADERS)

Makefile.regalw

@@ -137,6 +137,9 @@ endif
 ifneq ($(STRIP),)
 	$(LOG_STRIP)$(STRIP) -x $@
 endif
+ifneq ($(ABIDUMP),)
+	$(LOG_ABIDUMP)$(ABIDUMP) $@ -o [email protected]
+endif
 endif
 
 tmp/$(SYSTEM)/regalw/static/%.o: src/regal/%.cpp $(REGALW.HEADERS)

Makefile.snappy

@@ -28,6 +28,8 @@ SNAPPY.DEPS       := $(SNAPPY.DEPS:.o=.d)
 
 -include $(SNAPPY.DEPS)
 
+SNAPPY.CFLAGS     += -fvisibility=hidden
+
 ifeq ($(filter-out linux% darwin% nacl%,$(SYSTEM)),)
 SNAPPY.CFLAGS     += -DHAVE_UNISTD_H
 endif

Makefile.zlib

@@ -24,6 +24,8 @@ ZLIB.DEPS       := $(ZLIB.OBJS:.o=.d)
 
 -include $(ZLIB.DEPS)
 
+ZLIB.CFLAGS     += -fvisibility=hidden
+
 ifeq ($(filter-out linux% darwin% nacl%,$(SYSTEM)),)
 ZLIB.CFLAGS     += -DHAVE_UNISTD_H
 endif

build/common.inc

@@ -53,15 +53,16 @@ OPT   ?= $(CFLAGS.RELEASE)
 endif
 
 ifndef V
-LOG_CXX    ?= @echo " [CXX]    $@";
-LOG_CC     ?= @echo " [CC]     $@";
-LOG_LD     ?= @echo " [LD]     $@";
-LOG_AR     ?= @echo " [AR]     $@";
-LOG_RANLIB ?= @echo " [RANLIB] $@";
-LOG_STRIP  ?= @echo " [STRIP]  $@";
-LOG_LN     ?= @echo " [LN]     $@";
-LOG_CP     ?= @echo " [CP]     $@";
-LOG_MKDIR  ?= @echo " [MKDIR]  $@";
+LOG_CXX     ?= @echo " [CXX]     $@";
+LOG_CC      ?= @echo " [CC]      $@";
+LOG_LD      ?= @echo " [LD]      $@";
+LOG_AR      ?= @echo " [AR]      $@";
+LOG_RANLIB  ?= @echo " [RANLIB]  $@";
+LOG_STRIP   ?= @echo " [STRIP]   $@";
+LOG_LN      ?= @echo " [LN]      $@";
+LOG_CP      ?= @echo " [CP]      $@";
+LOG_MKDIR   ?= @echo " [MKDIR]   $@";
+LOG_ABIDUMP ?= @echo " [ABIDUMP] $@";
 endif
 
 INCLUDE ?= -Iinclude

config/Makefile.linux

@@ -3,6 +3,9 @@ CC = cc
 CXX = c++
 LD = cc
 RANLIB :=
+# don't use abi-dumper by default
+# ABIDUMP = abi-dumper -bin-only -lver HEAD
+ABIDUMP =
 EXT.DYNAMIC = so
 PICFLAG = -fPIC
 M_ARCH ?= $(shell uname -m)

include/GL/Regal.h

@@ -677,7 +677,7 @@
     'impl' : [
        'if (REGAL_FORCE_ES2_PROFILE || !_context->info->gl_ext_draw_buffers2)',
        '{',
-       '  if (!buf)'
+       '  if (!index)'
        '  {',
        '    DispatchTableGL *_next = _context->dispatcher.emulation.next();',
        '    RegalAssert(_next);',

scripts/EmuFilter.py

@@ -89,7 +89,7 @@ def add(self, parameter):
 
 class Return:
 
-  def __init__(self, type = '', default = '', cast = None, binary = False, size = None, maxSize = None, intercept = None, trace = True, play = True, filter = None, regalLog = None):
+  def __init__(self, type = 'void', default = '', cast = None, binary = False, size = None, maxSize = None, intercept = None, trace = True, play = True, filter = None, regalLog = None):
 
     self.type      = type           # Type string, e.g. int
     self.default   = default        # Default value, e.g. 0

scripts/api/Api.py

@@ -209,9 +209,9 @@ def writeExtensions(file,name,extensions):
     if getattr(i,'category') != None and len(i.category):
       print >>file, '%s.category = \'%s\''%(i.name,i.category)
     if len(i.enumerants):
-      print >>file, '%s.enumerants = [\'%s\']'%(i.name,'\',\''.join(i.enumerants))
+      print >>file, '%s.enumerants = [\'%s\']'%(i.name,'\',\''.join(sorted(i.enumerants)))
     if len(i.functions):
-      print >>file, '%s.functions = [\'%s\']'%(i.name,'\',\''.join(i.functions))
+      print >>file, '%s.functions = [\'%s\']'%(i.name,'\',\''.join(sorted(i.functions)))
     if len(i.emulatedBy):
       print >>file, '%s.emulatedBy = \'%s\''%(i.name,i.emulatedBy)
     if len(i.emulatedIf):