Attachment #225485 for bug #311657

View | Details | Raw Unified | Return to bug 311657
Collapse All | Expand All

Lines 59-65 Link Here

(-)cuda.orig/include/cudaGL.h (-1 / +1 lines)
59	typedef enum CUGLmap_flags_enum {	59	typedef enum CUGLmap_flags_enum {
60	CU_GL_MAP_RESOURCE_FLAGS_NONE = 0x00,	60	CU_GL_MAP_RESOURCE_FLAGS_NONE = 0x00,
61	CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01,	61	CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01,
62	CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,	62	CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
63	} CUGLmap_flags;	63	} CUGLmap_flags;
64		64
65	CUresult CUDAAPI cuGLInit(void);	65	CUresult CUDAAPI cuGLInit(void);

Lines 82-88 Link Here

(-)cuda.orig/include/cuda_gl_interop.h (-1 / +1 lines)
82	{	82	{
83	cudaGLMapFlagsNone = 0, ///< Default; Assume resource can be read/written	83	cudaGLMapFlagsNone = 0, ///< Default; Assume resource can be read/written
84	cudaGLMapFlagsReadOnly = 1, ///< CUDA kernels will not write to this resource	84	cudaGLMapFlagsReadOnly = 1, ///< CUDA kernels will not write to this resource
85	cudaGLMapFlagsWriteDiscard = 2, ///< CUDA kernels will only write to and will not read from this resource	85	cudaGLMapFlagsWriteDiscard = 2 ///< CUDA kernels will only write to and will not read from this resource
86	};	86	};
87		87
88	extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj);	88	extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj);




/*DEVICE_BUILTIN*/ 
enum cudaGraphicsRegisterFlags
{
  cudaGraphicsRegisterFlagsNone  = 0  ///< Default
};

/**

{
  cudaGraphicsMapFlagsNone         = 0,  ///< Default; Assume resource can be read/written
  cudaGraphicsMapFlagsReadOnly     = 1,  ///< CUDA will not write to this resource
  cudaGraphicsMapFlagsWriteDiscard = 2   ///< CUDA will only write to and will not read from this resource
};

/**

  cudaGraphicsCubeFacePositiveY = 0x02, ///< Positive Y face of cubemap
  cudaGraphicsCubeFaceNegativeY = 0x03, ///< Negative Y face of cubemap
  cudaGraphicsCubeFacePositiveZ = 0x04, ///< Positive Z face of cubemap
  cudaGraphicsCubeFaceNegativeZ = 0x05  ///< Negative Z face of cubemap
};

/**

Return to bug 311657

Lines 244-250 Link Here

(-)cuda.orig/include/driver_types.h (-3 / +3 lines)
244	/DEVICE_BUILTIN/	244	/DEVICE_BUILTIN/
245	enum cudaGraphicsRegisterFlags	245	enum cudaGraphicsRegisterFlags
246	{	246	{
247	cudaGraphicsRegisterFlagsNone = 0, ///< Default	247	cudaGraphicsRegisterFlagsNone = 0 ///< Default
248	};	248	};
249		249
250	/**	250	/**
Lines 255-261 Link Here
255	{	255	{
256	cudaGraphicsMapFlagsNone = 0, ///< Default; Assume resource can be read/written	256	cudaGraphicsMapFlagsNone = 0, ///< Default; Assume resource can be read/written
257	cudaGraphicsMapFlagsReadOnly = 1, ///< CUDA will not write to this resource	257	cudaGraphicsMapFlagsReadOnly = 1, ///< CUDA will not write to this resource
258	cudaGraphicsMapFlagsWriteDiscard = 2, ///< CUDA will only write to and will not read from this resource	258	cudaGraphicsMapFlagsWriteDiscard = 2 ///< CUDA will only write to and will not read from this resource
259	};	259	};
260		260
261	/**	261	/**
Lines 268-274 Link Here
268	cudaGraphicsCubeFacePositiveY = 0x02, ///< Positive Y face of cubemap	268	cudaGraphicsCubeFacePositiveY = 0x02, ///< Positive Y face of cubemap
269	cudaGraphicsCubeFaceNegativeY = 0x03, ///< Negative Y face of cubemap	269	cudaGraphicsCubeFaceNegativeY = 0x03, ///< Negative Y face of cubemap
270	cudaGraphicsCubeFacePositiveZ = 0x04, ///< Positive Z face of cubemap	270	cudaGraphicsCubeFacePositiveZ = 0x04, ///< Positive Z face of cubemap
271	cudaGraphicsCubeFaceNegativeZ = 0x05, ///< Negative Z face of cubemap	271	cudaGraphicsCubeFaceNegativeZ = 0x05 ///< Negative Z face of cubemap
272	};	272	};
273		273
274	/**	274	/**