ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vulkan test build issue on Intel compiler (#1464)

Browse Source
This commit is contained in:
Grzegorz Wawiorko
2022-11-01 21:05:37 +01:00
committed by GitHub
parent babed4c175
commit 44fe72c2b9
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test_conformance/vulkan/test_vulkan_interop_image.cpp
View File

@@ -14,10 +14,10 @@
// limitations under the License. // limitations under the License.
// //
#define NOMINMAX
#include <vulkan_interop_common.hpp> #include <vulkan_interop_common.hpp>
#include <string> #include <string>
#include "harness/errorHelpers.h" #include "harness/errorHelpers.h"
#include <algorithm>
#define MAX_2D_IMAGES 5 #define MAX_2D_IMAGES 5
#define MAX_2D_IMAGE_WIDTH 1024 #define MAX_2D_IMAGE_WIDTH 1024

5
test_conformance/vulkan/vulkan_interop_common/vulkan_list_map.cpp
View File

@@ -14,9 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifdef _WIN32
#define NOMINMAX #include <algorithm>
#endif
#include "vulkan_list_map.hpp" #include "vulkan_list_map.hpp"
#include "vulkan_utility.hpp" #include "vulkan_utility.hpp"
#include "vulkan_wrapper.hpp" #include "vulkan_wrapper.hpp"

2
test_conformance/vulkan/vulkan_interop_common/vulkan_wrapper.cpp
View File

@@ -15,10 +15,10 @@
// //
#ifdef _WIN32 #ifdef _WIN32
#define NOMINMAX
#include <Windows.h> #include <Windows.h>
#include <dxgi1_2.h> #include <dxgi1_2.h>
#include <aclapi.h> #include <aclapi.h>
#include <algorithm>
#endif #endif
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include "vulkan_wrapper.hpp" #include "vulkan_wrapper.hpp"