Fix merged <space><tab> whitespace issues

Change-Id: I9476801571f3a945e8d0b19bc2a466b31a41c52e

diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.hpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.hpp
index 80b190f..6353f56 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.hpp
+++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.hpp
@@ -226,7 +226,7 @@ protected:
        {
        public:
                                                                UnmanagedSamplerUniform  (void) {}
-               virtual                                 ~UnmanagedSamplerUniform (void) {}
+               virtual                                 ~UnmanagedSamplerUniform (void) {}
                virtual UniformType             getType                  (void) const { return UNIFORM_TYPE_UNMANAGED_SAMPLER; }
 
                VkImageView                             imageView;

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
index e16f529..a2108f9 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
+++ b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
@@ -92,7 +92,7 @@ void SampleVerifier::fetchTexelWrapped (const IVec3&  coord,
                                                                                int                             layer,
                                                                                int                             level,
                                                                                Vec4&                   resultMin,
-                                                                               Vec4&                   resultMax) const
+                                                                               Vec4&                   resultMax) const
 {
     const void* pixelPtr = DE_NULL;
 
@@ -117,7 +117,7 @@ void SampleVerifier::fetchTexel (const IVec3&       coordIn,
                                                                 int                    level,
                                                                 VkFilter               filter,
                                                                 Vec4&                  resultMin,
-                                                                Vec4&                  resultMax) const
+                                                                Vec4&                  resultMax) const
 {
        IVec3 coord = coordIn;
 
@@ -279,7 +279,7 @@ void SampleVerifier::getFilteredSample1D (const IVec3&      texelBase,
                                                                                  int                   layer,
                                                                                  int                   level,
                                                                                  Vec4&                 resultMin,
-                                                                                 Vec4&                 resultMax) const
+                                                                                 Vec4&                 resultMax) const
 {
        Vec4 texelsMin[2];
        Vec4 texelsMax[2];
@@ -321,7 +321,7 @@ void SampleVerifier::getFilteredSample2D (const IVec3&      texelBase,
                                                                                  int                   layer,
                                                                                  int                   level,
                                                                                  Vec4&                 resultMin,
-                                                                                 Vec4&                 resultMax) const
+                                                                                 Vec4&                 resultMax) const
 {
        Vec4 texelsMin[4];
        Vec4 texelsMax[4];
@@ -370,7 +370,7 @@ void SampleVerifier::getFilteredSample3D (const IVec3&      texelBase,
                                                                                  int                   layer,
                                                                                  int                   level,
                                                                                  Vec4&                 resultMin,
-                                                                                 Vec4&                 resultMax) const
+                                                                                 Vec4&                 resultMax) const
 {
        Vec4 texelsMin[8];
        Vec4 texelsMax[8];
@@ -427,7 +427,7 @@ void SampleVerifier::getFilteredSample (const IVec3&        texelBase,
                                                                                int                             layer,
                                                                                int                             level,
                                                                                Vec4&                   resultMin,
-                                                                               Vec4&                   resultMax) const
+                                                                               Vec4&                   resultMax) const
 {
        DE_ASSERT(layer < m_imParams.arrayLayers);
        DE_ASSERT(level < m_imParams.levels);
@@ -448,7 +448,7 @@ void SampleVerifier::getFilteredSample (const IVec3&        texelBase,
 
 void SampleVerifier::getMipmapStepBounds (const Vec2&  lodFracBounds,
                                                                                  deInt32&              stepMin,
-                                                                                 deInt32&              stepMax) const
+                                                                                 deInt32&              stepMax) const
 {
        DE_ASSERT(m_mipmapBits < 32);
        const int mipmapSteps = ((int)1) << m_mipmapBits;
@@ -922,7 +922,7 @@ bool SampleVerifier::verifySampleImpl (const SampleArguments&       args,
 
 bool SampleVerifier::verifySampleReport (const SampleArguments&        args,
                                                                                 const Vec4&                    result,
-                                                                                std::string&                   report) const
+                                                                                std::string&                   report) const
 {
        std::ostringstream reportStream;
 

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.hpp b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.hpp
index 7316bac..8a7805c 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.hpp
+++ b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.hpp
@@ -180,54 +180,54 @@ private:
 
        bool coordOutOfRange                            (const tcu::IVec3&                                                                      coord,
                                                                                 int                                                                                            compNdx,
-                                                                                int                                                                                            level) const;
+                                                                                int                                                                                            level) const;
 
        void fetchTexel                                         (const tcu::IVec3&                                                                      coordIn,
                                                                                 int                                                                                            layer,
                                                                                 int                                                                                            level,
                                                                                 vk::VkFilter                                                                           filter,
-                                                                                tcu::Vec4&                                                                             resultMin,
-                                                                                tcu::Vec4&                                                                             resultMax) const;
+                                                                                tcu::Vec4&                                                                                     resultMin,
+                                                                                tcu::Vec4&                                                                                     resultMax) const;
 
        void fetchTexelWrapped                          (const tcu::IVec3&                                                                      coord,
                                                                                 int                                                                                            layer,
                                                                                 int                                                                                            level,
                                                                                 tcu::Vec4&                                                                                     resultMin,
-                                                                                tcu::Vec4&                                                                             resultMax) const;
+                                                                                tcu::Vec4&                                                                                     resultMax) const;
 
     void getFilteredSample1D                   (const tcu::IVec3&                                                                      texelBase,
                                                                                 float                                                                                          weight,
                                                                                 int                                                                                            layer,
                                                                                 int                                                                                            level,
-                                                                                tcu::Vec4&                                                                             resultMin,
-                                                                                tcu::Vec4&                                                                             resultMax) const;
+                                                                                tcu::Vec4&                                                                                     resultMin,
+                                                                                tcu::Vec4&                                                                                     resultMax) const;
 
        void getFilteredSample2D                        (const tcu::IVec3&                                                                      texelBase,
                                                                                 const tcu::Vec2&                                                                       weights,
                                                                                 int                                                                                            layer,
                                                                                 int                                                                                            level,
-                                                                                tcu::Vec4&                                                                             resultMin,
-                                                                                tcu::Vec4&                                                                             resultMax) const;
+                                                                                tcu::Vec4&                                                                                     resultMin,
+                                                                                tcu::Vec4&                                                                                     resultMax) const;
 
        void getFilteredSample3D                        (const tcu::IVec3&                                                                      texelBase,
                                                                                 const tcu::Vec3&                                                                       weights,
                                                                                 int                                                                                            layer,
                                                                                 int                                                                                            level,
-                                                                                tcu::Vec4&                                                                             resultMin,
-                                                                                tcu::Vec4&                                                                             resultMax) const;
+                                                                                tcu::Vec4&                                                                                     resultMin,
+                                                                                tcu::Vec4&                                                                                     resultMax) const;
 
        void getFilteredSample                          (const tcu::IVec3&                                                                      texelBase,
                                                                                 const tcu::Vec3&                                                                       weights,
                                                                                 int                                                                                            layer,
                                                                                 int                                                                                            level,
-                                                                                tcu::Vec4&                                                                             resultMin,
-                                                                                tcu::Vec4&                                                                             resultMax) const;
+                                                                                tcu::Vec4&                                                                                     resultMin,
+                                                                                tcu::Vec4&                                                                                     resultMax) const;
 
        void getMipmapStepBounds                        (const tcu::Vec2&                                                                       lodFracBounds,
                                                                                 deInt32&                                                                                       stepMin,
                                                                                 deInt32&                                                                                       stepMax) const;
 
-       const tcu::FloatFormat                                                  m_internalFormat;
+       const tcu::FloatFormat                                                  m_internalFormat;
 
        const ImageViewParameters&                                              m_imParams;
        const SamplerParameters&                                                m_samplerParams;

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp
index 31e33a3..e189bba 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp
+++ b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp
@@ -629,7 +629,7 @@ void convertFP16 (const void*       fp16Ptr,
 
 void convertNormalizedInt (deInt64             num,
                                                   int                  numBits,
-                                                  bool                 isSigned,
+                                                  bool                 isSigned,
                                                   FloatFormat  internalFormat,
                                                   float&               resultMin,
                                                   float&               resultMax)

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.hpp b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.hpp
index e1566c6..35360a5 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.hpp
+++ b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.hpp
@@ -42,7 +42,7 @@ float         addUlp                                          (float                                                  num,
 
 deInt32                mod                                                     (const deInt32                                  a,
                                                                                 const deInt32                                  n);
-deInt32            mirror                                              (const deInt32                                  n);
+deInt32            mirror                                              (const deInt32                                  n);
 
 tcu::Vec2      calcLodBounds                           (const tcu::Vec3&                               dPdx,
                                                                                 const tcu::Vec3&                               dPdy,
@@ -81,25 +81,25 @@ void                calcCubemapFaceCoords           (const tcu::Vec3&                               r,
                                                                                 tcu::Vec2&                                             coordFace,
                                                                                 tcu::Vec2&                                             dPdxFace,
                                                                                 tcu::Vec2&                                             dPdyFace);
-int            calcCandidateCubemapFaces       (const tcu::Vec3&                               r);
-deInt32        wrapTexelCoord                          (const deInt32                                  coord,
+int                    calcCandidateCubemapFaces       (const tcu::Vec3&                               r);
+deInt32                wrapTexelCoord                          (const deInt32                                  coord,
                                                                                 const int                                              size,
                                                                                 const vk::VkSamplerAddressMode wrap);
-void           wrapCubemapEdge                         (const tcu::IVec2&                              coord,
-                                                                                const tcu::IVec2&                              size,
+void           wrapCubemapEdge                         (const tcu::IVec2&                              coord,
+                                                                                const tcu::IVec2&                              size,
                                                                                 const int                                              faceNdx,
                                                                                 tcu::IVec2&                                    newCoord,
                                                                                 int&                                                   newFaceNdx);
-void           wrapCubemapCorner                       (const tcu::IVec2&                              coord,
-                                                                                const tcu::IVec2&                              size,
-                                                                                const int                                              faceNdx,
-                                                                                int&                                                   adjacentFace1,
-                                                                                int&                                                   adjacentFace2,
+void           wrapCubemapCorner                       (const tcu::IVec2&                              coord,
+                                                                                const tcu::IVec2&                              size,
+                                                                                const int                                              faceNdx,
+                                                                                int&                                                   adjacentFace1,
+                                                                                int&                                                   adjacentFace2,
                                                                                 tcu::IVec2&                                    cornerCoord0,
                                                                                 tcu::IVec2&                                    cornerCoord1,
                                                                                 tcu::IVec2&                                    cornerCoord2);
 
-void           convertFormat                           (const void*                                    pixelPtr,
+void           convertFormat                           (const void*                                    pixelPtr,
                                                                                 tcu::TextureFormat                             texFormat,
                                                                                 tcu::FloatFormat                               internalFormat,
                                                                                 tcu::Vec4&                                             resultMin,

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp b/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp
index aa10dcd..3b398c6 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp
+++ b/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp
@@ -212,7 +212,7 @@ string genLookupCode(const ImageViewParameters&             imParams,
        }
 
        code += "(testSampler, ";
-       code += arg;
+       code += arg;
 
        if (samplerParams.isCompare && hasSeparateCompare)
        {
@@ -560,12 +560,12 @@ VkImageViewType mapImageViewType (const ImageViewParameters& imParams)
 class DataGenerator
 {
 public:
-       virtual                                                                         ~DataGenerator  (void) {}
+       virtual                                                                         ~DataGenerator  (void) {}
 
-       virtual bool                                                            generate                (void) = 0;
+       virtual bool                                                            generate                (void) = 0;
 
        virtual std::vector<ConstPixelBufferAccess> getPba                      (void) const = 0;
-       virtual std::vector<SampleArguments>            getSampleArgs   (void) const = 0;
+       virtual std::vector<SampleArguments>            getSampleArgs   (void) const = 0;
 
 protected:
        DataGenerator (void) {}

diff --git a/framework/common/tcuResultCollector.hpp b/framework/common/tcuResultCollector.hpp
index 5786472..af41ab8 100644 (file)
--- a/framework/common/tcuResultCollector.hpp
+++ b/framework/common/tcuResultCollector.hpp
@@ -66,4 +66,4 @@ private:
 
 } // tcu
 
-#endif // _TCURESULTCOLLECTOR_HPP
\ No newline at end of file
+#endif // _TCURESULTCOLLECTOR_HPP

diff --git a/framework/delibs/depool/dePoolArray.h b/framework/delibs/depool/dePoolArray.h
index e8e0c08..8365e7f 100644 (file)
--- a/framework/delibs/depool/dePoolArray.h
+++ b/framework/delibs/depool/dePoolArray.h
@@ -91,17 +91,17 @@ DE_END_EXTERN_C
 *//*--------------------------------------------------------------------*/
 #define DE_DECLARE_POOL_ARRAY(TYPENAME, VALUETYPE)             \
     \
-typedef struct TYPENAME##_s                                    \
-{                                                                                      \
-       deMemPool*                      pool;                           \
+typedef struct TYPENAME##_s                                    \
+{                                                                                      \
+       deMemPool*                      pool;                           \
                                                                                        \
-       int                                     elementSize;            \
-       int                                     numElements;            \
-       int                                     capacity;               \
+       int                                     elementSize;            \
+       int                                     numElements;            \
+       int                                     capacity;                       \
                                                                                        \
        int                                     pageTableCapacity;      \
-       DE_PTR_TYPE(VALUETYPE)* pageTable;      \
-} TYPENAME; /* NOLINT(TYPENAME) */             \
+       DE_PTR_TYPE(VALUETYPE)* pageTable;              \
+} TYPENAME; /* NOLINT(TYPENAME) */                     \
 \
 DE_INLINE TYPENAME*    TYPENAME##_create                       (deMemPool* pool);                                                                                                                      \
 DE_INLINE int          TYPENAME##_getNumElements       (const TYPENAME* arr)                                                                   DE_UNUSED_FUNCTION;     \

diff --git a/framework/delibs/depool/dePoolHash.h b/framework/delibs/depool/dePoolHash.h
index b8b6a78..5316f32 100644 (file)
--- a/framework/delibs/depool/dePoolHash.h
+++ b/framework/delibs/depool/dePoolHash.h
@@ -84,7 +84,7 @@ typedef struct TYPENAME##_s    \
        int                                     slotTableSize;          \
        TYPENAME##Slot**        slotTable;                      \
        TYPENAME##Slot*         slotFreeList;           \
-} TYPENAME; /* NOLINT(TYPENAME) */             \
+} TYPENAME; /* NOLINT(TYPENAME) */                     \
 \
 typedef struct TYPENAME##Iter_s \
 {      \
@@ -94,12 +94,12 @@ typedef struct TYPENAME##Iter_s \
        int                                             curElemIndex;   \
 } TYPENAME##Iter;      \
 \
-TYPENAME*      TYPENAME##_create       (deMemPool* pool);                                                                              \
-void           TYPENAME##_reset        (DE_PTR_TYPE(TYPENAME) hash);                                                           \
-deBool         TYPENAME##_reserve      (DE_PTR_TYPE(TYPENAME) hash, int capacity);                             \
-VALUETYPE*     TYPENAME##_find         (const TYPENAME* hash, KEYTYPE key);                                            \
+TYPENAME*      TYPENAME##_create       (deMemPool* pool);                                                                                      \
+void           TYPENAME##_reset        (DE_PTR_TYPE(TYPENAME) hash);                                                           \
+deBool         TYPENAME##_reserve      (DE_PTR_TYPE(TYPENAME) hash, int capacity);                                     \
+VALUETYPE*     TYPENAME##_find         (const TYPENAME* hash, KEYTYPE key);                                            \
 deBool         TYPENAME##_insert       (DE_PTR_TYPE(TYPENAME) hash, KEYTYPE key, VALUETYPE value);     \
-void           TYPENAME##_delete       (DE_PTR_TYPE(TYPENAME) hash, KEYTYPE key);                              \
+void           TYPENAME##_delete       (DE_PTR_TYPE(TYPENAME) hash, KEYTYPE key);                                      \
 \
 DE_INLINE int          TYPENAME##_getNumElements       (const TYPENAME* hash)                                                  DE_UNUSED_FUNCTION;     \
 DE_INLINE void         TYPENAME##Iter_init                     (const TYPENAME* hash, TYPENAME##Iter* iter)    DE_UNUSED_FUNCTION;     \

diff --git a/framework/delibs/depool/dePoolHashArray.h b/framework/delibs/depool/dePoolHashArray.h
index 4be0cbf..cf9cfbe 100644 (file)
--- a/framework/delibs/depool/dePoolHashArray.h
+++ b/framework/delibs/depool/dePoolHashArray.h
@@ -65,7 +65,7 @@ typedef struct TYPENAME_s                                                                                                                                                     \
 {                                                                                                                                                                                                      \
        TYPENAME##Hash*         hash;                                                                                                                                           \
        TYPENAME##Array*        array;                                                                                                                                          \
-} TYPENAME; /* NOLINT(TYPENAME) */                                                                                                                             \
+} TYPENAME; /* NOLINT(TYPENAME) */                                                                                                                                     \
                                                                                                                                                                                                        \
 TYPENAME*              TYPENAME##_create               (deMemPool* pool);                                                                                      \
 deBool                 TYPENAME##_insert               (DE_PTR_TYPE(TYPENAME) hashArray, KEYTYPE key, VALUETYPE value);        \

diff --git a/framework/delibs/depool/dePoolHashSet.h b/framework/delibs/depool/dePoolHashSet.h
index 4a96862..3d823b2 100644 (file)
--- a/framework/delibs/depool/dePoolHashSet.h
+++ b/framework/delibs/depool/dePoolHashSet.h
@@ -64,13 +64,13 @@ typedef struct TYPENAME##_s                                                                                                                                                 \
 } TYPENAME;     /* NOLINT(TYPENAME) */                                                                                                                                 \
                                                                                                                                                                                                        \
 DE_INLINE TYPENAME*                    TYPENAME##_create                       (deMemPool* pool);                                                      \
-DE_INLINE int                          TYPENAME##_getNumElements       (const TYPENAME* hashSet)                                                                               DE_UNUSED_FUNCTION;     \
-DE_INLINE TYPENAME##Hash*      TYPENAME##_getHash                      (const TYPENAME* hashSet)                                                                               DE_UNUSED_FUNCTION;     \
+DE_INLINE int                          TYPENAME##_getNumElements       (const TYPENAME* hashSet)                                                                               DE_UNUSED_FUNCTION;     \
+DE_INLINE TYPENAME##Hash*      TYPENAME##_getHash                      (const TYPENAME* hashSet)                                                                               DE_UNUSED_FUNCTION;     \
 DE_INLINE deBool                       TYPENAME##_insert                       (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value)   DE_UNUSED_FUNCTION;     \
 DE_INLINE deBool                       TYPENAME##_safeInsert           (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value)   DE_UNUSED_FUNCTION;     \
-DE_INLINE TYPENAME##Set*       TYPENAME##_find                         (const TYPENAME* hashSet, KEYTYPE key)                                                  DE_UNUSED_FUNCTION;     \
-DE_INLINE void                         TYPENAME##_delete                       (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value)   DE_UNUSED_FUNCTION;     \
-DE_INLINE deBool                       TYPENAME##_exists                       (const TYPENAME* hashSet, KEYTYPE key, VALUETYPE value)                 DE_UNUSED_FUNCTION;     \
+DE_INLINE TYPENAME##Set*       TYPENAME##_find                         (const TYPENAME* hashSet, KEYTYPE key)                                                  DE_UNUSED_FUNCTION;     \
+DE_INLINE void                         TYPENAME##_delete                       (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value)   DE_UNUSED_FUNCTION;     \
+DE_INLINE deBool                       TYPENAME##_exists                       (const TYPENAME* hashSet, KEYTYPE key, VALUETYPE value)                 DE_UNUSED_FUNCTION;     \
                                                                                                                                                                                                        \
 DE_INLINE TYPENAME* TYPENAME##_create (deMemPool* pool)                                                                                                \
 {                                                                                                                                                                                                      \

diff --git a/framework/delibs/depool/dePoolMultiSet.h b/framework/delibs/depool/dePoolMultiSet.h
index ac6c3f7..c5dce85 100644 (file)
--- a/framework/delibs/depool/dePoolMultiSet.h
+++ b/framework/delibs/depool/dePoolMultiSet.h
@@ -62,12 +62,12 @@ DE_END_EXTERN_C
 \
 DE_DECLARE_POOL_HASH(TYPENAME##Hash, KEYTYPE, int);    \
 \
-typedef struct TYPENAME##_s                            \
-{                                                                      \
-       deMemPool*                      pool;                   \
+typedef struct TYPENAME##_s                            \
+{                                                                              \
+       deMemPool*                      pool;                   \
        int                                     numElements;    \
        TYPENAME##Hash*         hash;                   \
-} TYPENAME; /* NOLINT(TYPENAME) */     \
+} TYPENAME; /* NOLINT(TYPENAME) */             \
 \
 TYPENAME*      TYPENAME##_create               (deMemPool* pool);    \
 void           TYPENAME##_reset                (DE_PTR_TYPE(TYPENAME) set);    \

diff --git a/framework/delibs/depool/dePoolSet.h b/framework/delibs/depool/dePoolSet.h
index dfc32e8..214bc17 100644 (file)
--- a/framework/delibs/depool/dePoolSet.h
+++ b/framework/delibs/depool/dePoolSet.h
@@ -74,15 +74,15 @@ struct TYPENAME##Slot_s \
        KEYTYPE                 keys[DE_SET_ELEMENTS_PER_SLOT]; \
 }; \
 \
-typedef struct TYPENAME##_s                            \
-{                                                                      \
-       deMemPool*                      pool;                   \
+typedef struct TYPENAME##_s                            \
+{                                                                              \
+       deMemPool*                      pool;                   \
        int                                     numElements;    \
                                                                                \
        int                                     slotTableSize;  \
        TYPENAME##Slot**        slotTable;              \
        TYPENAME##Slot*         slotFreeList;   \
-} TYPENAME; /* NOLINT(TYPENAME) */     \
+} TYPENAME; /* NOLINT(TYPENAME) */             \
 \
 typedef struct TYPENAME##Iter_s \
 {      \
@@ -92,10 +92,10 @@ typedef struct TYPENAME##Iter_s \
        int                                             curElemIndex;   \
 } TYPENAME##Iter;      \
 \
-TYPENAME*      TYPENAME##_create               (deMemPool* pool);                                              \
-void           TYPENAME##_reset                (DE_PTR_TYPE(TYPENAME) set);                            \
+TYPENAME*      TYPENAME##_create               (deMemPool* pool);                                                      \
+void           TYPENAME##_reset                (DE_PTR_TYPE(TYPENAME) set);                            \
 deBool         TYPENAME##_reserve              (DE_PTR_TYPE(TYPENAME) set, int capacity);      \
-deBool         TYPENAME##_exists               (const TYPENAME* set, KEYTYPE key);             \
+deBool         TYPENAME##_exists               (const TYPENAME* set, KEYTYPE key);                     \
 deBool         TYPENAME##_insert               (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key);       \
 void           TYPENAME##_delete               (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key);       \
 \

diff --git a/framework/referencerenderer/rrGenericVector.hpp b/framework/referencerenderer/rrGenericVector.hpp
index aadae19..d2e5aa2 100644 (file)
--- a/framework/referencerenderer/rrGenericVector.hpp
+++ b/framework/referencerenderer/rrGenericVector.hpp
@@ -146,4 +146,4 @@ inline const deInt32* GenericVec4::getAccess<deInt32> () const
 
 } // rr
 
-#endif // _RRGENERICVECTOR_HPP
\ No newline at end of file
+#endif // _RRGENERICVECTOR_HPP

diff --git a/modules/gles2/functional/es2fShaderAlgorithmTests.cpp b/modules/gles2/functional/es2fShaderAlgorithmTests.cpp
index 52e019c..a127f24 100644 (file)
--- a/modules/gles2/functional/es2fShaderAlgorithmTests.cpp
+++ b/modules/gles2/functional/es2fShaderAlgorithmTests.cpp
@@ -154,7 +154,7 @@ void ShaderAlgorithmTests::init (void)
 
        #define SHADER_OP_CASE(NAME, DESCRIPTION, SHADER_OP, EVAL_FUNC_BODY)                                                                                                            \
                do {                                                                                                                                                                                                                                    \
-                       struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY };  /* NOLINT(EVAL_FUNC_BODY) */            \
+                       struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY };  /* NOLINT(EVAL_FUNC_BODY) */            \
                        addChild(createExpressionCase(m_context, #NAME "_vertex", DESCRIPTION, true, &Eval_##NAME::eval, SHADER_OP));           \
                        addChild(createExpressionCase(m_context, #NAME "_fragment", DESCRIPTION, false, &Eval_##NAME::eval, SHADER_OP));        \
                } while (deGetFalse())

diff --git a/modules/gles2/functional/es2fShaderStructTests.cpp b/modules/gles2/functional/es2fShaderStructTests.cpp
index 09edf66..555a154 100644 (file)
--- a/modules/gles2/functional/es2fShaderStructTests.cpp
+++ b/modules/gles2/functional/es2fShaderStructTests.cpp
@@ -211,7 +211,7 @@ void LocalStructTests::init (void)
 {
        #define LOCAL_STRUCT_CASE(NAME, DESCRIPTION, FLAGS, SHADER_SRC, EVAL_FUNC_BODY)                                                                                                                         \
                do {                                                                                                                                                                                                                                                                    \
-                       struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY };  /* NOLINT(EVAL_FUNC_BODY) */                                            \
+                       struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY };  /* NOLINT(EVAL_FUNC_BODY) */                                            \
                        addChild(createStructCase(m_context, #NAME "_vertex", DESCRIPTION, true, FLAGS, &Eval_##NAME::eval, DE_NULL, SHADER_SRC));                      \
                        addChild(createStructCase(m_context, #NAME "_fragment", DESCRIPTION, false, FLAGS,&Eval_##NAME::eval, DE_NULL, SHADER_SRC));            \
                } while (deGetFalse())
@@ -1220,7 +1220,7 @@ void UniformStructTests::init (void)
                        struct SetUniforms_##NAME {                                                                                                                                                                                                                                                                     \
                                 static void setUniforms (const glw::Functions& gl, deUint32 programID, const tcu::Vec4& constCoords) SET_UNIFORMS_BODY /* NOLINT(SET_UNIFORMS_BODY) */ \
                        };                                                                                                                                                                                                                                                                                                                      \
-                       struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY };  /* NOLINT(EVAL_FUNC_BODY) */                                                                                            \
+                       struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY };  /* NOLINT(EVAL_FUNC_BODY) */                                                                                            \
                        addChild(createStructCase(m_context, #NAME "_vertex", DESCRIPTION, true, FLAGS, Eval_##NAME::eval, SetUniforms_##NAME::setUniforms, SHADER_SRC));                       \
                        addChild(createStructCase(m_context, #NAME "_fragment", DESCRIPTION, false, FLAGS, Eval_##NAME::eval, SetUniforms_##NAME::setUniforms, SHADER_SRC));            \
                } while (deGetFalse())

diff --git a/modules/gles3/functional/es3fShaderStructTests.cpp b/modules/gles3/functional/es3fShaderStructTests.cpp
index 3827685..ad80a9a 100644 (file)
--- a/modules/gles3/functional/es3fShaderStructTests.cpp
+++ b/modules/gles3/functional/es3fShaderStructTests.cpp
@@ -185,7 +185,7 @@ void LocalStructTests::init (void)
 {
        #define LOCAL_STRUCT_CASE(NAME, DESCRIPTION, SHADER_SRC, EVAL_FUNC_BODY)                                                                                                                                        \
                do {                                                                                                                                                                                                                                                                    \
-                       struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY };  /* NOLINT(EVAL_FUNC_BODY) */                                            \
+                       struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY };  /* NOLINT(EVAL_FUNC_BODY) */                                            \
                        addChild(createStructCase(m_context, #NAME "_vertex", DESCRIPTION, true, false, &Eval_##NAME::eval, DE_NULL, SHADER_SRC));                      \
                        addChild(createStructCase(m_context, #NAME "_fragment", DESCRIPTION, false, false,&Eval_##NAME::eval, DE_NULL, SHADER_SRC));            \
                } while (deGetFalse())

diff --git a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
index b908ff7..7e62fe4 100644 (file)
--- a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
+++ b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
@@ -1560,8 +1560,8 @@ void framebuffer_texture_layer (NegativeTestContext& ctx)
        int                                                             max3DTexSize            = 0x1234;
        int                                                             maxTexSize                      = 0x1234;
        int                                                             maxArrayTexLayers       = 0x1234;
-       int                                                     log2Max3DTexSize        = 0x1234;
-       int                                                     log2MaxTexSize          = 0x1234;
+       int                                                             log2Max3DTexSize        = 0x1234;
+       int                                                             log2MaxTexSize          = 0x1234;
 
        ctx.glGetIntegerv                               (GL_MAX_3D_TEXTURE_SIZE, &max3DTexSize);
        ctx.glGetIntegerv                               (GL_MAX_TEXTURE_SIZE, &maxTexSize);

diff --git a/targets/wayland/wayland.cmake b/targets/wayland/wayland.cmake
index 269ff5a..e322603 100644 (file)
--- a/targets/wayland/wayland.cmake
+++ b/targets/wayland/wayland.cmake
@@ -1,5 +1,5 @@
 message("*** Using Wayland target")
-set(DEQP_TARGET_NAME   "WAYLAND")
+set(DEQP_TARGET_NAME   "WAYLAND")
 set(DEQP_RUNTIME_LINK  ON)
 set(DEQP_SUPPORT_GLES2 ON)
 set(DEQP_SUPPORT_GLES3 ON)