From: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu, 22 Apr 2010 13:32:11 +0000 (-0400)
Subject: st/mesa: Use API-aware context constructor
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=38d771c0539a087db42d8d940bb2e920bb64598c;p=mesa.git

st/mesa: Use API-aware context constructor

The mesa state tracker is currently the only place where we create a
context and expect it to implement GLES1/2.  Use the API-aware constructor
to communicate this to core mesa.
---

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 5fcb6b9dcf9..48fc86cd525 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -199,7 +199,16 @@ struct st_context *st_create_context(struct pipe_context *pipe,
    memset(&funcs, 0, sizeof(funcs));
    st_init_driver_functions(&funcs);
 
-   ctx = _mesa_create_context(visual, shareCtx, &funcs, NULL);
+#if FEATURE_ES1
+   ctx = _mesa_create_context_for_api(API_OPENGLES,
+				      visual, shareCtx, &funcs, NULL);
+#elif FEATURE_ES2
+   ctx = _mesa_create_context_for_api(API_OPENGLES2,
+				      visual, shareCtx, &funcs, NULL);
+#else
+   ctx = _mesa_create_context_for_api(API_OPENGL,
+				      visual, shareCtx, &funcs, NULL);
+#endif
 
    /* XXX: need a capability bit in gallium to query if the pipe
     * driver prefers DP4 or MUL/MAD for vertex transformation.