Re: [Piglit] [PATCH] shaders: Test using a bound program after an unsuccessful relink
On 03/11/17 05:42, Neil Roberts wrote:
If a bound program is relinked unsuccessfully it is supposed to keep
the executable and the program state such as the uniforms. This adds a
test for that which updates a uniform, does a failed relink and
verifies that a render succeeds with the new uniform value. This is
currently causing a use-after-free error in Mesa. The test has some
redundant allocations to try and encourage it to fail which it does
about 98% of the time.
Thanks for the test! The idea is great, the only problem I see is that
the minimum GL version seems too high. This test would not run on the
i915 driver which is a problem IMO. Can you lower the requirements?
---
tests/all.py| 1 +
tests/shaders/CMakeLists.gl.txt | 1 +
tests/shaders/unsuccessful-relink.c | 199
3 files changed, 201 insertions(+)
create mode 100644 tests/shaders/unsuccessful-relink.c
diff --git a/tests/all.py b/tests/all.py
index 9e63fa9..ae4a995 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -624,6 +624,7 @@ with profile.test_list.group_manager(PiglitGLTest,
'shaders') as g:
g(['point-vertex-id', 'gl_InstanceID', 'divisor'])
g(['point-vertex-id', 'gl_VertexID', 'gl_InstanceID', 'divisor'])
g(['glsl-vs-int-attrib'])
+g(['unsuccessful-relink'])
g(['glsl-link-initializer-03'],
'GLSL link two programs, global initializer')
g(['glsl-getactiveuniform-count',
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 1c06843..7090d94 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -164,5 +164,6 @@ piglit_add_executable (useshaderprogram-bad-program
useshaderprogram-bad-program
piglit_add_executable (useshaderprogram-flushverts-1
useshaderprogram-flushverts-1.c)
piglit_add_executable (version-mixing version-mixing.c)
piglit_add_executable (glsl-vs-int-attrib glsl-vs-int-attrib.c)
+piglit_add_executable (unsuccessful-relink unsuccessful-relink.c)
# vim: ft=cmake:
diff --git a/tests/shaders/unsuccessful-relink.c
b/tests/shaders/unsuccessful-relink.c
new file mode 100644
index 000..552a4ef
--- /dev/null
+++ b/tests/shaders/unsuccessful-relink.c
@@ -0,0 +1,199 @@
+/*
+ * Copyright © 2017 Igalia S.L.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/**
+ * \file unsuccessful-relink.c
+ *
+ * Render using a program with a uniform. Modify the uniform and then
+ * do a relink that will fail. This shouldn’t affect the original
+ * program and it should render with the new uniform value.
+ *
+ * GLSL 4.6 spec section 7.3:
+ *
+ * “If a program object that is active for any shader stage is
+ * re-linked unsuccessfully, the link status will be set to FALSE,
+ * but any existing executables and associated state will remain part
+ * of the current rendering state until a subsequent call to
+ * UseProgram, UseProgramStages, or BindProgramPipeline removes them
+ * from use.”
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+config.supports_gl_core_version = 31;
+config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static const char vs_source[] =
+"#version 330\n"
+"layout(location = 0) in vec4 piglit_vertex;\n"
+"void main()\n"
+"{\n"
+" gl_Position = piglit_vertex;\n"
+"}\n";
+
+static const char fs_source[] =
+"#version 330\n"
+"uniform vec4 color;\n"
+"layout(location = 0) out vec4 color_out;\n"
+"void main()\n"
+"{\n"
+" color_out = color;\n"
+"}\n";
+
+static const float green[] = { 0.0f, 1.0f, 0.0f, 1.0f };
+static const float purple[] = { 0.5f, 0.0f, 0.5f, 1.0f };
+
+static bool
+try_render(const float *color)
+{
+struct vertex { float x, y; };
+
[Piglit] [PATCH] shaders: Test using a bound program after an unsuccessful relink
If a bound program is relinked unsuccessfully it is supposed to keep
the executable and the program state such as the uniforms. This adds a
test for that which updates a uniform, does a failed relink and
verifies that a render succeeds with the new uniform value. This is
currently causing a use-after-free error in Mesa. The test has some
redundant allocations to try and encourage it to fail which it does
about 98% of the time.
---
tests/all.py| 1 +
tests/shaders/CMakeLists.gl.txt | 1 +
tests/shaders/unsuccessful-relink.c | 199
3 files changed, 201 insertions(+)
create mode 100644 tests/shaders/unsuccessful-relink.c
diff --git a/tests/all.py b/tests/all.py
index 9e63fa9..ae4a995 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -624,6 +624,7 @@ with profile.test_list.group_manager(PiglitGLTest,
'shaders') as g:
g(['point-vertex-id', 'gl_InstanceID', 'divisor'])
g(['point-vertex-id', 'gl_VertexID', 'gl_InstanceID', 'divisor'])
g(['glsl-vs-int-attrib'])
+g(['unsuccessful-relink'])
g(['glsl-link-initializer-03'],
'GLSL link two programs, global initializer')
g(['glsl-getactiveuniform-count',
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 1c06843..7090d94 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -164,5 +164,6 @@ piglit_add_executable (useshaderprogram-bad-program
useshaderprogram-bad-program
piglit_add_executable (useshaderprogram-flushverts-1
useshaderprogram-flushverts-1.c)
piglit_add_executable (version-mixing version-mixing.c)
piglit_add_executable (glsl-vs-int-attrib glsl-vs-int-attrib.c)
+piglit_add_executable (unsuccessful-relink unsuccessful-relink.c)
# vim: ft=cmake:
diff --git a/tests/shaders/unsuccessful-relink.c
b/tests/shaders/unsuccessful-relink.c
new file mode 100644
index 000..552a4ef
--- /dev/null
+++ b/tests/shaders/unsuccessful-relink.c
@@ -0,0 +1,199 @@
+/*
+ * Copyright © 2017 Igalia S.L.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/**
+ * \file unsuccessful-relink.c
+ *
+ * Render using a program with a uniform. Modify the uniform and then
+ * do a relink that will fail. This shouldn’t affect the original
+ * program and it should render with the new uniform value.
+ *
+ * GLSL 4.6 spec section 7.3:
+ *
+ * “If a program object that is active for any shader stage is
+ * re-linked unsuccessfully, the link status will be set to FALSE,
+ * but any existing executables and associated state will remain part
+ * of the current rendering state until a subsequent call to
+ * UseProgram, UseProgramStages, or BindProgramPipeline removes them
+ * from use.”
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+config.supports_gl_core_version = 31;
+config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static const char vs_source[] =
+"#version 330\n"
+"layout(location = 0) in vec4 piglit_vertex;\n"
+"void main()\n"
+"{\n"
+" gl_Position = piglit_vertex;\n"
+"}\n";
+
+static const char fs_source[] =
+"#version 330\n"
+"uniform vec4 color;\n"
+"layout(location = 0) out vec4 color_out;\n"
+"void main()\n"
+"{\n"
+" color_out = color;\n"
+"}\n";
+
+static const float green[] = { 0.0f, 1.0f, 0.0f, 1.0f };
+static const float purple[] = { 0.5f, 0.0f, 0.5f, 1.0f };
+
+static bool
+try_render(const float *color)
+{
+struct vertex { float x, y; };
+static const struct vertex verts[] = {
+{ -1, -1 }, { 1, -1 },
+{ -1, 1 }, { 1, 1 }
+};
+bool pass;
+GLuint buf, vao;
+
+/* This isn’t using piglit_draw_rect because that tries to
+ * call
