mirror of
				https://github.com/NVIDIA/cuda-samples.git
				synced 2025-11-04 07:27:49 +08:00 
			
		
		
		
	Bug 5196977: Include helper_gl.h before cuda_gl_interop.h
This commit is contained in:
		
							parent
							
								
									685709bfc7
								
							
						
					
					
						commit
						952d6edf92
					
				@ -46,12 +46,12 @@
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// includes
 | 
			
		||||
#include <helper_gl.h>
 | 
			
		||||
#include <cuda_gl_interop.h>
 | 
			
		||||
#include <cuda_runtime.h>
 | 
			
		||||
#include <cufft.h>
 | 
			
		||||
#include <helper_cuda.h>
 | 
			
		||||
#include <helper_functions.h>
 | 
			
		||||
#include <helper_gl.h>
 | 
			
		||||
#include <math.h>
 | 
			
		||||
#include <math_constants.h>
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
 | 
			
		||||
@ -87,11 +87,11 @@
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// includes
 | 
			
		||||
#include <helper_gl.h>
 | 
			
		||||
#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>
 | 
			
		||||
 | 
			
		||||
@ -29,10 +29,10 @@
 | 
			
		||||
 | 
			
		||||
#define HELPERGL_EXTERN_GL_FUNC_IMPLEMENTATION
 | 
			
		||||
#include <assert.h>
 | 
			
		||||
#include <helper_gl.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
 | 
			
		||||
 | 
			
		||||
@ -33,11 +33,11 @@
 | 
			
		||||
#include <memory.h>
 | 
			
		||||
 | 
			
		||||
#define HELPERGL_EXTERN_GL_FUNC_IMPLEMENTATION
 | 
			
		||||
#include <helper_gl.h>
 | 
			
		||||
#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"
 | 
			
		||||
 | 
			
		||||
@ -31,9 +31,9 @@ This file contains simple wrapper functions that call the CUDA kernels
 | 
			
		||||
#define HELPERGL_EXTERN_GL_FUNC_IMPLEMENTATION
 | 
			
		||||
#include <cstdio>
 | 
			
		||||
#include <cstdlib>
 | 
			
		||||
#include <helper_gl.h>
 | 
			
		||||
#include <cuda_gl_interop.h>
 | 
			
		||||
#include <helper_cuda.h>
 | 
			
		||||
#include <helper_gl.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
#include "ParticleSystem.cuh"
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user