diff options
| author |  Allan MacKinnon <allanmac@google.com> | 2018-06-21 09:09:56 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-21 16:52:47 +0000 |
| commit | c110e7941e4e051ad9004412de7b419da8bcf270 (patch) | |
| tree | f3f0bfab677b0581d237db540b19bb2e97d40338 /src/compute/common | |
| parent | 867ce8fc8eef76e26b1e56be66badffc3d5ec3ae (diff) | |
OpenGL interop is simplified when the cl_context is not created by SKC.
Added GEN9 HotSort kernels so the hs_cl_gen9 lib and hs_bench_cl app can be built.
Bug: skia:
Change-Id: I5b21d33499a6ec3524f39a51443981802b722c8b
Reviewed-on: https://skia-review.googlesource.com/136608
Commit-Queue: Allan MacKinnon <allanmac@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/compute/common')
| -rw-r--r-- | src/compute/common/cl/find_cl.c | 2 | ||||
| -rw-r--r-- | src/compute/common/macros.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compute/common/cl/find_cl.c b/src/compute/common/cl/find_cl.c index 613d2b9903..43b26d1d01 100644 --- a/src/compute/common/cl/find_cl.c +++ b/src/compute/common/cl/find_cl.c @@ -20,7 +20,7 @@ #include "find_cl.h" #include "assert_cl.h" -#include "macros.h" +#include "../macros.h" // // search platforms and devices for a match diff --git a/src/compute/common/macros.h b/src/compute/common/macros.h index d91a000eff..52dc8689fc 100644 --- a/src/compute/common/macros.h +++ b/src/compute/common/macros.h @@ -38,9 +38,9 @@ // #if defined(_MSC_VER) - #define ALLOCA(n) _alloca(n) +#define ALLOCA(n) _alloca(n) #else - #define ALLOCA(n) alloca(n) +#define ALLOCA(n) alloca(n) #endif // // |