From 3a5c3dc276a13a286a6747915d3ffc1ec4d3faea Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Sat, 13 Sep 2014 13:36:06 +0800 Subject: [PATCH] xgl-generate: do not hardcode #include's Add core_headers to xgl.py and use it to generate #include's --- xgl-generate.py | 18 +++--------------- xgl.py | 3 +++ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/xgl-generate.py b/xgl-generate.py index a885c68..16698b5 100755 --- a/xgl-generate.py +++ b/xgl-generate.py @@ -33,9 +33,11 @@ class Subcommand(object): def __init__(self, argv): self.argv = argv self.protos = () + self.headers = () def run(self): self.protos = xgl.core + self.headers = xgl.core_headers print(self.generate()) def generate(self): @@ -84,7 +86,7 @@ class Subcommand(object): */""" def generate_header(self): - pass + return "\n".join(["#include <" + h + ">" for h in self.headers]) def generate_body(self): pass @@ -140,20 +142,6 @@ class LoaderSubcommand(Subcommand): return "\n\n".join(body) class IcdDispatchTableSubcommand(Subcommand): - def generate_header(self): - return "\n".join([ - "#include ", - "#include "]) - - def generate_body(self): - return self._generate_icd_dispatch_table() - -class IcdDispatchTableSubcommand(Subcommand): - def generate_header(self): - return "\n".join([ - "#include ", - "#include "]) - def generate_body(self): return self._generate_icd_dispatch_table() diff --git a/xgl.py b/xgl.py index ef358ce..58030a7 100644 --- a/xgl.py +++ b/xgl.py @@ -696,8 +696,11 @@ core = ( (Param("XGL_CMD_BUFFER", "cmdBuffer"))), ) +core_headers = ("xgl.h", "xglDbg.h") + # the dispatch table defined for ICDs # XXX figure out the real order +# XXX this is not extensible icd_dispatch_table = ( "InitAndEnumerateGpus", "GetGpuInfo", -- 2.7.4