[Piglit] [PATCH 0/6] Generate dispatch from Khronos XML and use dispatch for GLES1

Chad Versace chad.versace at linux.intel.com
Fri Jun 13 07:44:31 PDT 2014


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's a small step to start generating EGL and
GLX dispatch from egl.xml and glx.xml.

I really really want this, though, so I can start using Piglit disatpch for
GLES1. That's the first step towards to sanely unifying shader_runner_${api}
into a single executable.

I did *not* try to redesign piglit-dispatch in this series. To the contrary,
I attempted to keep the newly generated dispatch code to be as similar as
possible as the old generated code. I did want to clean up piglit-dispatch's
design , but I refrained, deferring in hope that Piglit uses libepoxy someday.

I hope everyone finds the rewritten gen_dispatch.py more maintainable
and easy to read.

Tested for regressions with:
    piglit run -p x11_egl -x glx -x glean
    Mesa 10.2.1
    Intel Ivybridge
    Fedora 20

The patch series lives on the tag:
    git://people.freedesktop.org/~chadversary/piglit refs/tags/unify-build-2014-06-13

You can follow work in progress on the branch:
    git://people.freedesktop.org/~chadversary/piglit refs/heads/unify-build

Chad Versace (6):
  registry: Import gl.xml from Khronos registry
  dispatch: Generate piglit-dispatch from Khronos XML
  util: Generate piglit_get_gl_enum_name() and friends
  glapi: Remove the glapi directory
  util: Rename generated dispatch files
  dispatch: Use piglit-dispatch for GLES1

 CMakeLists.txt                                     |     1 -
 cmake/piglit_dispatch.cmake                        |    12 +-
 cmake/piglit_glapi.cmake                           |    45 -
 glapi/.gitignore                                   |     1 -
 glapi/GLES2/gl2ext.h                               |  2006 -
 glapi/GLES3/gl3.h                                  |  1061 -
 glapi/enum.spec                                    |  9296 ----
 glapi/enumext.spec                                 |  8260 ----
 glapi/gl.spec                                      | 35950 ----------------
 glapi/gl.tm                                        |   355 -
 glapi/parse_glspec.py                              |   555 -
 registry/__init__.py                               |     0
 registry/gl.py                                     |   832 +
 registry/gl.xml                                    | 42166 +++++++++++++++++++
 src/piglit/gl_wrap.h                               |    68 +-
 .../depth-stencil-texture.c                        |     9 -
 tests/util/.gitignore                              |     5 +-
 tests/util/CMakeLists.gl.txt                       |     5 +-
 tests/util/CMakeLists.gles1.txt                    |     1 -
 tests/util/CMakeLists.gles2.txt                    |     1 -
 tests/util/CMakeLists.gles3.txt                    |     1 -
 tests/util/CMakeLists.txt                          |    10 +
 tests/util/gen_dispatch.py                         |   998 +-
 tests/util/piglit-dispatch.c                       |     2 +-
 tests/util/piglit-dispatch.h                       |     5 +-
 tests/util/piglit-shader.h                         |    45 -
 tests/util/piglit-util-gl-enum.c                   |  3046 --
 tests/util/piglit-util-gles3-enum.c                |   728 -
 28 files changed, 43377 insertions(+), 62087 deletions(-)
 delete mode 100644 cmake/piglit_glapi.cmake
 delete mode 100644 glapi/.gitignore
 delete mode 100644 glapi/GLES2/gl2ext.h
 delete mode 100644 glapi/GLES3/gl3.h
 delete mode 100644 glapi/enum.spec
 delete mode 100644 glapi/enumext.spec
 delete mode 100644 glapi/gl.spec
 delete mode 100644 glapi/gl.tm
 delete mode 100644 glapi/parse_glspec.py
 create mode 100644 registry/__init__.py
 create mode 100644 registry/gl.py
 create mode 100644 registry/gl.xml
 delete mode 100644 tests/util/piglit-util-gl-enum.c
 delete mode 100644 tests/util/piglit-util-gles3-enum.c

-- 
2.0.0.rc1



More information about the Piglit mailing list