Update R16G16_S10_5_NV format to R16G16_SFIXED5_NV (#921)

and fix Ruby search to look for virtual environments.

Author: MarkCallow

cmake/mkvk.cmake

@@ -62,6 +62,7 @@ if(NOT PERL_EXECUTABLE)
     message(FATAL_ERROR "Perl executable ${not_found_error}")
 endif()
 
+set(Ruby_FIND_VIRTUALENV FIRST)
 find_package(Ruby 3 QUIET)
 if(NOT Ruby_EXECUTABLE)
     message(FATAL_ERROR "Ruby v3 executable ${not_found_error}")

external/dfdutils/createdfd.c

@@ -94,7 +94,7 @@ static uint32_t setChannelFlags(uint32_t channel, enum VkSuffix suffix)
             channel |= KHR_DF_SAMPLE_DATATYPE_LINEAR;
         }
         break;
-    case s_S10_5:
+    case s_SFIXED5:
         channel |=
             KHR_DF_SAMPLE_DATATYPE_SIGNED;
         break;
@@ -162,7 +162,7 @@ static void writeSample(uint32_t *DFD, int sampleNo, int channel,
         upper.f = 1.0f;
         lower.f = 0.0f;
         break;
-    case s_S10_5:
+    case s_SFIXED5:
         assert(bits == 16 && "Format with this suffix must be 16 bits per channel.");
         upper.i = 32;
         lower.i = ~upper.i + 1; // -32

external/dfdutils/dfd.h

@@ -36,7 +36,7 @@ enum VkSuffix {
     s_SFLOAT,  /*!< Signed float format. */
     s_UFLOAT,  /*!< Unsigned float format. */
     s_SRGB,    /*!< sRGB normalized format. */
-    s_S10_5    /*!< 2's complement fixed-point; 5 fractional bits. */
+    s_SFIXED5  /*!< 2's complement fixed-point; 5 fractional bits. */
 };
 
 /** Compression scheme, in Vulkan terms. */

external/dfdutils/dfd2vk.inl

@@ -178,7 +178,7 @@ if (KHR_DFDVAL(dfd + 1, MODEL) == KHR_DF_MODEL_RGBSDA || KHR_DFDVAL(dfd + 1, MOD
           if (!(r & i_NORMALIZED_FORMAT_BIT) && (r & i_SIGNED_FORMAT_BIT)) return VK_FORMAT_R8_SINT;
         }
       } else if (wordBytes == 2) {
-        if ((r & i_FIXED_FORMAT_BIT) && R.size == 2 && G.size == 2)  return  VK_FORMAT_R16G16_S10_5_NV;
+        if ((r & i_FIXED_FORMAT_BIT) && R.size == 2 && G.size == 2)  return  VK_FORMAT_R16G16_SFIXED5_NV;
         if (A.size > 0) { /* 4 channels */
           if (R.offset == 0) { /* RGBA */
             if ((r & i_FLOAT_FORMAT_BIT)) return VK_FORMAT_R16G16B16A16_SFLOAT;

external/dfdutils/makedfd2vk.pl

@@ -396,9 +396,9 @@ sub checkSuffices {
         print "        }\n";
     } elsif ($byteSize == 2) {
         print "      } else if (wordBytes == $byteSize) {\n";
-        # Handle VK_FORMAT_R16G16_S10_5_NV. Non-standard naming means
-        # checkSuffices can't handle it.
-        print "        if ((r & i_FIXED_FORMAT_BIT) && R.size == 2 && G.size == 2)  return  VK_FORMAT_R16G16_S10_5_NV;\n";
+        # Handle VK_FORMAT_R16G16_SFIXED5_NV. checkSuffices does not
+        # handle this unique suffix.
+        print "        if ((r & i_FIXED_FORMAT_BIT) && R.size == 2 && G.size == 2)  return  VK_FORMAT_R16G16_SFIXED5_NV;\n";
     } else {
         print "      } else if (wordBytes == $byteSize) {\n";
     }

external/dfdutils/makevk2dfd.pl

@@ -293,12 +293,12 @@ sub formatProcessed {
                 print "case $format: return createDFDUnpacked($bigEndian, $numChannels, $bytesPerChannel, $rbswap, s_$suffix);\n";
                 # Add the format we've processed to our "done" hash
                 $foundFormats{$format} = 1;
-            } elsif ($format =~ m/R16G16_S10_5_NV/) {
-                # Currently only this 2-channel S10_5 format exists so an
+            } elsif ($format =~ m/R16G16_SFIXED5_NV/) {
+                # Currently only this 2-channel SFIXED5 format exists so an
                 # explicit match is used.
 
                 # Output the case entry
-                print "case $format: return createDFDUnpacked($bigEndian, 2, 2, 0, s_S10_5);\n";
+                print "case $format: return createDFDUnpacked($bigEndian, 2, 2, 0, s_SFIXED5);\n";
             }
         }
 

external/dfdutils/vk2dfd.inl

@@ -400,7 +400,7 @@ case VK_FORMAT_ASTC_6x6x5_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6
 case VK_FORMAT_ASTC_6x6x6_UNORM_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6, 6, 6, s_UNORM);
 case VK_FORMAT_ASTC_6x6x6_SRGB_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6, 6, 6, s_SRGB);
 case VK_FORMAT_ASTC_6x6x6_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6, 6, 6, s_SFLOAT);
-case VK_FORMAT_R16G16_S10_5_NV: return createDFDUnpacked(0, 2, 2, 0, s_S10_5);
+case VK_FORMAT_R16G16_SFIXED5_NV: return createDFDUnpacked(0, 2, 2, 0, s_SFIXED5);
 case VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR: {
     int channels[] = {0,1,2,3}; int bits[] = {5,5,5,1};
     return createDFDPacked(0, 4, bits, channels, s_UNORM);

external/dfdutils/vulkan/build_custom_vulkan_core

@@ -46,7 +46,7 @@ if [ ! "${dst:0:1}" = "/" ]; then
 fi
 
 cd $1
-scripts/genvk.py -extension VK_EXT_extension_289 -removeExtensions '(VK_KHR_video_decode_h264|VK_KHR_video_decode_h265)' -registry xml/vk.xml -o $dst vulkan_core.h
+scripts/genvk.py -extension VK_EXT_extension_289 -removeExtensions '(VK_KHR_video_decode_av1|VK_KHR_video_decode_h264|VK_KHR_video_encode_h264|VK_KHR_video_decode_h265|VK_KHR_video_encode_h265)' -registry xml/vk.xml -o $dst vulkan_core.h
 
 # To use with Docker
 #   1. Install Docker