Replace FormatElement with ShaderConstant/ShaderVariableType

* FormatElement is now a static BufferFormatter class to help generate and parse
  buffer formatting strings

Author: baldurk

qrenderdoc/Code/FormatElement.cpp renamed to qrenderdoc/Code/BufferFormatter.cpp

@@ -736,6 +736,8 @@ void CaptureContext::LoadCapture(const rdcstr &captureFile, const ReplayOptions
   {
     m_CaptureTemporary = temporary;
 
+    BufferFormatter::Init(m_APIProps.pipelineType);
+
     m_CaptureMods = CaptureModifications::NoModifications;
 
     rdcarray<ICaptureViewer *> viewers(m_CaptureViewers);

qrenderdoc/Code/CaptureContext.cpp

@@ -2191,4 +2191,4 @@ void *AccessWaylandPlatformInterface(const QByteArray &resource, QWindow *window
 {
   QPlatformNativeInterface *native = QGuiApplication::platformNativeInterface();
   return native->nativeResourceForWindow(resource, window);
-}
+}

qrenderdoc/Code/QRDUtils.cpp

@@ -74,33 +74,37 @@ inline QMetaType::Type GetVariantMetatype(const QVariant &v)
   return (QMetaType::Type)v.type();
 }
 
-struct FormatElement
+struct BufferFormatter
 {
-  Q_DECLARE_TR_FUNCTIONS(FormatElement);
+  Q_DECLARE_TR_FUNCTIONS(BufferFormatter);
 
-public:
-  FormatElement();
-  FormatElement(const QString &Name, uint offs, bool rowMat, uint matDim, ResourceFormat f,
-                bool hexDisplay, bool rgbDisplay);
+  static GraphicsAPI m_API;
 
-  static QList<FormatElement> ParseFormatString(const QString &formatString, uint64_t maxLen,
-                                                bool tightPacking, QString &errors);
+  static QString DeclareStruct(QList<QString> &declaredStructs, const QString &name,
+                               const rdcarray<ShaderConstant> &members, uint32_t requiredByteStride);
 
-  static QString GenerateTextureBufferFormat(const TextureDescription &tex);
+public:
+  BufferFormatter() = default;
 
-  ShaderVariable GetShaderVar(const byte *&data, const byte *end) const;
+  static void Init(GraphicsAPI api) { m_API = api; }
+  static ShaderConstant ParseFormatString(const QString &formatString, uint64_t maxLen,
+                                          bool tightPacking, QString &errors);
 
-  QString name;
-  ResourceFormat format;
-  uint32_t offset;
-  uint32_t matrixdim;
-  bool rowmajor;
+  static QString GetTextureFormatString(const TextureDescription &tex);
+  static QString GetBufferFormatString(const ShaderResource &res, const ResourceFormat &viewFormat,
+                                       uint64_t &baseByteOffset);
 
-  bool hex, rgb;
+  static QString DeclareStruct(const QString &name, const rdcarray<ShaderConstant> &members,
+                               uint32_t requiredByteStride);
+  static QString DeclarePaddingBytes(uint32_t bytes);
 };
 
-QVariantList GetVariants(ResourceFormat rowFormat, uint32_t rowCount, const byte *&data,
-                         const byte *end);
+QVariantList GetVariants(ResourceFormat rowFormat, uint32_t rowCount, uint32_t rowByteStride,
+                         const byte *&data, const byte *end);
+ResourceFormat GetInterpretedResourceFormat(const ShaderConstant &elem);
+void SetInterpretedResourceFormat(ShaderConstant &elem, ResourceFormatType interpretType,
+                                  CompType interpretCompType);
+ShaderVariable InterpretShaderVar(const ShaderConstant &elem, const byte *data, const byte *end);
 
 QString TypeString(const ShaderVariable &v);
 QString RowString(const ShaderVariable &v, uint32_t row, VarType type = VarType::Unknown);