Mesa (fdo_master): mesa: relax draw api validation on ES2

Tapani Pälli tpalli at kemper.freedesktop.org
Thu Oct 2 08:56:04 UTC 2014


Module: Mesa
Branch: fdo_master
Commit: f4b4ae8c241943b8ca65e7a00f272fe23ed73727
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4b4ae8c241943b8ca65e7a00f272fe23ed73727

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Sep 30 10:28:26 2014 +0300

mesa: relax draw api validation on ES2

Patch fixes failing test in WebGL conformance test
'point-no-attributes' when running Chrome on OpenGL ES.
(Shader program may draw points using constant data in shader.)

No Piglit regressions.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/main/api_validate.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 51a3d1f..9b80600 100644
--- a/src/mesa/main/api_validate.c
+++ b/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;
 




More information about the mesa-commit mailing list