<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<pre wrap="">Reviewed-by: Samuel Iglesias Gonsálvez <a class="moz-txt-link-rfc2396E" href="mailto:siglesias@igalia.com"><siglesias@igalia.com></a></pre>
<br>
<div class="moz-cite-prefix">On 08/01/18 13:58, Juan A. Suarez
Romero wrote:<br>
</div>
<blockquote type="cite"
cite="mid:1515416319.3703.0.camel@igalia.com">
<pre wrap="">Please, could someone review this patch? Thank you in advance
J.A.
On Tue, 2017-11-14 at 20:31 +0100, Juan A. Suarez Romero wrote:
</pre>
<blockquote type="cite">
<pre wrap="">GL_OES_geometry_shader and GL_OES_tessellation_shader specifications
require OpenGL ES Shading Language 3.10.
So do not declare those extensions in shaders using older GLSL versions.
---
tests/shaders/built-in-constants.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/shaders/built-in-constants.c b/tests/shaders/built-in-constants.c
index d470fe1bf..32cd2638f 100644
--- a/tests/shaders/built-in-constants.c
+++ b/tests/shaders/built-in-constants.c
@@ -462,6 +462,7 @@ piglit_init(int argc, char **argv)
* before version 3.20.
*/
if (es_shader && required_glsl_version < 320 &&
+ required_glsl_version >= 310 &&
piglit_is_extension_supported("GL_OES_geometry_shader")) {
assert(num_required_extensions < ARRAY_SIZE(required_extensions));
required_extensions[num_required_extensions] =
@@ -473,7 +474,9 @@ piglit_init(int argc, char **argv)
const char *const tess_ext_name = es_shader
? "GL_OES_tessellation_shader"
: "GL_ARB_tessellation_shader";
- if (piglit_is_extension_supported(tess_ext_name)) {
+ if (((es_shader && required_glsl_version >= 310) ||
+ !es_shader) &&
+ piglit_is_extension_supported(tess_ext_name)) {
assert(num_required_extensions < ARRAY_SIZE(required_extensions));
required_extensions[num_required_extensions] =
strdup(tess_ext_name);
</pre>
</blockquote>
<pre wrap="">_______________________________________________
Piglit mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a>
<a class="moz-txt-link-freetext" href="https://lists.freedesktop.org/mailman/listinfo/piglit">https://lists.freedesktop.org/mailman/listinfo/piglit</a>
</pre>
</blockquote>
<br>
</body>
</html>