[dxbc] Implement DtoF and FtoD instructions

src/dxbc/dxbc_compiler.cpp

@@ -95,6 +95,9 @@ namespace dxvk {
       case DxbcInstClass::ConvertFloat16:
         return this->emitConvertFloat16(ins);
         
+      case DxbcInstClass::ConvertFloat64:
+        return this->emitConvertFloat64(ins);
+        
       case DxbcInstClass::ControlFlow:
         return this->emitControlFlow(ins);
         
@@ -2549,6 +2552,33 @@ namespace dxvk {
   }
 
 
+  void DxbcCompiler::emitConvertFloat64(const DxbcShaderInstruction& ins) {
+    // ftod and dtof take the following operands:
+    //  (dst0) Destination operand
+    //  (src0) Number to convert
+    m_module.enableCapability(spv::CapabilityFloat64);
+
+    // The source operand mask depends on the number
+    // of components set in the destination mask
+    uint32_t dstBits = ins.dst[0].mask.popCount();
+
+    DxbcRegMask srcMask = isDoubleType(ins.dst[0].dataType)
+      ? DxbcRegMask(dstBits == 2, dstBits == 4, false, false)
+      : DxbcRegMask(dstBits >= 1, dstBits >= 1, dstBits >= 2, dstBits >= 2);
+
+    // Perform actual conversion, destination modifiers are not applied
+    DxbcRegisterValue val = emitRegisterLoad(ins.src[0], srcMask);
+
+    DxbcRegisterValue result;
+    result.type.ctype  = ins.dst[0].dataType;
+    result.type.ccount = val.type.ccount;
+    result.id = m_module.opFConvert(
+      getVectorTypeId(result.type), val.id);
+    
+    emitRegisterStore(ins.dst[0], result);
+  }
+  
+  
   void DxbcCompiler::emitHullShaderInstCnt(const DxbcShaderInstruction& ins) {
     this->getCurrentHsForkJoinPhase()->instanceCount = ins.imm[0].u32;
   }
@@ -3824,13 +3854,18 @@ namespace dxvk {
   DxbcRegisterValue DxbcCompiler::emitRegisterBitcast(
           DxbcRegisterValue       srcValue,
           DxbcScalarType          dstType) {
-    if (srcValue.type.ctype == dstType)
+    DxbcScalarType srcType = srcValue.type.ctype;
+
+    if (srcType == dstType)
       return srcValue;
     
-    // TODO support 64-bit values
     DxbcRegisterValue result;
     result.type.ctype  = dstType;
     result.type.ccount = srcValue.type.ccount;
+
+    if (isDoubleType(srcType)) result.type.ccount *= 2;
+    if (isDoubleType(dstType)) result.type.ccount /= 2;
+
     result.id = m_module.opBitcast(
       getVectorTypeId(result.type),
       srcValue.id);
@@ -6473,6 +6508,13 @@ namespace dxvk {
   }
   
   
+  bool DxbcCompiler::isDoubleType(DxbcScalarType type) const {
+    return type == DxbcScalarType::Sint64
+        || type == DxbcScalarType::Uint64
+        || type == DxbcScalarType::Float64;
+  }
+
+
   uint32_t DxbcCompiler::getScalarTypeId(DxbcScalarType type) {
     switch (type) {
       case DxbcScalarType::Uint32:  return m_module.defIntType(32, 0);

src/dxbc/dxbc_compiler.h

@@ -644,6 +644,9 @@ namespace dxvk {
     void emitConvertFloat16(
       const DxbcShaderInstruction&  ins);
     
+    void emitConvertFloat64(
+      const DxbcShaderInstruction&  ins);
+    
     void emitHullShaderPhase(
       const DxbcShaderInstruction&  ins);
     
@@ -1100,6 +1103,9 @@ namespace dxvk {
     spv::ImageFormat getScalarImageFormat(
             DxbcScalarType type) const;
     
+    bool isDoubleType(
+            DxbcScalarType type) const;
+    
     ///////////////////////////
     // Type definition methods
     uint32_t getScalarTypeId(

src/dxbc/dxbc_defs.cpp

@@ -978,9 +978,15 @@ namespace dxvk {
     /* DMovc                                */
     { },
     /* DtoF                                 */
-    { },
+    { 2, DxbcInstClass::ConvertFloat64, {
+      { DxbcOperandKind::DstReg, DxbcScalarType::Float32 },
+      { DxbcOperandKind::SrcReg, DxbcScalarType::Float64 },
+    } },
     /* FtoD                                 */
-    { },
+    { 2, DxbcInstClass::ConvertFloat64, {
+      { DxbcOperandKind::DstReg, DxbcScalarType::Float64 },
+      { DxbcOperandKind::SrcReg, DxbcScalarType::Float32 },
+    } },
     /* EvalSnapped                          */
     { 3, DxbcInstClass::Interpolate, {
       { DxbcOperandKind::DstReg, DxbcScalarType::Float32 },

src/dxbc/dxbc_defs.h

@@ -42,6 +42,7 @@ namespace dxvk {
     BufferLoad,         ///< Structured or raw buffer load
     BufferStore,        ///< Structured or raw buffer store
     ConvertFloat16,     ///< 16-bit float packing/unpacking
+    ConvertFloat64,     ///< 64-bit float conversion
     HullShaderPhase,    ///< Hull shader phase declaration
     HullShaderInstCnt,  ///< Hull shader phase instance count
     Interpolate,        ///< Input attribute interpolation