On Wednesday, May 27, 2015 11:18:13 AM Ian Romanick wrote: > On 05/27/2015 10:36 AM, Tapani wrote: > > On 05/26/2015 10:37 PM, Ian Romanick wrote: > >> From: Ian Romanick <ian.d.roman...@intel.com> > >> > >> This is a bit of a hack for now. Several of the extensions required for > >> OpenGL ES 3.1 have no support, at all, in Mesa. However, with this > >> patch and a patch to allow MESA_GL_VERSION_OVERRIDE to work with ES > >> contexts, people can begin testing the ES "version" of the functionality > >> that is supported. > >> > >> Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> > >> --- > >> src/mesa/main/getstring.c | 16 ++++++++++++---- > >> src/mesa/main/version.c | 18 +++++++++++++++++- > >> 2 files changed, 29 insertions(+), 5 deletions(-) > >> > >> diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c > >> index 1b2c7f0..72d99ca 100644 > >> --- a/src/mesa/main/getstring.c > >> +++ b/src/mesa/main/getstring.c > >> @@ -72,10 +72,18 @@ shading_language_version(struct gl_context *ctx) > >> break; > >> case API_OPENGLES2: > >> - return (ctx->Version < 30) > >> - ? (const GLubyte *) "OpenGL ES GLSL ES 1.0.16" > >> - : (const GLubyte *) "OpenGL ES GLSL ES 3.00"; > >> - > >> + switch (ctx->Version) { > >> + case 20: > >> + return (const GLubyte *) "OpenGL ES GLSL ES 1.0.16"; > > > > There's revision 17 (1.0.17) out there, should we have it here or rather > > just 1.0? > > We could bump it or leave it. I don't think it matters much either way. > Section 6.1.5 (String Queries) of the OpenGL ES 2.0.25 spec says: > > "The SHADING_LANGUAGE_VERSION string is laid out as follows: > > "OpenGL ES GLSL ES N.M vendor-specific information" > > The version number is either of the form major_number.minor_number > or major_number.minor_number.release_number, where the numbers all > have one or more digits. The release number and vendor specific > information are optional. However, if present, then they pertain > to the server and their format and contents are implementation- > dependent."
I think I'd rather just advertise 1.0 - I don't think 1.0.X communicates any real useful information to applications. We don't do that for regular GLSL. *shrug* --Ken
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev