<div dir="ltr"><div><br></div><div class="gmail_extra"><br><div class="gmail_quote">On 13 February 2017 at 20:35, Rhys Kidd <span dir="ltr"><<a href="mailto:rhyskidd@gmail.com" target="_blank">rhyskidd@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><br><div class="gmail_quote"><span class=""><div>On Mon, Feb 13, 2017 at 9:43 AM Elie Tournier <<a href="mailto:tournier.elie@gmail.com" target="_blank">tournier.elie@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Seems good to me.<br class="m_8744978492851204340gmail_msg">
<br class="m_8744978492851204340gmail_msg">
Reviewed-by: Elie Tournier <<a href="mailto:tournier.elie@gmail.com" class="m_8744978492851204340gmail_msg" target="_blank">tournier.elie@gmail.com</a>><br class="m_8744978492851204340gmail_msg">
</blockquote><div><br></div></span><div>Thanks Elie.</div><div><br></div><div>Given we are both "new-er" Mesa contributors I might wait for one more Reviewed-by before asking for it to be merged.</div></div></div></blockquote><div><br></div><div>Ping.<br></div><div>Are you OK with this patch? If yes, can you merge it please?<br>Thanks<br></div><div>Elie<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="gmail_quote"><div><div class="h5"><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br class="m_8744978492851204340gmail_msg">
On Sat, Feb 11, 2017 at 05:31:09PM -0500, Rhys Kidd wrote:<br class="m_8744978492851204340gmail_msg">
> glsl/tests/uniform_<wbr>initializer_utils.cpp:83:14: warning: enumeration value ‘GLSL_TYPE_UINT64’ not handled in switch [-Wswitch]<br class="m_8744978492851204340gmail_msg">
>        switch (type->base_type) {<br class="m_8744978492851204340gmail_msg">
>               ^<br class="m_8744978492851204340gmail_msg">
> glsl/tests/uniform_<wbr>initializer_utils.cpp:83:14: warning: enumeration value ‘GLSL_TYPE_INT64’ not handled in switch [-Wswitch]<br class="m_8744978492851204340gmail_msg">
><br class="m_8744978492851204340gmail_msg">
> Fixes: 8ce53d4a2f3 ("glsl: Add basic ARB_gpu_shader_int64 types")<br class="m_8744978492851204340gmail_msg">
> Signed-off-by: Rhys Kidd <<a href="mailto:rhyskidd@gmail.com" class="m_8744978492851204340gmail_msg" target="_blank">rhyskidd@gmail.com</a>><br class="m_8744978492851204340gmail_msg">
> ---<br class="m_8744978492851204340gmail_msg">
>  src/compiler/glsl/tests/<wbr>uniform_initializer_utils.cpp | 18 ++++++++++++++++++<br class="m_8744978492851204340gmail_msg">
>  1 file changed, 18 insertions(+)<br class="m_8744978492851204340gmail_msg">
><br class="m_8744978492851204340gmail_msg">
> diff --git a/src/compiler/glsl/tests/<wbr>uniform_initializer_utils.cpp b/src/compiler/glsl/tests/<wbr>uniform_initializer_utils.cpp<br class="m_8744978492851204340gmail_msg">
> index ec64be1..2a1a168 100644<br class="m_8744978492851204340gmail_msg">
> --- a/src/compiler/glsl/tests/<wbr>uniform_initializer_utils.cpp<br class="m_8744978492851204340gmail_msg">
> +++ b/src/compiler/glsl/tests/<wbr>uniform_initializer_utils.cpp<br class="m_8744978492851204340gmail_msg">
> @@ -96,6 +96,12 @@ generate_data_element(void *mem_ctx, const glsl_type *type,<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_DOUBLE:<br class="m_8744978492851204340gmail_msg">
>        data.d[i] = double(values[idx]);<br class="m_8744978492851204340gmail_msg">
>        break;<br class="m_8744978492851204340gmail_msg">
> +      case GLSL_TYPE_UINT64:<br class="m_8744978492851204340gmail_msg">
> +      data.u64[i] = (uint64_t) values[idx];<br class="m_8744978492851204340gmail_msg">
> +      break;<br class="m_8744978492851204340gmail_msg">
> +      case GLSL_TYPE_INT64:<br class="m_8744978492851204340gmail_msg">
> +      data.i64[i] = (int64_t) values[idx];<br class="m_8744978492851204340gmail_msg">
> +      break;<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_ATOMIC_UINT:<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_STRUCT:<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_ARRAY:<br class="m_8744978492851204340gmail_msg">
> @@ -130,6 +136,12 @@ generate_data_element(void *mem_ctx, const glsl_type *type,<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_DOUBLE:<br class="m_8744978492851204340gmail_msg">
>        ASSERT_EQ(data.d[i], val->value.d[i]);<br class="m_8744978492851204340gmail_msg">
>        break;<br class="m_8744978492851204340gmail_msg">
> +      case GLSL_TYPE_UINT64:<br class="m_8744978492851204340gmail_msg">
> +      ASSERT_EQ(data.u64[i], val->value.u64[i]);<br class="m_8744978492851204340gmail_msg">
> +      break;<br class="m_8744978492851204340gmail_msg">
> +      case GLSL_TYPE_INT64:<br class="m_8744978492851204340gmail_msg">
> +      ASSERT_EQ(data.i64[i], val->value.i64[i]);<br class="m_8744978492851204340gmail_msg">
> +      break;<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_ATOMIC_UINT:<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_STRUCT:<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_ARRAY:<br class="m_8744978492851204340gmail_msg">
> @@ -236,6 +248,12 @@ verify_data(gl_constant_value *storage, unsigned storage_array_size,<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_DOUBLE:<br class="m_8744978492851204340gmail_msg">
>           EXPECT_EQ(val->value.d[i], *(double *)&storage[i*2].i);<br class="m_8744978492851204340gmail_msg">
>           break;<br class="m_8744978492851204340gmail_msg">
> +      case GLSL_TYPE_UINT64:<br class="m_8744978492851204340gmail_msg">
> +         EXPECT_EQ(val->value.u64[i], *(uint64_t *)&storage[i*2].i);<br class="m_8744978492851204340gmail_msg">
> +         break;<br class="m_8744978492851204340gmail_msg">
> +      case GLSL_TYPE_INT64:<br class="m_8744978492851204340gmail_msg">
> +         EXPECT_EQ(val->value.i64[i], *(int64_t *)&storage[i*2].i);<br class="m_8744978492851204340gmail_msg">
> +         break;<br class="m_8744978492851204340gmail_msg">
>           case GLSL_TYPE_ATOMIC_UINT:<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_STRUCT:<br class="m_8744978492851204340gmail_msg">
>        case GLSL_TYPE_ARRAY:<br class="m_8744978492851204340gmail_msg">
> --<br class="m_8744978492851204340gmail_msg">
> 2.9.3<br class="m_8744978492851204340gmail_msg">
><br class="m_8744978492851204340gmail_msg">
> ______________________________<wbr>_________________<br class="m_8744978492851204340gmail_msg">
> mesa-dev mailing list<br class="m_8744978492851204340gmail_msg">
> <a href="mailto:mesa-dev@lists.freedesktop.org" class="m_8744978492851204340gmail_msg" target="_blank">mesa-dev@lists.freedesktop.org</a><br class="m_8744978492851204340gmail_msg">
> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" class="m_8744978492851204340gmail_msg" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br class="m_8744978492851204340gmail_msg">
</blockquote></div></div></div></div>
</blockquote></div><br></div></div>