diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2015-04-29 13:15:06 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-05-04 13:49:58 -0700 |
| commit | 1c5a57aee109ef513df0d281aadc69db293cc3d8 (patch) | |
| tree | 269c32cd0a6310132f2113fa283f9a735851d3ce /src | |
| parent | 23d2f63b588fba37a2362db61927aff862333a71 (diff) | |
| download | external_mesa3d-1c5a57aee109ef513df0d281aadc69db293cc3d8.zip external_mesa3d-1c5a57aee109ef513df0d281aadc69db293cc3d8.tar.gz external_mesa3d-1c5a57aee109ef513df0d281aadc69db293cc3d8.tar.bz2 | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/gen/gl_genexec.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 7151f0d..e58cdfc 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -183,8 +183,8 @@ class PrintCode(gl_XML.gl_print_base): if 'es1' in f.api_map: condition_parts.append('ctx->API == API_OPENGLES') if 'es2' in f.api_map: - if f.api_map['es2'] == 3: - condition_parts.append('_mesa_is_gles3(ctx)') + if f.api_map['es2'] > 2.0: + condition_parts.append('(ctx->API == API_OPENGLES2 && ctx->Version >= {})'.format(int(f.api_map['es2'] * 10))) else: condition_parts.append('ctx->API == API_OPENGLES2') if not condition_parts: |