mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
Update D3D10 and D3D11 interop tests (#2479)
Both tests depend on a very old DirectX SDK (August 2009) and expect it
to be extracted to an {NV_TOOLS} environment variable. They additionally
require definining {ARCH} as a CMake configuration option, which is not
needed.
Update both projects to use DirectX libraries provided by the Windows
SDK and drop the unneeded configuration options.
---------
Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
This commit is contained in:
7
.github/workflows/presubmit.yml
vendored
7
.github/workflows/presubmit.yml
vendored
@@ -112,7 +112,7 @@ jobs:
|
||||
if: ${{ matrix.arch == 'android-arm' || matrix.arch == 'android-aarch64' }}
|
||||
shell: bash
|
||||
run: |
|
||||
echo "CMAKE_CONFIG_ARGS_ANDROID=-DCMAKE_ANDROID_ARCH_ABI=${ANDROID_ARCH_ABI} -DANDROID_PLATFORM=${ANDROID_PLATFORM}" >> $GITHUB_ENV
|
||||
echo "CMAKE_ADDITIONAL_CONFIG_ARGS=-DCMAKE_ANDROID_ARCH_ABI=${ANDROID_ARCH_ABI} -DANDROID_PLATFORM=${ANDROID_PLATFORM}" >> $GITHUB_ENV
|
||||
- name: Fetch and build OpenCL ICD Loader
|
||||
shell: bash
|
||||
run: |
|
||||
@@ -124,7 +124,7 @@ jobs:
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
|
||||
-DOPENCL_ICD_LOADER_HEADERS_DIR='${{ github.workspace }}'/OpenCL-Headers/ \
|
||||
${CMAKE_CONFIG_ARGS_ANDROID}
|
||||
${CMAKE_ADDITIONAL_CONFIG_ARGS}
|
||||
cmake --build . --parallel
|
||||
- name: Fetch Vulkan Headers
|
||||
shell: bash
|
||||
@@ -154,6 +154,7 @@ jobs:
|
||||
cd build
|
||||
if [[ ${RUNNER_OS} == "Windows" ]]; then
|
||||
CMAKE_OPENCL_LIBRARIES_OPTION="OpenCL"
|
||||
CMAKE_ADDITIONAL_CONFIG_ARGS="-DD3D10_IS_SUPPORTED=ON -DD3D11_IS_SUPPORTED=ON"
|
||||
else
|
||||
CMAKE_OPENCL_LIBRARIES_OPTION="-lOpenCL"
|
||||
if [[ '${{ matrix.arch }}' != android-* ]]; then
|
||||
@@ -175,7 +176,7 @@ jobs:
|
||||
-DVULKAN_IS_SUPPORTED=ON \
|
||||
-DVULKAN_INCLUDE_DIR='${{ github.workspace }}'/Vulkan-Headers/include/ \
|
||||
-DVULKAN_LIB_DIR='${{ github.workspace }}'/Vulkan-Loader/build/loader/ \
|
||||
${CMAKE_CONFIG_ARGS_ANDROID}
|
||||
${CMAKE_ADDITIONAL_CONFIG_ARGS}
|
||||
cmake --build . --parallel
|
||||
formatcheck:
|
||||
name: Check code format
|
||||
|
||||
Reference in New Issue
Block a user