RD DXIL Disassembly fix getival to work with Literal

Inlined getival to get around template instantiation outside of the compilation unit
Zorro666 · May 16, 2024 · d43e97b · d43e97b
1 parent d2ba223
commit d43e97b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/renderdoc/driver/shaders/dxil/dxil_bytecode.h b/renderdoc/driver/shaders/dxil/dxil_bytecode.h
@@ -1662,7 +1662,21 @@ rdcstr escapeString(const rdcstr &str);
 rdcstr escapeStringIfNeeded(const rdcstr &name);
 
 template <typename T>
-bool getival(const Value *v, T &out);
+bool getival(const Value *v, T &out)
+{
+  if(const Constant *c = cast<Constant>(v))
+  {
+    out = T(c->getU64());
+    return true;
+  }
+  else if(const Literal *lit = cast<Literal>(v))
+  {
+    out = T(lit->literal);
+    return true;
+  }
+  out = T();
+  return false;
+}
 
 };    // namespace DXIL
 

diff --git a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
@@ -82,23 +82,6 @@ bool isUndef(const Value *v)
   return false;
 }
 
-template <typename T>
-bool getival(const Value *v, T &out)
-{
-  if(const Constant *c = cast<Constant>(v))
-  {
-    out = T(c->getU64());
-    return true;
-  }
-  else if(const Literal *lit = cast<Literal>(v))
-  {
-    out = T(c->getU64());
-    return true;
-  }
-  out = T();
-  return false;
-}
-
 static const char *shaderNames[] = {
     "Pixel",      "Vertex",  "Geometry",      "Hull",         "Domain",
     "Compute",    "Library", "RayGeneration", "Intersection", "AnyHit",