Merge pull request #14 from echoedit/dev

Remove those duplicated defined

1 files changed, 2 insertions, 38 deletions

diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h
index 77d5f58..68cb693 100644
--- a/src/abstract_hardware_model.h
+++ b/src/abstract_hardware_model.h
@@ -173,9 +173,7 @@ enum _memory_op_t {
 #include <algorithm>
 
 #if !defined(__VECTOR_TYPES_H__)
-struct dim3 {
-   unsigned int x, y, z;
-};
+#include "vector_types.h"
 #endif
 struct dim3comp {
     bool operator() (const dim3 & a, const dim3 & b) const
@@ -454,19 +452,7 @@ protected:
 
 #if !defined(__CUDA_RUNTIME_API_H__)
 
-enum cudaChannelFormatKind {
-   cudaChannelFormatKindSigned,
-   cudaChannelFormatKindUnsigned,
-   cudaChannelFormatKindFloat
-};
-
-struct cudaChannelFormatDesc {
-   int                        x;
-   int                        y;
-   int                        z;
-   int                        w;
-   enum cudaChannelFormatKind f;
-};
+#include "builtin_types.h"
 
 struct cudaArray {
    void *devPtr;
@@ -478,28 +464,6 @@ struct cudaArray {
    unsigned dimensions;
 };
 
-enum cudaTextureAddressMode {
-   cudaAddressModeWrap,
-   cudaAddressModeClamp
-};
-
-enum cudaTextureFilterMode {
-   cudaFilterModePoint,
-   cudaFilterModeLinear
-};
-
-enum cudaTextureReadMode {
-   cudaReadModeElementType,
-   cudaReadModeNormalizedFloat
-};
-
-struct textureReference {
-   int                           normalized;
-   enum cudaTextureFilterMode    filterMode;
-   enum cudaTextureAddressMode   addressMode[3];
-   struct cudaChannelFormatDesc  channelDesc;
-};
-
 #endif
 
 // Struct that record other attributes in the textureReference declaration