2015-10-16 14:36 GMT+08:00 Tapani Pälli <tapani.pa...@intel.com>:
> Otherwise there are problems when user overrides version and application
> such as Piglit wants to detect used api with glGetString(GL_VERSION).
>
> This makes it currently impossible to run glslparsertest tests for
> OpenGL ES when using version override.
>
> Below is example when using MESA_GLES_VERSION_OVERRIDE=3.1.
>
> Before:
> "3.1 Mesa 11.1.0-devel (git-24a1a15)"
>
> After:
> "OpenGL ES 3.1 Mesa 11.1.0-devel (git-78042ff)"
>
> v2: only include api prefix for OpenGL ES (Boyan Ding)
>
> Signed-off-by: Tapani Pälli <tapani.pa...@intel.com>
Cc: "11.0" <mesa-sta...@lists.freedesktop.org>
> ---
> src/mesa/main/version.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
> index 498b2f8..017bc3a 100644
> --- a/src/mesa/main/version.c
> +++ b/src/mesa/main/version.c
> @@ -24,6 +24,7 @@
>
>
> #include <stdio.h>
> +#include "context.h"
> #include "imports.h"
> #include "mtypes.h"
> #include "version.h"
> @@ -181,7 +182,15 @@ _mesa_override_gl_version(struct gl_context *ctx)
> {
> if (_mesa_override_gl_version_contextless(&ctx->Const, &ctx->API,
> &ctx->Version)) {
> - create_version_string(ctx, "");
> + /* We need to include API in version string for OpenGL ES, otherwise
> + * application can not detect GLES via glGetString(GL_VERSION) query.
> + *
> + * From OpenGL ES 3.2 spec, Page 436:
> + *
> + * "The VERSION string is laid out as follows:
> + * "OpenGL ES N.M vendor-specific information" "
> + */
> + create_version_string(ctx, _mesa_is_gles(ctx) ? "OpenGL ES " : "");
> }
> }
>
> --
> 2.4.3
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
