diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-12 21:11:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-12 21:38:35 +0200 |
| commit | 1a83b8e49a75e2dab63805de25e384e0e38c27ed (patch) | |
| tree | 5280fe2a1bd2ce227e4bce9ce06134986e181de1 /mesalib/src/mesa/main/api_validate.c | |
| parent | 4aea4b223604c589828beb1145875a5fbcc41eed (diff) | |
| parent | 9480392b8817f8bfa79cbc694ff039a73fc0a57f (diff) | |
| download | vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.gz vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.bz2 vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glsl_symbol_table.h
mesalib/src/mesa/drivers/common/meta_blit.c
xorg-server/dix/dispatch.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/mi/miexpose.c
Diffstat (limited to 'mesalib/src/mesa/main/api_validate.c')
| -rw-r--r-- | mesalib/src/mesa/main/api_validate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c index 51a3d1f01..9b80600de 100644 --- a/mesalib/src/mesa/main/api_validate.c +++ b/mesalib/src/mesa/main/api_validate.c @@ -112,9 +112,8 @@ check_valid_to_render(struct gl_context *ctx, const char *function) switch (ctx->API) { case API_OPENGLES2: - /* For ES2, we can draw if any vertex array is enabled (and we - * should always have a vertex program/shader). */ - if (ctx->Array.VAO->_Enabled == 0x0 || !ctx->VertexProgram._Current) + /* For ES2, we can draw if we have a vertex program/shader). */ + if (!ctx->VertexProgram._Current) return GL_FALSE; break; |