glapi/es3.1: Add support for GLES versions > 3.0

Make the checks in the Python script and the generated code more generic
to support arbitrary GLES versions >= 2.0.

The updated dispatch_sanity.cpp test discovered this problem.  Without
this, the next patch would erroneously enable GLES 3.1 functions in GLES
2.0 and GLES 3.0.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Ian Romanick 2015-04-29 13:15:06 -07:00
parent 23d2f63b58
commit 1c5a57aee1

View file

@ -183,8 +183,8 @@ class PrintCode(gl_XML.gl_print_base):
if 'es1' in f.api_map: if 'es1' in f.api_map:
condition_parts.append('ctx->API == API_OPENGLES') condition_parts.append('ctx->API == API_OPENGLES')
if 'es2' in f.api_map: if 'es2' in f.api_map:
if f.api_map['es2'] == 3: if f.api_map['es2'] > 2.0:
condition_parts.append('_mesa_is_gles3(ctx)') condition_parts.append('(ctx->API == API_OPENGLES2 && ctx->Version >= {})'.format(int(f.api_map['es2'] * 10)))
else: else:
condition_parts.append('ctx->API == API_OPENGLES2') condition_parts.append('ctx->API == API_OPENGLES2')
if not condition_parts: if not condition_parts: