Re: [Piglit] [PATCH] ext_demote_to_helper_invocation: avoid requiring GL 4.5

[Caio Marcelo de Oliveira Filho]

On Wed, Oct 02, 2019 at 07:32:19PM -0400, Ilia Mirkin wrote:
> The test doesn't really need GL 4.5, but *does* need the ext in question
> to be supported. This change drops the requirement down to GL 3.3 + the
> needed exts.
> 
> Signed-off-by: Ilia Mirkin 
> ---
>  .../execution/demote_with_derivatives.shader_test   | 13 +
>  1 file changed, 9 insertions(+), 4 deletions(-)

Landed.  Thanks for the fix.

I've also landed a fix to the [require] and version for the other
execution test.


Caio
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH] ext_demote_to_helper_invocation: avoid requiring GL 4.5

[Ilia Mirkin]

The test doesn't really need GL 4.5, but *does* need the ext in question
to be supported. This change drops the requirement down to GL 3.3 + the
needed exts.

Signed-off-by: Ilia Mirkin 
---
 .../execution/demote_with_derivatives.shader_test   | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git 
a/tests/spec/ext_demote_to_helper_invocation/execution/demote_with_derivatives.shader_test
 
b/tests/spec/ext_demote_to_helper_invocation/execution/demote_with_derivatives.shader_test
index 4785ecfe8..be01d56c5 100644
--- 
a/tests/spec/ext_demote_to_helper_invocation/execution/demote_with_derivatives.shader_test
+++ 
b/tests/spec/ext_demote_to_helper_invocation/execution/demote_with_derivatives.shader_test
@@ -1,14 +1,19 @@
 [require]
-GLSL >= 4.50
+GLSL >= 3.30
+GL_EXT_demote_to_helper_invocation
+GL_ARB_shader_atomic_counters
+GL_ARB_shader_atomic_counter_ops
+GL_ARB_derivative_control
 
 [vertex shader passthrough]
 
 [fragment shader]
-#version 450
+#version 330
 
 #extension GL_EXT_demote_to_helper_invocation : require
 #extension GL_ARB_shader_atomic_counters: require
 #extension GL_ARB_shader_atomic_counter_ops: require
+#extension GL_ARB_derivative_control: require
 
 layout(binding = 0) uniform atomic_uint written_by_demoted;
 layout(binding = 0) uniform atomic_uint written_by_non_demoted;
@@ -35,11 +40,11 @@ void main()
/* Because every invocation here is demoted, we don't
 * expect this to take effect.
 */
-   atomicCounterExchangeARB(written_by_demoted, 1);
+   atomicCounterExchangeARB(written_by_demoted, 1u);
}
 
/* Non demoted will have effect here, verify that we have some. */
-   atomicCounterExchangeARB(written_by_non_demoted, 1);
+   atomicCounterExchangeARB(written_by_non_demoted, 1u);
 
/* If we used discard instead of demote, these would be undefined. */
vec2 dx = dFdxFine(gl_FragCoord.xy);
-- 
2.21.0

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit