Fix framework for R64 int images test

[platform/upstream/VK-GL-CTS.git] / framework / common / tcuTexture.cpp

diff --git a/framework/common/tcuTexture.cpp b/framework/common/tcuTexture.cpp
index f5c85b6..4f2378f 100644 (file)
--- a/framework/common/tcuTexture.cpp
+++ b/framework/common/tcuTexture.cpp
@@ -274,7 +274,7 @@ inline deUint16 convertSatRteUint12 (float f)
 inline float channelToFloat (const deUint8* value, TextureFormat::ChannelType type)
 {
        // make sure this table is updated if format table is updated
-       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 40);
+       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 42);
 
        switch (type)
        {
@@ -306,7 +306,7 @@ inline float channelToFloat (const deUint8* value, TextureFormat::ChannelType ty
 inline int channelToInt (const deUint8* value, TextureFormat::ChannelType type)
 {
        // make sure this table is updated if format table is updated
-       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 40);
+       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 42);
 
        switch (type)
        {
@@ -338,7 +338,7 @@ inline int channelToInt (const deUint8* value, TextureFormat::ChannelType type)
 void floatToChannel (deUint8* dst, float src, TextureFormat::ChannelType type)
 {
        // make sure this table is updated if format table is updated
-       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 40);
+       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 42);
 
        switch (type)
        {
@@ -425,7 +425,7 @@ static inline deUint16 convertSatUint12 (S src)
 void intToChannel (deUint8* dst, int src, TextureFormat::ChannelType type)
 {
        // make sure this table is updated if format table is updated
-       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 40);
+       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 42);
 
        switch (type)
        {
@@ -618,12 +618,14 @@ bool isValid (TextureFormat format)
                case TextureFormat::SIGNED_INT8:
                case TextureFormat::SIGNED_INT16:
                case TextureFormat::SIGNED_INT32:
+               case TextureFormat::SIGNED_INT64:
                        return isColor;
 
                case TextureFormat::UNSIGNED_INT8:
                case TextureFormat::UNSIGNED_INT16:
                case TextureFormat::UNSIGNED_INT24:
                case TextureFormat::UNSIGNED_INT32:
+               case TextureFormat::UNSIGNED_INT64:
                        return isColor || format.order == TextureFormat::S;
 
                case TextureFormat::HALF_FLOAT:
@@ -643,7 +645,7 @@ bool isValid (TextureFormat format)
                        return 0u;
        }
 
-       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 40);
+       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 42);
 }
 
 int getNumUsedChannels (TextureFormat::ChannelOrder order)
@@ -683,7 +685,7 @@ int getNumUsedChannels (TextureFormat::ChannelOrder order)
 int getChannelSize (TextureFormat::ChannelType type)
 {
        // make sure this table is updated if format table is updated
-       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 40);
+       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 42);
 
        switch (type)
        {
@@ -697,10 +699,12 @@ int getChannelSize (TextureFormat::ChannelType type)
                case TextureFormat::SIGNED_INT8:                return 1;
                case TextureFormat::SIGNED_INT16:               return 2;
                case TextureFormat::SIGNED_INT32:               return 4;
+               case TextureFormat::SIGNED_INT64:               return 8;
                case TextureFormat::UNSIGNED_INT8:              return 1;
                case TextureFormat::UNSIGNED_INT16:             return 2;
                case TextureFormat::UNSIGNED_INT24:             return 3;
                case TextureFormat::UNSIGNED_INT32:             return 4;
+               case TextureFormat::UNSIGNED_INT64:             return 8;
                case TextureFormat::HALF_FLOAT:                 return 2;
                case TextureFormat::FLOAT:                              return 4;
                case TextureFormat::FLOAT64:                    return 8;
@@ -721,7 +725,7 @@ int getPixelSize (TextureFormat format)
        DE_ASSERT(isValid(format));
 
        // make sure this table is updated if format table is updated
-       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 40);
+       DE_STATIC_ASSERT(TextureFormat::CHANNELTYPE_LAST == 42);
 
        switch (type)
        {
@@ -3860,10 +3864,12 @@ std::ostream& operator<< (std::ostream& str, TextureFormat::ChannelType type)
                "SIGNED_INT8",
                "SIGNED_INT16",
                "SIGNED_INT32",
+               "SIGNED_INT64",
                "UNSIGNED_INT8",
                "UNSIGNED_INT16",
                "UNSIGNED_INT24",
                "UNSIGNED_INT32",
+               "UNSIGNED_INT64",
                "HALF_FLOAT",
                "FLOAT",
                "FLOAT64",