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/vtxfmt.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/vtxfmt.c')
| -rw-r--r-- | mesalib/src/mesa/main/vtxfmt.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/vtxfmt.c b/mesalib/src/mesa/main/vtxfmt.c index ce490ed9e..2b6e25ecd 100644 --- a/mesalib/src/mesa/main/vtxfmt.c +++ b/mesalib/src/mesa/main/vtxfmt.c @@ -48,9 +48,8 @@ static void install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab, const GLvertexformat *vfmt) { - _mesa_install_arrayelt_vtxfmt(tab, vfmt); - if (ctx->API != API_OPENGL_CORE) { + _mesa_install_arrayelt_vtxfmt(tab, vfmt); SET_Color3f(tab, vfmt->Color3f); SET_Color3fv(tab, vfmt->Color3fv); SET_Color4f(tab, vfmt->Color4f); @@ -58,7 +57,9 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab, SET_EdgeFlag(tab, vfmt->EdgeFlag); } - _mesa_install_eval_vtxfmt(tab, vfmt); + if (ctx->API == API_OPENGL) { + _mesa_install_eval_vtxfmt(tab, vfmt); + } if (ctx->API != API_OPENGL_CORE) { SET_FogCoordfEXT(tab, vfmt->FogCoordfEXT); @@ -94,7 +95,9 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab, SET_Vertex4fv(tab, vfmt->Vertex4fv); } - _mesa_install_dlist_vtxfmt(tab, vfmt); /* glCallList / glCallLists */ + if (ctx->API == API_OPENGL) { + _mesa_install_dlist_vtxfmt(tab, vfmt); /* glCallList / glCallLists */ + } if (ctx->API != API_OPENGL_CORE) { SET_Begin(tab, vfmt->Begin); @@ -218,8 +221,7 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab, void _mesa_install_exec_vtxfmt(struct gl_context *ctx, const GLvertexformat *vfmt) { - if (_mesa_is_desktop_gl(ctx)) - install_vtxfmt( ctx, ctx->Exec, vfmt ); + install_vtxfmt( ctx, ctx->Exec, vfmt ); } |