swr/rast: Add debugging type support for function types.

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index a3bda616f956cb6fee02fd3397f00c380eb63e92..b0f9d2f645643fe7afd4ba498256b15d91dc0abe 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -254,11 +254,31 @@ DIType* JitManager::GetDebugType(Type* pTy)
     case Type::ArrayTyID: return GetDebugArrayType(pTy); break;
     case Type::PointerTyID: return builder.createPointerType(GetDebugType(pTy->getPointerElementType()), 64, 64); break;
     case Type::VectorTyID: return GetDebugVectorType(pTy); break;
+    case Type::FunctionTyID: return GetDebugFunctionType(pTy); break;
     default: SWR_ASSERT(false, "Unimplemented llvm type");
     }
     return nullptr;
 }
 
+// Create a DISubroutineType from an llvm FunctionType
+DIType* JitManager::GetDebugFunctionType(Type* pTy)
+{
+    SmallVector<Metadata*, 8> ElemTypes;
+    FunctionType* pFuncTy = cast<FunctionType>(pTy);
+    DIBuilder builder(*mpCurrentModule);
+
+    // Add result type
+    ElemTypes.push_back(GetDebugType(pFuncTy->getReturnType()));
+
+    // Add arguments
+    for (auto& param : pFuncTy->params())
+    {
+        ElemTypes.push_back(GetDebugType(param));
+    }
+
+    return builder.createSubroutineType(builder.getOrCreateTypeArray(ElemTypes));
+}
+
 DIType* JitManager::GetDebugIntegerType(Type* pTy)
 {
     DIBuilder builder(*mpCurrentModule);

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h
index fb20a36625d4a2b4bfe12f77f4ad84c4eb1ce1d4..50b9d829047b90cd64d6a5370d2d90ceda921c80 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h
@@ -175,6 +175,7 @@ struct JitManager
     llvm::DIType* GetDebugIntegerType(llvm::Type* pTy);
     llvm::DIType* GetDebugArrayType(llvm::Type* pTy);
     llvm::DIType* GetDebugVectorType(llvm::Type* pTy);
+    llvm::DIType* GetDebugFunctionType(llvm::Type* pTy);
 
     llvm::DIType* GetDebugStructType(llvm::Type* pType)
     {