Module: Mesa Branch: main Commit: e4d61f37d4718a16e90ba2825622e13ed677e0c2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4d61f37d4718a16e90ba2825622e13ed677e0c2
Author: Emma Anholt <[email protected]> Date: Tue Nov 1 13:01:16 2022 -0700 rusticl: Fix the invalid memory migration flags check. We want to know if you have any invalid flags set, not if you don't have any valid flags set. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19446> --- src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl.txt | 1 - src/gallium/frontends/rusticl/api/memory.rs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl.txt index 5890201e00c..11128777842 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl.txt @@ -2,7 +2,6 @@ api/clbuildprogram: fail api/clcompileprogram: fail api/clcreateprogramwithbinary: fail api/clenqueuefillimage: fail -api/clenqueuemigratememobjects: fail api/clgetcommandqueueinfo: fail api/clgetdeviceinfo: fail api/clgetextensionfunctionaddressforplatform: fail diff --git a/src/gallium/frontends/rusticl/api/memory.rs b/src/gallium/frontends/rusticl/api/memory.rs index 85e6ae24355..fdb6a6a1c13 100644 --- a/src/gallium/frontends/rusticl/api/memory.rs +++ b/src/gallium/frontends/rusticl/api/memory.rs @@ -2137,9 +2137,9 @@ pub fn enqueue_migrate_mem_objects( // CL_INVALID_VALUE if flags is not 0 or is not any of the values described in the table above. if flags != 0 - && !bit_check( + && bit_check( flags, - CL_MIGRATE_MEM_OBJECT_HOST | CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED, + !(CL_MIGRATE_MEM_OBJECT_HOST | CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED), ) { return Err(CL_INVALID_VALUE);
