<div dir="ltr">On 9 August 2013 15:40, Ian Romanick <span dir="ltr"><<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br>
<br>
Fixes failures in ES3 --check-link tests<br>
default-precision-sampler.frag and default-precision-sampler.vert. It<br>
also makes "glsl-es-3.00 compiler no-default-float-precision.frag"<br>
correctly fail.<br>
<br>
Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br></blockquote><div><br></div><div>Series is:<br><br>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br>
</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
tests/glslparsertest/glslparsertest.c | 11 +++++++----<br>
1 file changed, 7 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/tests/glslparsertest/glslparsertest.c b/tests/glslparsertest/glslparsertest.c<br>
index bba6cb3..d9f1947 100644<br>
--- a/tests/glslparsertest/glslparsertest.c<br>
+++ b/tests/glslparsertest/glslparsertest.c<br>
@@ -134,12 +134,12 @@ attach_dummy_shader(GLuint shader_prog, GLenum type)<br>
switch (type) {<br>
case GL_VERTEX_SHADER:<br>
shader_template =<br>
- "#version %d\n"<br>
+ "#version %d %s\n"<br>
"void main() { gl_Position = vec4(0.0); }";<br>
break;<br>
case GL_FRAGMENT_SHADER:<br>
shader_template =<br>
- "#version %d\n"<br>
+ "#version %d %s\n"<br>
"void main() { }";<br>
break;<br>
default:<br>
@@ -148,7 +148,10 @@ attach_dummy_shader(GLuint shader_prog, GLenum type)<br>
break;<br>
}<br>
<br>
- sprintf(shader_text, shader_template, requested_version);<br>
+ sprintf(shader_text,<br>
+ shader_template,<br>
+ requested_version,<br>
+ (requested_version == 300) ? "es" : "");<br>
shader = piglit_compile_shader_text(type, shader_text);<br>
glAttachShader(shader_prog, shader);<br>
}<br>
@@ -242,7 +245,7 @@ test(void)<br>
<br>
shader_prog = glCreateProgram();<br>
glAttachShader(shader_prog, prog);<br>
- if (requested_version == 100)<br>
+ if (requested_version == 100 || requested_version == 300)<br>
attach_complementary_shader(shader_prog, type);<br>
#if PIGLIT_USE_OPENGL<br>
if (type == GL_GEOMETRY_SHADER)<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.1.4<br>
<br>
_______________________________________________<br>
Piglit mailing list<br>
<a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a><br>
</font></span></blockquote></div><br></div></div>