generator: Fixes issues #28 and #29.

Dav1dde · Aug 18, 2015 · 8722e2b · 8722e2b
1 parent f8bae3b
commit 8722e2b
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 23 deletions.
diff --git a/glad/__main__.py b/glad/__main__.py
@@ -118,7 +118,7 @@ def cmdapi(value):
  if loader_cls is None:
  return parser.error('API/Spec not yet supported')
 
- loader = loader_cls()
+ loader = loader_cls(api)
  loader.disabled = ns.no_loader
 
  print('Generating {spec} bindings...'.format(spec=spec.NAME))

diff --git a/glad/lang/c/generator.py b/glad/lang/c/generator.py
@@ -158,7 +158,7 @@ def generate_features(self, features):
 
  f = self._f_c
  self.write_code_head(f)
- self.loader.write(f, self.api.keys())
+ self.loader.write(f)
  self.loader.write_has_ext(f)
 
  if self.spec.NAME in ('gl', 'glx', 'wgl'):

diff --git a/glad/lang/c/loader/egl.py b/glad/lang/c/loader/egl.py
@@ -39,7 +39,6 @@
 #endif
 
 typedef void* (* GLADloadproc)(const char *name);
-GLAPI int gladLoadEGLLoader(GLADloadproc);
 '''
 
 _EGL_HEADER_LOADER = '''
@@ -59,7 +58,7 @@
 
 
 class EGLCLoader(BaseLoader):
- def write(self, fobj, apis):
+ def write(self, fobj):
  if not self.disabled:
  fobj.write(_EGL_LOADER)
 

diff --git a/glad/lang/c/loader/gl.py b/glad/lang/c/loader/gl.py
@@ -185,8 +185,8 @@
 
 
 class OpenGLCLoader(BaseLoader):
- def write(self, fobj, apis):
- if not self.disabled and 'gl' in apis:
+ def write(self, fobj):
+ if not self.disabled and 'gl' in self.apis:
  fobj.write(_OPENGL_LOADER)
 
  def write_begin_load(self, fobj):
@@ -209,7 +209,7 @@ def write_has_ext(self, fobj):
 
  def write_header(self, fobj):
  fobj.write(_OPENGL_HEADER)
- if not self.disabled:
+ if not self.disabled and 'gl' in self.apis:
  fobj.write(_OPENGL_HEADER_LOADER)
 
  def write_header_end(self, fobj):

diff --git a/glad/lang/c/loader/glx.py b/glad/lang/c/loader/glx.py
@@ -98,7 +98,7 @@
 
 
 class GLXCLoader(BaseLoader):
- def write(self, fobj, apis):
+ def write(self, fobj):
  if not self.disabled:
  fobj.write(_GLX_LOADER)
 

diff --git a/glad/lang/c/loader/wgl.py b/glad/lang/c/loader/wgl.py
@@ -102,7 +102,7 @@
 '''
 
 class WGLCLoader(BaseLoader):
- def write(self, fobj, apis):
+ def write(self, fobj):
  if not self.disabled:
  fobj.write(_WGL_LOADER)
 

diff --git a/glad/lang/common/loader.py b/glad/lang/common/loader.py
@@ -1,8 +1,9 @@
 class BaseLoader(object):
- def __init__(self, disabled=False):
+ def __init__(self, apis, disabled=False):
+ self.apis = apis
  self.disabled = disabled
 
- def write(self, fobj, apis):
+ def write(self, fobj):
  raise NotImplementedError
 
  def write_begin_load(self, fobj):
@@ -37,7 +38,7 @@ def write_header_end(self, fobj):
  def write_has_ext(self, fobj):
  pass
 
- def write(self, fobj, apis):
+ def write(self, fobj):
  pass
 
  def write_header(self, fobj):

diff --git a/glad/lang/d/generator.py b/glad/lang/d/generator.py
@@ -503,7 +503,7 @@ def generate_loader(self, features, extensions):
  self.write_module(f, self.LOADER)
  self.write_imports(f, [self.FUNCS, self.EXT, self.ENUMS, self.TYPES])
 
- self.loader.write(f, self.api.keys())
+ self.loader.write(f)
  self.loader.write_has_ext(f)
 
  written = set()

diff --git a/glad/lang/d/loader/egl.py b/glad/lang/d/loader/egl.py
@@ -21,7 +21,7 @@ def write_header_end(self, fobj):
  def write_header(self, fobj):
  pass
 
- def write(self, fobj, apis):
+ def write(self, fobj):
  fobj.write('alias Loader = void* delegate(const(char)*);\n')
  if not self.disabled:
  fobj.write(_EGL_LOADER)

diff --git a/glad/lang/d/loader/gl.py b/glad/lang/d/loader/gl.py
@@ -97,9 +97,9 @@ def write_header_end(self, fobj):
  def write_header(self, fobj):
  pass
 
- def write(self, fobj, apis):
+ def write(self, fobj):
  fobj.write('alias Loader = void* delegate(const(char)*);\n')
- if not self.disabled and 'gl' in apis:
+ if not self.disabled and 'gl' in self.apis:
  fobj.write(_OPENGL_LOADER)
 
  def write_begin_load(self, fobj):

diff --git a/glad/lang/d/loader/glx.py b/glad/lang/d/loader/glx.py
@@ -31,7 +31,7 @@ def write_header_end(self, fobj):
  def write_header(self, fobj):
  pass
 
- def write(self, fobj, apis):
+ def write(self, fobj):
  fobj.write('alias Loader = void* delegate(const(char)*);\n')
  if not self.disabled:
  fobj.write(_GLX_LOADER)

diff --git a/glad/lang/d/loader/wgl.py b/glad/lang/d/loader/wgl.py
@@ -18,7 +18,7 @@ def write_header_end(self, fobj):
  def write_header(self, fobj):
  pass
 
- def write(self, fobj, apis):
+ def write(self, fobj):
  fobj.write('alias Loader = void* delegate(const(char)*);\n')
  if not self.disabled:
  fobj.write(_WGL_LOADER)

diff --git a/glad/lang/volt/loader/egl.py b/glad/lang/volt/loader/egl.py
@@ -30,7 +30,7 @@ def write_header_end(self, fobj):
  def write_header(self, fobj):
  pass
 
- def write(self, fobj, apis):
+ def write(self, fobj):
  fobj.write('import watt.library;\n')
  if not self.disabled:
  fobj.write(_EGL_LOADER)

diff --git a/glad/lang/volt/loader/gl.py b/glad/lang/volt/loader/gl.py
@@ -35,9 +35,9 @@ def write_header_end(self, fobj):
  def write_header(self, fobj):
  pass
 
- def write(self, fobj, apis):
+ def write(self, fobj):
  fobj.write('import watt.library;\n')
- if not self.disabled and 'gl' in apis:
+ if not self.disabled and 'gl' in self.apis:
  fobj.write(_OPENGL_LOADER)
 
  def write_begin_load(self, fobj):

diff --git a/glad/lang/volt/loader/glx.py b/glad/lang/volt/loader/glx.py
@@ -29,7 +29,7 @@
 
 
 class GLXVoltLoader(BaseLoader):
- def write(self, fobj, apis):
+ def write(self, fobj):
  fobj.write('import watt.library;\n')
  if not self.disabled:
  fobj.write(_GLX_LOADER)

diff --git a/glad/lang/volt/loader/wgl.py b/glad/lang/volt/loader/wgl.py
@@ -17,7 +17,7 @@ def write_header_end(self, fobj):
  def write_header(self, fobj):
  pass
 
- def write(self, fobj, apis):
+ def write(self, fobj):
  fobj.write('import watt.library;\n')
  if not self.disabled:
  fobj.write(_WGL_LOADER)