diff options
| author | Kristian Høgsberg <[email protected]> | 2010-05-02 10:17:07 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2010-05-02 10:17:07 -0400 |
| commit | 0870e4a2022cff79805613ae7cd4b9237a2f564c (patch) | |
| tree | 694d0c07918661996255cff226602045e0d9c707 /src/mesa/state_tracker/st_context.c | |
| parent | 9d3360567346036f1c2b0b5e9de9bd123d883762 (diff) | |
| parent | 9fd5fa05122aa0cac0051fa92d1634bde43209db (diff) | |
Merge branch 'gles2-2'
Conflicts:
src/mesa/drivers/dri/common/dri_util.h
Diffstat (limited to 'src/mesa/state_tracker/st_context.c')
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 5fcb6b9dcf9..2b1174a504d 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_GL + ctx = _mesa_create_context_for_api(API_OPENGL, + visual, shareCtx, &funcs, NULL); +#elif 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); +#endif /* XXX: need a capability bit in gallium to query if the pipe * driver prefers DP4 or MUL/MAD for vertex transformation. |