diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-31 15:18:29 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-04 14:23:28 +0200 |
| commit | d7fc06ac528d54e0e1416cb8aa89b6fd072400a5 (patch) | |
| tree | 74cccede044412bba5723a132f1385aa9259f04b /mesalib/src/mesa/main/context.c | |
| parent | 9dec848b23cf905ded387820f2893425cc00d545 (diff) | |
| download | vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.tar.gz vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.tar.bz2 vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.zip | |
randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver
git update 31 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index b78bceeb9..feddbaa7e 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -431,7 +431,7 @@ one_time_init( struct gl_context *ctx ) * when an app is linked to libGLES*, there are not enough dynamic * entries. */ - if (_mesa_is_desktop_gl(ctx)) + if (_mesa_is_desktop_gl(ctx) || ctx->API == API_OPENGLES2) _mesa_init_remap_table(); } @@ -964,9 +964,10 @@ _mesa_initialize_context(struct gl_context *ctx, #if FEATURE_dispatch /* setup the API dispatch tables */ switch (ctx->API) { -#if FEATURE_GL +#if FEATURE_GL || FEATURE_ES2 case API_OPENGL: case API_OPENGL_CORE: + case API_OPENGLES2: ctx->Exec = _mesa_create_exec_table(ctx); break; #endif @@ -975,11 +976,6 @@ _mesa_initialize_context(struct gl_context *ctx, ctx->Exec = _mesa_create_exec_table_es1(); break; #endif -#if FEATURE_ES2 - case API_OPENGLES2: - ctx->Exec = _mesa_create_exec_table_es2(); - break; -#endif default: _mesa_problem(ctx, "unknown or unsupported API"); break; @@ -1012,7 +1008,6 @@ _mesa_initialize_context(struct gl_context *ctx, switch (ctx->API) { case API_OPENGL: - case API_OPENGL_CORE: #if FEATURE_dlist ctx->Save = _mesa_create_save_table(); if (!ctx->Save) { @@ -1023,6 +1018,7 @@ _mesa_initialize_context(struct gl_context *ctx, _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt ); #endif + case API_OPENGL_CORE: break; case API_OPENGLES: /** |