I did... commit 3ddd90f5ad5e8f74af46e4b41b325fe110c5850e upstream. (Without your R-b since you hadn't explicitly supplied it at the time.)
On Tue, Nov 3, 2015 at 11:08 AM, Brian Paul <[email protected]> wrote: > On 10/28/2015 12:55 PM, Ilia Mirkin wrote: >> >> This prevents the test from trying to copy compressed formats to depth >> textures and vice-versa. >> >> Signed-off-by: Ilia Mirkin <[email protected]> >> --- >> tests/spec/arb_copy_image/formats.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/tests/spec/arb_copy_image/formats.c >> b/tests/spec/arb_copy_image/formats.c >> index 8aa3658..a4c027e 100644 >> --- a/tests/spec/arb_copy_image/formats.c >> +++ b/tests/spec/arb_copy_image/formats.c >> @@ -273,6 +273,9 @@ are_formats_compatible(struct texture_format *f1, >> struct texture_format *f2) >> if (f1 == f2) >> return true; >> >> + if (!f1->can_be_reinterpreted || !f2->can_be_reinterpreted) >> + return false; >> + >> if (is_format_compressed(f1)) { >> if (is_format_compressed(f2)) >> /* Compressed-to-compressed copies are not >> supported */ >> @@ -282,8 +285,7 @@ are_formats_compatible(struct texture_format *f1, >> struct texture_format *f2) >> } else if (is_format_compressed(f2)) { >> return f1->bytes == f2->bytes; >> } else { >> - return f1->can_be_reinterpreted && >> f2->can_be_reinterpreted && >> - f1->bytes == f2->bytes; >> + return f1->bytes == f2->bytes; >> } >> } >> >> > > Were you doing to commit this, Ilia? > > Reviewed-by: Brian Paul <[email protected]> > _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
