1. 19 Jan, 2015 1 commit
  2. 23 Jun, 2014 3 commits
    • Chad Versace's avatar
      util: Generate piglit_get_gl_enum_name() and friends · e31de330
      Chad Versace authored
      This patch removes the files "piglit-util-gl*-enum.c" and replaces them
      with a single file "piglit-util-gl-enum-gen.c" generated from the
      Khronos XML.
      
      The two functions now generated are:
          piglit_get_gl_enum_name(GLenum param)
          piglit_get_prim_name(GLenum prim)
      Signed-off-by: default avatarChad Versace <chad.versace@linux.intel.com>
      e31de330
    • Chad Versace's avatar
      dispatch: Generate piglit-dispatch from Khronos XML · ac1f382d
      Chad Versace authored
      Khronos now generates its headers from XML and no longer maintains the
      old, crufty *.spec files. Piglit should do the same. Otherwise,
      piglit-dispatch won't be able to pick up new extension functions.
      
      As a really really big bonus, after Piglit starts generating its GL
      dispatch code from gl.xml, it will be a small step to start generating
      EGL and GLX dispatch from egl.xml and glx.xml.
      
      This patch imports 'gl.xml' into a new toplevel "registry" directory, to
      follow the precedent of libepoxy.
      
      This patch follows the precedent of libepoxy by importing "gl.xml" into
      a new toplevel "registry" directory.
      
      I did *not* try to redesign piglit-dispatch in this patch. To the
      contrary, I attempted to keep the newly generated dispatch code to be as
      similar as possible as the old generated code. Despite wanting to clean
      up piglit-dispatch's design, I refrained because "a patch should do one
      thing, and do it well".
      
      I strove to keep separate concerns in separate files. File
      "registry/gl.py" parses "registry/gl.xml". File
      "tests/util/gen_dispatch.py" generates code from the that parsed result.
      This decision kept gen_dispatch.py small and focused.
      
      I hope everyone finds the rewritten gen_dispatch.py more maintainable
      and easy to read.
      
      The generated code has changed as following:
      
        - It now contains the GLES1 API, because gl.xml contains information
          on all OpenGL APIs.
      
        - The comment block for each function alias set now contains more
          information. For each function in the set, it now lists the
          complete set of providers.
      
          For example:
            /* glActiveTexture (GL_VERSION_1_3) (GL_VERSION_ES_CM_1_0) (GL_ES_VERSION_2_0) */
            /* glActiveTextureARB (GL_ARB_multitexture) */
            extern PFNGLACTIVETEXTUREPROC piglit_dispatch_glActiveTexture;
            #define glActiveTexture piglit_dispatch_glActiveTexture
            #define glActiveTextureARB piglit_dispatch_glActiveTexture
      
        - Enums are sorted by group then by value. Old dispatch sorted only by
          value.
      
          For example:
            /* Enum Group MapBufferUsageMask */
            #define GL_MAP_READ_BIT 0x0001
            #define GL_MAP_READ_BIT_EXT 0x0001
            #define GL_MAP_WRITE_BIT 0x0002
            #define GL_MAP_WRITE_BIT_EXT 0x0002
            ...
      
      Tested for regressions with:
          piglit run -p x11_egl -x glx -x glean
          Mesa 10.2.1
          Intel Ivybridge
          Fedora 20
      
      v3, for Dylan:
        - Replace ElementTree with cElementTree, for speed.
        - Each method $foo in KeyedOrderedSet that returns
          a generator, rename it to iter${foo} to follow Python2 (not 3)
          naming conventions.
        - Python 2.6 lacks OrderedDict, so don't use it.
        - Remove unused import 'dedent'.
        - Python 2.6 does not recognize the syntax for set literals, so
          replace each set literal with a list literal or generator literal.
        - Replace sys.stderr.write with print(file=sys.stderr).
        - Remove hand-coded OrderedKeyedSet.copy and instead use copy module.
        - Prefer the 'lxml' module (it uses libxml2) over Python's builtin 'xml' module.
        - Replace methods ``def foo(x, y):`` with ``def foo(self, other):``.
        - Replace lists with generators in methods Command.c_*_param_list.
        - PEP8: Separate all toplevel items with 2 newlines.
        - PEP8: Fix minor whitespace issues.
        - PEP8: Replace some ``== None`` with ``is None``.
        - Replace None-check for --out-dir with add_argument(..., required=True)
        - Remove 'prog' assignment when calling ArgumentParser(prog=PROG_NAME).
          Instead, use default value
      Signed-off-by: default avatarChad Versace <chad.versace@linux.intel.com>
      ac1f382d
    • Chad Versace's avatar
      util: Rename generated dispatch files · def993a7
      Chad Versace authored
      Rename the files "generated_dispatch.[ch]" to
      "piglit-dispatch-gen.[ch]".  They now follow the same filename
      convention ("piglit-*.[ch]") used by most other files in tests/util.
      Signed-off-by: default avatarChad Versace <chad.versace@linux.intel.com>
      def993a7
  3. 23 Mar, 2012 1 commit
    • Paul Berry's avatar
      piglit-dispatch: Code generation scripts. · 6fe17bb7
      Paul Berry authored
      This patch contains the code generation scripts that convert the files
      gl.spec, gl.tm, and enumext.spec into C code, as well as the CMake
      directives to run the scripts.
      
      Code generation occurs in two phases: first the script
      glapi/parse_glspec.py converts the .spec and .tm files into an
      intermediate JSON format, which is stored in glapi/glapi.json.  Then,
      the script tests/util/gen_dispatch.py converts the JSON file into two
      files, tests/util/generated_dispatch.c and
      tests/util/generated_dispatch.h.
      
      There are two motivations for breaking code generation into two phases:
      (1) there are other code generation tasks we may add in the future
      (e.g. generating the tests/util/piglit-util-enum.c file), and it would
      be nice not to have to rewrite any parsing code when we do so.  (2) if
      the GL consortium ever decides to change the format of gl.spec, gl.tm,
      and enumext.spec, then we only have to change parse_glspec.py.
      
      These code generation scripts can be run by invoking "make
      piglit_dispatch_gen" from the toplevel source directory.
      
      v2: Add clarifying comments, remove a bogus "print" statement, and
      raise an exception if an unrecognized multiplicity is encountered.
      Also, handle "reference" multiplicity.
      
      v3: Add APIENTRY to stub functions.  Rename "near" and "far" to avoid
      problems on MSVC.  Get rid of "__" in function names.  Rename
      initialize_dispatch_pointers => reset_dispatch_pointers.  Add
      gl_10x_version parameter to get_core_proc().  Output generated code
      relative to CMAKE_BINARY_DIR so that it won't pollute source
      directories when building out of tree.  Add .gitignore so that
      generated files are ignored when building in tree.  Add GL_VERSION_*
      defines.
      6fe17bb7
  4. 01 Oct, 2009 2 commits