From: Chia-I Wu <olv@lunarg.com>
Date: Wed, 8 Sep 2010 10:20:37 +0000 (+0800)
Subject: st/dri: Call dri_init_extensions only for API_OPENGL.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7e03e2b2c787657f2abe4bd362e625bd9a971c48;p=mesa.git

st/dri: Call dri_init_extensions only for API_OPENGL.

libmesagallium.a that this state tracker will be linked to expects
OpenGL's _glapi_table.  That is, it expects libGL.so instead of
libGLESv1_CM.so or libGLESv2.so.  As there is no clean way to know the
shared library the app links to, use the api as a simple check.  It
might be as well to simply remove this function call though.
---

diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
index 0703a2b88d9..f9ebe1edcce 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.c
+++ b/src/gallium/state_trackers/dri/common/dri_context.c
@@ -99,7 +99,15 @@ dri_create_context(gl_api api, const __GLcontextModes * visual,
    ctx->st->st_manager_private = (void *) ctx;
    ctx->stapi = stapi;
 
-   dri_init_extensions(ctx);
+   /*
+    * libmesagallium.a that this state tracker will be linked to expects
+    * OpenGL's _glapi_table.  That is, it expects libGL.so instead of
+    * libGLESv1_CM.so or libGLESv2.so.  As there is no clean way to know the
+    * shared library the app links to, use the api as a simple check.
+    * It might be as well to simply remove this function call though.
+    */
+   if (api == API_OPENGL)
+      dri_init_extensions(ctx);
 
    return GL_TRUE;