Merge pull request #368 from XSShawnZeng/master

Update the vulkan headers include sequence and the transpose code format check
This commit is contained in:
Rob Armstrong 2025-05-21 09:27:13 -07:00 committed by GitHub
commit adacf1cffd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 9 deletions

View File

@ -34,8 +34,10 @@
#include <vulkan/vulkan.h>
#ifdef _WIN64
#define NOMINMAX
#include <vulkan/vulkan_win32.h>
// Add windows.h to the include path
#include <windows.h>
// Add vulkan_win32.h to the include path
#include <vulkan/vulkan_win32.h>
#endif /* _WIN64 */
/* remove _VK_TIMELINE_SEMAPHORE to use binary semaphores */

View File

@ -34,8 +34,10 @@
#include <vulkan/vulkan.h>
#ifdef _WIN64
#define NOMINMAX
#include <vulkan/vulkan_win32.h>
// Add windows.h to the include path firstly as dependency for other Windows headers
#include <windows.h>
// Add other Windows headers
#include <vulkan/vulkan_win32.h>
#endif /* _WIN64 */
struct GLFWwindow;

View File

@ -27,10 +27,12 @@
#define GLFW_INCLUDE_VULKAN
#ifdef _WIN64
// Add windows.h to the include path firstly as dependency for other Windows headers
#include <windows.h>
// Add other Windows headers
#include <VersionHelpers.h>
#include <aclapi.h>
#include <dxgi1_2.h>
#include <windows.h>
#define _USE_MATH_DEFINES
#endif

View File

@ -606,8 +606,7 @@ int main(int argc, char **argv)
h_odata[i] = 0;
}
// copy host data to device
checkCudaErrors(
cudaMemcpy(d_odata, h_odata, mem_size, cudaMemcpyHostToDevice));
checkCudaErrors(cudaMemcpy(d_odata, h_odata, mem_size, cudaMemcpyHostToDevice));
}
// cleanup