mirror of
https://github.com/NVIDIA/cuda-samples.git
synced 2026-10-25 22:28:17 +08:00
Merge branch 'master' into cuda_a_dev
This commit is contained in:
@@ -86,12 +86,14 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
// includes for OpenGL
|
||||
#include <helper_gl.h>
|
||||
|
||||
// includes
|
||||
#include <cuda_gl_interop.h>
|
||||
#include <cuda_runtime.h>
|
||||
#include <helper_cuda.h> // includes cuda.h and cuda_runtime_api.h
|
||||
#include <helper_functions.h>
|
||||
#include <helper_gl.h>
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@@ -28,11 +28,15 @@
|
||||
#include "render_particles.h"
|
||||
|
||||
#define HELPERGL_EXTERN_GL_FUNC_IMPLEMENTATION
|
||||
|
||||
// includes for OpenGL
|
||||
#include <helper_gl.h>
|
||||
|
||||
// includes
|
||||
#include <assert.h>
|
||||
#include <cuda_gl_interop.h>
|
||||
#include <cuda_runtime.h>
|
||||
#include <helper_cuda.h>
|
||||
#include <helper_gl.h>
|
||||
#include <math.h>
|
||||
|
||||
#define GL_POINT_SPRITE_ARB 0x8861
|
||||
|
||||
@@ -31,9 +31,12 @@
|
||||
|
||||
#pragma warning(disable : 4312)
|
||||
|
||||
#include <mmsystem.h>
|
||||
// includes for Windows
|
||||
#include <windows.h>
|
||||
|
||||
// includes for multimedia
|
||||
#include <mmsystem.h>
|
||||
|
||||
// This header inclues all the necessary D3D11 and CUDA includes
|
||||
#include <cuda_d3d11_interop.h>
|
||||
#include <cuda_runtime_api.h>
|
||||
|
||||
@@ -31,9 +31,12 @@
|
||||
|
||||
#pragma warning(disable : 4312)
|
||||
|
||||
#include <mmsystem.h>
|
||||
// includes for Windows
|
||||
#include <windows.h>
|
||||
|
||||
// includes for multimedia
|
||||
#include <mmsystem.h>
|
||||
|
||||
// This header inclues all the necessary D3D11 and CUDA includes
|
||||
#include <cuda_d3d11_interop.h>
|
||||
#include <cuda_runtime_api.h>
|
||||
|
||||
@@ -33,11 +33,15 @@
|
||||
#include <memory.h>
|
||||
|
||||
#define HELPERGL_EXTERN_GL_FUNC_IMPLEMENTATION
|
||||
|
||||
// includes for OpenGL
|
||||
#include <helper_gl.h>
|
||||
|
||||
// includes
|
||||
#include <cuda_gl_interop.h>
|
||||
#include <cuda_runtime.h>
|
||||
#include <helper_cuda.h>
|
||||
#include <helper_functions.h>
|
||||
#include <helper_gl.h>
|
||||
|
||||
#include "ParticleSystem.cuh"
|
||||
#include "ParticleSystem.h"
|
||||
|
||||
@@ -29,11 +29,15 @@
|
||||
This file contains simple wrapper functions that call the CUDA kernels
|
||||
*/
|
||||
#define HELPERGL_EXTERN_GL_FUNC_IMPLEMENTATION
|
||||
|
||||
// includes for OpenGL
|
||||
#include <helper_gl.h>
|
||||
|
||||
// includes
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <cuda_gl_interop.h>
|
||||
#include <helper_cuda.h>
|
||||
#include <helper_gl.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "ParticleSystem.cuh"
|
||||
|
||||
Reference in New Issue
Block a user