st/vega: Remove.

OpenVG API seems to have dwindled away.  The code
would still be interesting if we wanted to implement NV_path_rendering
but given the trend of the next gen graphics APIs, it seems
unlikely that this becomes ARB or core.

v2: Remove a few "openvg" references left, per Emil Velikov.

Reviewed-by: Emil Velikov <[email protected]>

v3: Update release notes.

7 files changed, 1 insertions, 253 deletions

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index b0a6c8ca2d8..90ba5715f13 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -232,10 +232,4 @@ endif
 es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
 	$(call glapi_gen_mapi,$<,es2api)
 
-# XXX: Inline vgapi's Makefile.am here.
-EXTRA_DIST += vgapi
-# if HAVE_OPENVG
-# SUBDIRS += vgapi
-# endif
-
 include $(top_srcdir)/install-lib-links.mk
diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py
index d783ed32f5a..012a5c3f44c 100644
--- a/src/mapi/mapi_abi.py
+++ b/src/mapi/mapi_abi.py
@@ -816,25 +816,8 @@ typedef int GLclampx;
 
         return header
 
-class VGAPIPrinter(ABIPrinter):
-    """OpenVG API Printer"""
-
-    def __init__(self, entries):
-        super(VGAPIPrinter, self).__init__(entries)
-
-        self.api_defines = ['VG_VGEXT_PROTOTYPES']
-        self.api_headers = ['"VG/openvg.h"', '"VG/vgext.h"']
-        self.api_call = 'VG_API_CALL'
-        self.api_entry = 'VG_API_ENTRY'
-        self.api_attrs = 'VG_API_EXIT'
-
-        self.prefix_lib = 'vg'
-        self.prefix_app = 'vega'
-        self.prefix_noop = 'noop'
-        self.prefix_warn = 'vg'
-
 def parse_args():
-    printers = ['vgapi', 'glapi', 'es1api', 'es2api', 'shared-glapi']
+    printers = ['glapi', 'es1api', 'es2api', 'shared-glapi']
     modes = ['lib', 'app']
 
     parser = OptionParser(usage='usage: %prog [options] <filename>')
@@ -853,7 +836,6 @@ def parse_args():
 
 def main():
     printers = {
-        'vgapi': VGAPIPrinter,
         'glapi': GLAPIPrinter,
         'es1api': ES1APIPrinter,
         'es2api': ES2APIPrinter,
diff --git a/src/mapi/vgapi/.gitignore b/src/mapi/vgapi/.gitignore
deleted file mode 100644
index 5becb993861..00000000000
--- a/src/mapi/vgapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vgapi_tmp.h
diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am
deleted file mode 100644
index 45ef4b2d01a..00000000000
--- a/src/mapi/vgapi/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-AM_CPPFLAGS = \
-	$(DEFINES) \
-	$(SELINUX_CFLAGS) \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-DMAPI_ABI_HEADER=\"vgapi_tmp.h\"
-
-AM_CFLAGS = $(VISIBILITY_CFLAGS)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vg.pc
-
-VG_includedir = $(includedir)/VG
-VG_include_HEADERS = \
-	$(top_srcdir)/include/VG/openvg.h \
-	$(top_srcdir)/include/VG/vgext.h \
-	$(top_srcdir)/include/VG/vgplatform.h \
-	$(top_srcdir)/include/VG/vgu.h
-
-lib_LTLIBRARIES = libOpenVG.la
-
-TOP=$(top_srcdir)
-include ../Makefile.sources
-libOpenVG_la_SOURCES = $(MAPI_FILES) vgapi_tmp.h
-libOpenVG_la_LIBADD = $(VG_LIB_DEPS)
-libOpenVG_la_LDFLAGS = \
-	-no-undefined \
-	-version-number 1 \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi_abi.py
-	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi_abi.py \
-		--printer vgapi --mode lib $< > $@
-
-EXTRA_DIST = SConscript vgapi.csv
-BUILT_SOURCES = vgapi_tmp.h
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_srcdir)/install-lib-links.mk
diff --git a/src/mapi/vgapi/SConscript b/src/mapi/vgapi/SConscript
deleted file mode 100644
index 63102c107ed..00000000000
--- a/src/mapi/vgapi/SConscript
+++ /dev/null
@@ -1,61 +0,0 @@
-#######################################################################
-# SConscript for vgapi
-
-from sys import executable as python_cmd
-
-Import('*')
-
-env = env.Clone()
-
-vgapi_header, = env.CodeGenerate(
-    target = 'vgapi_tmp.h',
-    script = '../mapi_abi.py',
-    source = 'vgapi.csv',
-    command = python_cmd + ' $SCRIPT --printer vgapi --mode lib $SOURCE > $TARGET'
-)
-
-env.Append(CPPDEFINES = [
-    'MAPI_ABI_HEADER=\\"vgapi/vgapi_tmp.h\\"',
-    'MAPI_DLL_EXPORTS',
-    'KHRONOS_DLL_EXPORTS',
-])
-
-env.Append(CPPPATH = [
-    '#/include',
-    '#/src/mapi',
-    Dir('..'), # vgapi/vgapi_tmp.h build path
-])
-
-mapi_sources = [
-    'entry.c',
-    'mapi.c',
-    'stub.c',
-    'table.c',
-    'u_current.c',
-    'u_execmem.c',
-]
-
-vgapi_objects = []
-for s in mapi_sources:
-    o = env.SharedObject(s[:-2], '../' + s)
-    vgapi_objects.append(o)
-
-env.Depends(vgapi_objects, vgapi_header)
-
-# libOpenVG.dll
-env['LIBPREFIX'] = 'lib'
-env['SHLIBPREFIX'] = 'lib'
-
-openvg = env.SharedLibrary(
-    target = 'OpenVG',
-    source = vgapi_objects,
-)
-
-env.InstallSharedLibrary(openvg, version=(1, 0, 0))
-
-if env['platform'] == 'windows':
-    openvg = env.FindIxes(openvg, 'LIBPREFIX', 'LIBSUFFIX')
-else:
-    openvg = env.FindIxes(openvg, 'SHLIBPREFIX', 'SHLIBSUFFIX')
-
-Export(['openvg'])
diff --git a/src/mapi/vgapi/vg.pc.in b/src/mapi/vgapi/vg.pc.in
deleted file mode 100644
index 27a3f634758..00000000000
--- a/src/mapi/vgapi/vg.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=@libdir@
-includedir=@includedir@
-
-Name: vg
-Description: Mesa OpenVG 1.0 library
-Requires.private:
-Version: @VERSION@
-Libs: -L${libdir} -lOpenVG
-Libs.private: @VG_PC_LIB_PRIV@
-Cflags: -I${includedir}
diff --git a/src/mapi/vgapi/vgapi.csv b/src/mapi/vgapi/vgapi.csv
deleted file mode 100644
index 5b11d062aea..00000000000
--- a/src/mapi/vgapi/vgapi.csv
+++ /dev/null
@@ -1,93 +0,0 @@
-# This is the source file for the various generate structs/tables/functions
-# used in st/vega.
-
-# OpenVG 1.0
-void,                   AppendPath,                VGPath dstPath, VGPath srcPath
-void,                   AppendPathData,            VGPath dstPath, VGint numSegments, const VGubyte *pathSegments, const void *pathData
-VGImage,                ChildImage,                VGImage parent, VGint x, VGint y, VGint width, VGint height
-void,                   Clear,                     VGint x, VGint y, VGint width, VGint height
-void,                   ClearImage,                VGImage image, VGint x, VGint y, VGint width, VGint height
-void,                   ClearPath,                 VGPath path, VGbitfield capabilities
-void,                   ColorMatrix,               VGImage dst, VGImage src, const VGfloat *matrix
-void,                   Convolve,                  VGImage dst, VGImage src, VGint kernelWidth, VGint kernelHeight, VGint shiftX, VGint shiftY, const VGshort *kernel, VGfloat scale, VGfloat bias, VGTilingMode tilingMode
-void,                   CopyImage,                 VGImage dst, VGint dx, VGint dy, VGImage src, VGint sx, VGint sy, VGint width, VGint height, VGboolean dither
-void,                   CopyPixels,                VGint dx, VGint dy, VGint sx, VGint sy, VGint width, VGint height
-VGImage,                CreateImage,               VGImageFormat format, VGint width, VGint height, VGbitfield allowedQuality
-VGPaint,                CreatePaint,               void
-VGPath,                 CreatePath,                VGint pathFormat, VGPathDatatype datatype, VGfloat scale, VGfloat bias, VGint segmentCapacityHint, VGint coordCapacityHint, VGbitfield capabilities
-void,                   DestroyImage,              VGImage image
-void,                   DestroyPaint,              VGPaint paint
-void,                   DestroyPath,               VGPath path
-void,                   DrawImage,                 VGImage image
-void,                   DrawPath,                  VGPath path, VGbitfield paintModes
-void,                   Finish,                    void
-void,                   Flush,                     void
-void,                   GaussianBlur,              VGImage dst, VGImage src, VGfloat stdDeviationX, VGfloat stdDeviationY, VGTilingMode tilingMode
-VGuint,                 GetColor,                  VGPaint paint
-VGErrorCode,            GetError,                  void
-void,                   GetImageSubData,           VGImage image, void *data, VGint dataStride, VGImageFormat dataFormat, VGint x, VGint y, VGint width, VGint height
-void,                   GetMatrix,                 VGfloat *m
-VGPaint,                GetPaint,                  VGPaintMode paintMode
-VGint,                  GetParameterVectorSize,    VGHandle object, VGint paramType
-VGfloat,                GetParameterf,             VGHandle object, VGint paramType
-void,                   GetParameterfv,            VGHandle object, VGint paramType, VGint count, VGfloat *values
-VGint,                  GetParameteri,             VGHandle object, VGint paramType
-void,                   GetParameteriv,            VGHandle object, VGint paramType, VGint count, VGint *values
-VGImage,                GetParent,                 VGImage image 
-VGbitfield,             GetPathCapabilities,       VGPath path
-void,                   GetPixels,                 VGImage dst, VGint dx, VGint dy, VGint sx, VGint sy, VGint width, VGint height
-const VGubyte *,        GetString,                 VGStringID name
-VGint,                  GetVectorSize,             VGParamType type
-VGfloat,                Getf,                      VGParamType type
-void,                   Getfv,                     VGParamType type, VGint count, VGfloat *values
-VGint,                  Geti,                      VGParamType type
-void,                   Getiv,                     VGParamType type, VGint count, VGint *values
-VGHardwareQueryResult,  HardwareQuery,             VGHardwareQueryType key, VGint setting
-void,                   ImageSubData,              VGImage image, const void *data, VGint dataStride, VGImageFormat dataFormat, VGint x, VGint y, VGint width, VGint height
-VGboolean,              InterpolatePath,           VGPath dstPath, VGPath startPath, VGPath endPath, VGfloat amount
-void,                   LoadIdentity,              void
-void,                   LoadMatrix,                const VGfloat *m
-void,                   Lookup,                    VGImage dst, VGImage src, const VGubyte *redLUT, const VGubyte *greenLUT, const VGubyte *blueLUT, const VGubyte *alphaLUT, VGboolean outputLinear, VGboolean outputPremultiplied
-void,                   LookupSingle,              VGImage dst, VGImage src, const VGuint *lookupTable, VGImageChannel sourceChannel, VGboolean outputLinear, VGboolean outputPremultiplied
-void,                   Mask,                      VGHandle mask, VGMaskOperation operation, VGint x, VGint y, VGint width, VGint height
-void,                   ModifyPathCoords,          VGPath dstPath, VGint startIndex, VGint numSegments, const void *pathData
-void,                   MultMatrix,                const VGfloat *m
-void,                   PaintPattern,              VGPaint paint, VGImage pattern
-void,                   PathBounds,                VGPath path, VGfloat *minX, VGfloat *minY, VGfloat *width, VGfloat *height
-VGfloat,                PathLength,                VGPath path, VGint startSegment, VGint numSegments
-void,                   PathTransformedBounds,     VGPath path, VGfloat *minX, VGfloat *minY, VGfloat *width, VGfloat *height
-void,                   PointAlongPath,            VGPath path, VGint startSegment, VGint numSegments, VGfloat distance, VGfloat *x, VGfloat *y, VGfloat *tangentX, VGfloat *tangentY
-void,                   ReadPixels,                void *data, VGint dataStride, VGImageFormat dataFormat, VGint sx, VGint sy, VGint width, VGint height
-void,                   RemovePathCapabilities,    VGPath path, VGbitfield capabilities
-void,                   Rotate,                    VGfloat angle
-void,                   Scale,                     VGfloat sx, VGfloat sy
-void,                   SeparableConvolve,         VGImage dst, VGImage src, VGint kernelWidth, VGint kernelHeight, VGint shiftX, VGint shiftY, const VGshort *kernelX, const VGshort *kernelY, VGfloat scale, VGfloat bias, VGTilingMode tilingMode
-void,                   SetColor,                  VGPaint paint, VGuint rgba
-void,                   SetPaint,                  VGPaint paint, VGbitfield paintModes
-void,                   SetParameterf,             VGHandle object, VGint paramType, VGfloat value
-void,                   SetParameterfv,            VGHandle object, VGint paramType, VGint count, const VGfloat *values
-void,                   SetParameteri,             VGHandle object, VGint paramType, VGint value
-void,                   SetParameteriv,            VGHandle object, VGint paramType, VGint count, const VGint *values
-void,                   SetPixels,                 VGint dx, VGint dy, VGImage src, VGint sx, VGint sy, VGint width, VGint height
-void,                   Setf,                      VGParamType type, VGfloat value
-void,                   Setfv,                     VGParamType type, VGint count, const VGfloat *values
-void,                   Seti,                      VGParamType type, VGint value
-void,                   Setiv,                     VGParamType type, VGint count, const VGint *values
-void,                   Shear,                     VGfloat shx, VGfloat shy
-void,                   TransformPath,             VGPath dstPath, VGPath srcPath
-void,                   Translate,                 VGfloat tx, VGfloat ty
-void,                   WritePixels,               const void *data, VGint dataStride, VGImageFormat dataFormat, VGint dx, VGint dy, VGint width, VGint height
-
-## OpenVG 1.1
-void,                   ClearGlyph,                VGFont font, VGuint glyphIndex
-void,                   CopyMask,                  VGMaskLayer maskLayer, VGint dx, VGint dy, VGint sx, VGint sy, VGint width, VGint height
-VGFont,                 CreateFont,                VGint glyphCapacityHint
-VGMaskLayer,            CreateMaskLayer,           VGint width, VGint height
-void,                   DestroyFont,               VGFont font
-void,                   DestroyMaskLayer,          VGMaskLayer maskLayer
-void,                   DrawGlyph,                 VGFont font, VGuint glyphIndex, VGbitfield paintModes, VGboolean allowAutoHinting
-void,                   DrawGlyphs,                VGFont font, VGint glyphCount, const VGuint *glyphIndices, const VGfloat *adjustments_x, const VGfloat *adjustments_y, VGbitfield paintModes, VGboolean allowAutoHinting
-void,                   FillMaskLayer,             VGMaskLayer maskLayer, VGint x, VGint y, VGint width, VGint height, VGfloat value
-void,                   RenderToMask,              VGPath path, VGbitfield paintModes, VGMaskOperation operation
-void,                   SetGlyphToImage,           VGFont font, VGuint glyphIndex, VGImage image, const VGfloat glyphOrigin[2], const VGfloat escapement[2]
-void,                   SetGlyphToPath,            VGFont font, VGuint glyphIndex, VGPath path, VGboolean isHinted, const VGfloat glyphOrigin[2], const VGfloat escapement[2]