Re: [Mesa-dev] [PATCH] u_format_test: Ignore S3TC errors.

2017-05-22 Thread Eric Anholt
Jose Fonseca  writes:

> This prevents spurious failures when libtxc-dxtn-s2tc is installed.
>
> Note: lp_test_format does need any change since we were already ignoring
> S3TC failures there.

Tested-by: Eric Anholt 


signature.asc
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] u_format_test: Ignore S3TC errors.

2017-05-22 Thread Rhys Kidd
On Mon, May 22, 2017 at 1:07 PM Jose Fonseca  wrote:

> This prevents spurious failures when libtxc-dxtn-s2tc is installed.
>
> Note: lp_test_format does need any change


s/does/doesn't/

With that commit message fix:

Reviewed-by: Rhys Kidd 

since we were already ignoring
> S3TC failures there.
> ---
>  src/gallium/tests/unit/u_format_test.c | 25 +
>  1 file changed, 25 insertions(+)
>
> diff --git a/src/gallium/tests/unit/u_format_test.c
> b/src/gallium/tests/unit/u_format_test.c
> index 3145d13616..69d6c7dd3a 100644
> --- a/src/gallium/tests/unit/u_format_test.c
> +++ b/src/gallium/tests/unit/u_format_test.c
> @@ -220,6 +220,11 @@ test_format_fetch_rgba_float(const struct
> util_format_description *format_desc,
>}
> }
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, "
> obtained\n");
>print_unpacked_rgba_doubl(format_desc, "", test->unpacked,
> " expected\n");
> @@ -252,6 +257,11 @@ test_format_unpack_rgba_float(const struct
> util_format_description *format_desc,
>}
> }
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, "
> obtained\n");
>print_unpacked_rgba_doubl(format_desc, "", test->unpacked,
> " expected\n");
> @@ -302,6 +312,11 @@ test_format_pack_rgba_float(const struct
> util_format_description *format_desc,
> if (util_is_double_nan(test->unpacked[0][0][0]))
>success = TRUE;
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_packed(format_desc, "FAILED: ", packed, " obtained\n");
>print_packed(format_desc, "", test->packed, " expected\n");
> @@ -365,6 +380,11 @@ test_format_unpack_rgba_8unorm(const struct
> util_format_description *format_desc
> if (util_is_double_nan(test->unpacked[0][0][0]))
>success = TRUE;
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_unpacked_rgba_8unorm(format_desc, "FAILED: ", unpacked, "
> obtained\n");
>print_unpacked_rgba_8unorm(format_desc, "", expected, "
> expected\n");
> @@ -422,6 +442,11 @@ test_format_pack_rgba_8unorm(const struct
> util_format_description *format_desc,
> if ((test->unpacked[0][0][0] * 255.0) != (int)(test->unpacked[0][0][0]
> * 255.0))
>success = TRUE;
>
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_packed(format_desc, "FAILED: ", packed, " obtained\n");
>print_packed(format_desc, "", test->packed, " expected\n");
> --
> 2.11.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] u_format_test: Ignore S3TC errors.

2017-05-22 Thread Roland Scheidegger
Reviewed-by: Roland Scheidegger 
Thanks!

Am 22.05.2017 um 19:06 schrieb Jose Fonseca:
> This prevents spurious failures when libtxc-dxtn-s2tc is installed.
> 
> Note: lp_test_format does need any change since we were already ignoring
> S3TC failures there.
> ---
>  src/gallium/tests/unit/u_format_test.c | 25 +
>  1 file changed, 25 insertions(+)
> 
> diff --git a/src/gallium/tests/unit/u_format_test.c 
> b/src/gallium/tests/unit/u_format_test.c
> index 3145d13616..69d6c7dd3a 100644
> --- a/src/gallium/tests/unit/u_format_test.c
> +++ b/src/gallium/tests/unit/u_format_test.c
> @@ -220,6 +220,11 @@ test_format_fetch_rgba_float(const struct 
> util_format_description *format_desc,
>}
> }
>  
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, " 
> obtained\n");
>print_unpacked_rgba_doubl(format_desc, "", test->unpacked, " 
> expected\n");
> @@ -252,6 +257,11 @@ test_format_unpack_rgba_float(const struct 
> util_format_description *format_desc,
>}
> }
>  
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, " 
> obtained\n");
>print_unpacked_rgba_doubl(format_desc, "", test->unpacked, " 
> expected\n");
> @@ -302,6 +312,11 @@ test_format_pack_rgba_float(const struct 
> util_format_description *format_desc,
> if (util_is_double_nan(test->unpacked[0][0][0]))
>success = TRUE;
>  
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_packed(format_desc, "FAILED: ", packed, " obtained\n");
>print_packed(format_desc, "", test->packed, " expected\n");
> @@ -365,6 +380,11 @@ test_format_unpack_rgba_8unorm(const struct 
> util_format_description *format_desc
> if (util_is_double_nan(test->unpacked[0][0][0]))
>success = TRUE;
>  
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_unpacked_rgba_8unorm(format_desc, "FAILED: ", unpacked, " 
> obtained\n");
>print_unpacked_rgba_8unorm(format_desc, "", expected, " 
> expected\n");
> @@ -422,6 +442,11 @@ test_format_pack_rgba_8unorm(const struct 
> util_format_description *format_desc,
> if ((test->unpacked[0][0][0] * 255.0) != (int)(test->unpacked[0][0][0] * 
> 255.0))
>success = TRUE;
>  
> +   /* Ignore S3TC errors */
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
> +  success = TRUE;
> +   }
> +
> if (!success) {
>print_packed(format_desc, "FAILED: ", packed, " obtained\n");
>print_packed(format_desc, "", test->packed, " expected\n");
> 

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] u_format_test: Ignore S3TC errors.

2017-05-22 Thread Jose Fonseca
This prevents spurious failures when libtxc-dxtn-s2tc is installed.

Note: lp_test_format does need any change since we were already ignoring
S3TC failures there.
---
 src/gallium/tests/unit/u_format_test.c | 25 +
 1 file changed, 25 insertions(+)

diff --git a/src/gallium/tests/unit/u_format_test.c 
b/src/gallium/tests/unit/u_format_test.c
index 3145d13616..69d6c7dd3a 100644
--- a/src/gallium/tests/unit/u_format_test.c
+++ b/src/gallium/tests/unit/u_format_test.c
@@ -220,6 +220,11 @@ test_format_fetch_rgba_float(const struct 
util_format_description *format_desc,
   }
}
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+  success = TRUE;
+   }
+
if (!success) {
   print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, " 
obtained\n");
   print_unpacked_rgba_doubl(format_desc, "", test->unpacked, " 
expected\n");
@@ -252,6 +257,11 @@ test_format_unpack_rgba_float(const struct 
util_format_description *format_desc,
   }
}
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+  success = TRUE;
+   }
+
if (!success) {
   print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, " 
obtained\n");
   print_unpacked_rgba_doubl(format_desc, "", test->unpacked, " 
expected\n");
@@ -302,6 +312,11 @@ test_format_pack_rgba_float(const struct 
util_format_description *format_desc,
if (util_is_double_nan(test->unpacked[0][0][0]))
   success = TRUE;
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+  success = TRUE;
+   }
+
if (!success) {
   print_packed(format_desc, "FAILED: ", packed, " obtained\n");
   print_packed(format_desc, "", test->packed, " expected\n");
@@ -365,6 +380,11 @@ test_format_unpack_rgba_8unorm(const struct 
util_format_description *format_desc
if (util_is_double_nan(test->unpacked[0][0][0]))
   success = TRUE;
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+  success = TRUE;
+   }
+
if (!success) {
   print_unpacked_rgba_8unorm(format_desc, "FAILED: ", unpacked, " 
obtained\n");
   print_unpacked_rgba_8unorm(format_desc, "", expected, " 
expected\n");
@@ -422,6 +442,11 @@ test_format_pack_rgba_8unorm(const struct 
util_format_description *format_desc,
if ((test->unpacked[0][0][0] * 255.0) != (int)(test->unpacked[0][0][0] * 
255.0))
   success = TRUE;
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+  success = TRUE;
+   }
+
if (!success) {
   print_packed(format_desc, "FAILED: ", packed, " obtained\n");
   print_packed(format_desc, "", test->packed, " expected\n");
-- 
2.11.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev