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:
@@ -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