gallium: Add egl-apis target.

The new target installs client API modules to EGL_DRIVER_INSTALL_DIR.
They are used by st/egl.

The client APIs are built from OpenGL and OpenVG state trackers.  For
this to work, st/vega is modified to produce a static library,
libvega.a, instead.  st/es is also not needed any more.  It is removed
and --with-state-trackers=es is replaced by --enable-gles-overlay.

As st/egl now has its own client API modules, this solves the ABI issue
between st/egl and client APIs, as long as the client API modules are
distributed with st/egl.  Plus, this allows st/egl to support OpenGL
with non-Gallium libGL.so.

3 files changed, 0 insertions, 100 deletions

diff --git a/src/gallium/state_trackers/es/Makefile b/src/gallium/state_trackers/es/Makefile
deleted file mode 100644
index 37a78a5034..0000000000
--- a/src/gallium/state_trackers/es/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# src/gallium/state_trackers/es/Makefile
-
-# Build the ES 1/2 state tracker libraries
-# This consists of core Mesa ES, plus GL/gallium state tracker.
-
-TOP = ../../../..
-include $(TOP)/configs/current
-
-GLES_1_VERSION_MAJOR = 1
-GLES_1_VERSION_MINOR = 1
-GLES_1_VERSION_PATCH = 0
-
-GLES_2_VERSION_MAJOR = 2
-GLES_2_VERSION_MINOR = 0
-GLES_2_VERSION_PATCH = 0
-
-
-# Maybe move these into configs/default:
-GLES_1_LIB = GLESv1_CM
-GLES_1_LIB_NAME = lib$(GLES_1_LIB).so
-GLES_2_LIB = GLESv2
-GLES_2_LIB_NAME = lib$(GLES_2_LIB).so
-
-
-# These two objects indirectly reference all public functions thanks to the use
-# of _glapi_get_proc_address.
-ES1_OBJECTS = st_es1.o
-ES2_OBJECTS = st_es2.o
-
-
-ES1_LIBS = \
-	$(TOP)/src/mesa/es/libes1gallium.a \
-	$(TOP)/src/mapi/es1api/libes1api.a
-
-ES2_LIBS = \
-	$(TOP)/src/mesa/es/libes2gallium.a \
-	$(TOP)/src/mapi/es2api/libes2api.a
-
-SYS_LIBS = -lm -pthread
-
-
-INCLUDE_DIRS = \
-	-I$(TOP)/include \
-	-I$(TOP)/src/mapi \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/gallium/include
-
-.c.o:
-	$(CC) -c $(INCLUDE_DIRS) $(DEFINES) $(CFLAGS) $< -o $@
-
-
-# Default: make both GL ES 1.1 and GL ES 2.0 libraries
-default: $(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME)
-
-# Make the shared libs
-$(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME): $(ES1_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXILIARIES)
-	$(MKLIB) -o $(GLES_1_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(GLES_1_VERSION_MAJOR) \
-		-minor $(GLES_1_VERSION_MINOR) \
-		-patch $(GLES_1_VERSION_PATCH) \
-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-		$(ES1_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXILIARIES) $(SYS_LIBS)
-
-$(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME): $(ES2_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXILIARIES)
-	$(MKLIB) -o $(GLES_2_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(GLES_2_VERSION_MAJOR) \
-		-minor $(GLES_2_VERSION_MINOR) \
-		-patch $(GLES_2_VERSION_PATCH) \
-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-		$(ES2_OBJECTS) $(ES2_LIBS) $(GALLIUM_AUXILIARIES) $(SYS_LIBS)
-
-install: default
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GLES
-	$(INSTALL) -m 644 $(TOP)/include/GLES/*.h $(DESTDIR)$(INSTALL_DIR)/include/GLES
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GLES2
-	$(INSTALL) -m 644 $(TOP)/include/GLES2/*.h $(DESTDIR)$(INSTALL_DIR)/include/GLES2
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
-	$(MINSTALL) $(TOP)/$(LIB_DIR)/libGLESv1* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
-	$(MINSTALL) $(TOP)/$(LIB_DIR)/libGLESv2* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
-
-clean:
-	-rm -f *.o *~
-	-rm -f $(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME)* $(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME)*
-
-depend:
diff --git a/src/gallium/state_trackers/es/st_es1.c b/src/gallium/state_trackers/es/st_es1.c
deleted file mode 100644
index 825fdac215..0000000000
--- a/src/gallium/state_trackers/es/st_es1.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "state_tracker/st_gl_api.h"
-
-PUBLIC struct st_api *
-st_api_create_OpenGL_ES1()
-{
-   return st_gl_api_create();
-}
diff --git a/src/gallium/state_trackers/es/st_es2.c b/src/gallium/state_trackers/es/st_es2.c
deleted file mode 100644
index 5c773aaf93..0000000000
--- a/src/gallium/state_trackers/es/st_es2.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "state_tracker/st_gl_api.h"
-
-PUBLIC struct st_api *
-st_api_create_OpenGL_ES2()
-{
-   /* linker magic creates different versions */
-   return st_gl_api_create();
-}