9 files changed, 50 insertions, 86 deletions
diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h
index 9e87c8e0d40..8ea15545689 100644
--- a/src/gallium/include/state_tracker/st_api.h
+++ b/src/gallium/include/state_tracker/st_api.h
@@ -47,8 +47,6 @@
  */
 enum st_api_type {
    ST_API_OPENGL,
-   ST_API_OPENGL_ES1,
-   ST_API_OPENGL_ES2,
    ST_API_OPENVG,
 
    ST_API_COUNT
@@ -460,18 +458,4 @@ st_visual_have_buffers(const struct st_visual *visual, unsigned mask)
    return ((visual->buffer_mask & mask) == mask);
 }
 
-/* these symbols may need to be dynamically lookup up */
-extern PUBLIC struct st_api * st_api_create_OpenGL(void);
-extern PUBLIC struct st_api * st_api_create_OpenGL_ES1(void);
-extern PUBLIC struct st_api * st_api_create_OpenGL_ES2(void);
-extern PUBLIC struct st_api * st_api_create_OpenVG(void);
-
-/**
- * The entry points of the state trackers.
- */
-#define ST_CREATE_OPENGL_SYMBOL      "st_api_create_OpenGL"
-#define ST_CREATE_OPENGL_ES1_SYMBOL  "st_api_create_OpenGL_ES1"
-#define ST_CREATE_OPENGL_ES2_SYMBOL  "st_api_create_OpenGL_ES2"
-#define ST_CREATE_OPENVG_SYMBOL      "st_api_create_OpenVG"
-
 #endif /* _ST_API_H_ */
diff --git a/src/gallium/targets/egl/egl.c b/src/gallium/targets/egl/egl.c
index 7c6bb58aecf..fb5bfd4061c 100644
--- a/src/gallium/targets/egl/egl.c
+++ b/src/gallium/targets/egl/egl.c
@@ -37,6 +37,8 @@
 #include "state_tracker/drm_driver.h"
 #include "common/egl_g3d_loader.h"
 
+#include "egl.h"
+
 struct egl_g3d_loader egl_g3d_loader;
 
 static struct st_module {
diff --git a/src/gallium/targets/egl/egl.h b/src/gallium/targets/egl/egl.h
new file mode 100644
index 00000000000..5fd06785407
--- /dev/null
+++ b/src/gallium/targets/egl/egl.h
@@ -0,0 +1,44 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.9
+ *
+ * Copyright (C) 2010 LunarG Inc.
+ *
+ * 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 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.
+ *
+ * Authors:
+ *    Chia-I Wu <[email protected]>
+ */
+
+#ifndef _EGL_H_
+#define _EGL_H_
+
+#include "pipe/p_compiler.h"
+#include "state_tracker/st_api.h"
+
+#define ST_CREATE_OPENGL_SYMBOL "st_api_create_OpenGL"
+#define ST_CREATE_OPENVG_SYMBOL "st_api_create_OpenVG"
+
+PUBLIC struct st_api *
+st_api_create_OpenGL(void);
+
+PUBLIC struct st_api *
+st_api_create_OpenVG(void);
+
+#endif /* _EGL_H_ */
diff --git a/src/gallium/targets/egl/st_GL.c b/src/gallium/targets/egl/st_GL.c
index 69c8f7a83cf..c1df844aa43 100644
--- a/src/gallium/targets/egl/st_GL.c
+++ b/src/gallium/targets/egl/st_GL.c
@@ -1,5 +1,5 @@
 #include "state_tracker/st_gl_api.h"
-#include "state_tracker/st_api.h"
+#include "egl.h"
 
 PUBLIC struct st_api *
 st_api_create_OpenGL(void)
diff --git a/src/gallium/targets/egl/st_GLESv1_CM.c b/src/gallium/targets/egl/st_GLESv1_CM.c
index 016bb4e9d08..c1df844aa43 100644
--- a/src/gallium/targets/egl/st_GLESv1_CM.c
+++ b/src/gallium/targets/egl/st_GLESv1_CM.c
@@ -1,5 +1,5 @@
-#include "state_tracker/st_api.h"
 #include "state_tracker/st_gl_api.h"
+#include "egl.h"
 
 PUBLIC struct st_api *
 st_api_create_OpenGL(void)
diff --git a/src/gallium/targets/egl/st_GLESv2.c b/src/gallium/targets/egl/st_GLESv2.c
index 016bb4e9d08..c1df844aa43 100644
--- a/src/gallium/targets/egl/st_GLESv2.c
+++ b/src/gallium/targets/egl/st_GLESv2.c
@@ -1,5 +1,5 @@
-#include "state_tracker/st_api.h"
 #include "state_tracker/st_gl_api.h"
+#include "egl.h"
 
 PUBLIC struct st_api *
 st_api_create_OpenGL(void)
diff --git a/src/gallium/targets/egl/st_OpenVG.c b/src/gallium/targets/egl/st_OpenVG.c
index e29a2374792..d0bf4dbae91 100644
--- a/src/gallium/targets/egl/st_OpenVG.c
+++ b/src/gallium/targets/egl/st_OpenVG.c
@@ -1,5 +1,5 @@
-#include "state_tracker/st_api.h"
 #include "vg_api.h"
+#include "egl.h"
 
 PUBLIC struct st_api *
 st_api_create_OpenVG(void)
diff --git a/src/mesa/state_tracker/st_gl_api.h b/src/mesa/state_tracker/st_gl_api.h
index 57c6d9f24d2..55ad778c97d 100644
--- a/src/mesa/state_tracker/st_gl_api.h
+++ b/src/mesa/state_tracker/st_gl_api.h
@@ -3,7 +3,5 @@
 #define ST_GL_API_H
 
 struct st_api *st_gl_api_create(void);
-struct st_api *st_gl_api_create_es1(void);
-struct st_api *st_gl_api_create_es2(void);
 
 #endif
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index 8acd0938bb8..450b0453cf4 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -674,22 +674,6 @@ st_api_create_context(struct st_api *stapi, struct st_manager *smapi,
    return &st->iface;
 }
 
-static struct st_context_iface *
-st_api_create_context_es1(struct st_api *stapi, struct st_manager *smapi,
-                          const struct st_context_attribs *attribs,
-                          struct st_context_iface *shared_stctxi)
-{
-   return st_api_create_context(stapi, smapi, attribs, shared_stctxi);
-}
-
-static struct st_context_iface *
-st_api_create_context_es2(struct st_api *stapi, struct st_manager *smapi,
-                          const struct st_context_attribs *attribs,
-                          struct st_context_iface *shared_stctxi)
-{
-   return st_api_create_context(stapi, smapi, attribs, shared_stctxi);
-}
-
 static boolean
 st_api_make_current(struct st_api *stapi, struct st_context_iface *stctxi,
                     struct st_framebuffer_iface *stdrawi,
@@ -890,56 +874,8 @@ static const struct st_api st_gl_api = {
    st_api_get_current,
 };
 
-static const struct st_api st_gl_api_es1 = {
-   ST_API_OPENGL_ES1,
-   ST_PROFILE_OPENGL_ES1_MASK,
-   st_api_destroy,
-   st_api_get_proc_address,
-   st_api_create_context_es1,
-   st_api_make_current,
-   st_api_get_current,
-};
-
-static const struct st_api st_gl_api_es2 = {
-   ST_API_OPENGL_ES2,
-   ST_PROFILE_OPENGL_ES2_MASK,
-   st_api_destroy,
-   st_api_get_proc_address,
-   st_api_create_context_es2,
-   st_api_make_current,
-   st_api_get_current,
-};
-
 struct st_api *
 st_gl_api_create(void)
 {
-   (void) st_gl_api;
-   (void) st_gl_api_es1;
-   (void) st_gl_api_es2;
-
-#if FEATURE_GL
    return (struct st_api *) &st_gl_api;
-#else
-   return NULL;
-#endif
-}
-
-struct st_api *
-st_gl_api_create_es1(void)
-{
-#if FEATURE_ES1
-   return (struct st_api *) &st_gl_api_es1;
-#else
-   return NULL;
-#endif
-}
-
-struct st_api *
-st_gl_api_create_es2(void)
-{
-#if FEATURE_ES2
-   return (struct st_api *) &st_gl_api_es2;
-#else
-   return NULL;
-#endif
 }