lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-23 15:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support doubles in shader vars natively, not packed in 2*uint32 each

Browse Source
This commit is contained in:
baldurk
2014-12-02 00:16:12 +00:00
parent 2cdb6c6ccf
commit 52476118de
8 changed files with 52 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Code/FormatElement.cs
+1 -1
View File
@@ -280,7 +280,7 @@ namespace renderdocui.Code
ret.value.fv = new float[16];
ret.value.uv = new uint[16];
ret.value.iv = new int[16];
ret.value._dv_arr = new double[16];
ret.value.dv = new double[16];
for (uint row = 0; row < ret.rows; row++)
{
renderdocui/Interop/CustomMarshaling.cs
+7
View File
@@ -55,6 +55,7 @@ namespace renderdoc
UInt32,
Int32,
UInt16,
Double,
}
// custom attribute that we can apply to structures we want to serialise
@@ -502,6 +503,12 @@ namespace renderdoc
Marshal.Copy(fieldPtr, val, 0, cma.FixedLength);
field.SetValue(ret, val);
}
else if (cma.FixedType == CustomFixedType.Double)
{
double[] val = new double[cma.FixedLength];
Marshal.Copy(fieldPtr, val, 0, cma.FixedLength);
field.SetValue(ret, val);
}
else if (cma.FixedType == CustomFixedType.UInt32)
{
Int32[] val = new Int32[cma.FixedLength];
renderdocui/Interop/Shader.cs
+8 -31
View File
@@ -49,33 +49,8 @@ namespace renderdoc
[CustomMarshalAs(CustomUnmanagedType.FixedArray, FixedLength = 16, FixedType = CustomFixedType.Int32)]
public Int32[] iv;
[CustomMarshalAs(CustomUnmanagedType.Skip)]
public double[] _dv_arr;
public double[] dv
{
get
{
if (_dv_arr == null)
{
UInt64[] ds = { 0, 0 };
ds[0] = uv[1];
ds[1] = uv[3];
ds[0] <<= 32;
ds[1] <<= 32;
ds[0] |= uv[0];
ds[1] |= uv[2];
_dv_arr = new double[2];
_dv_arr[0] = BitConverter.Int64BitsToDouble(unchecked((long)ds[0]));
_dv_arr[1] = BitConverter.Int64BitsToDouble(unchecked((long)ds[1]));
}
return _dv_arr;
}
}
[CustomMarshalAs(CustomUnmanagedType.FixedArray, FixedLength = 16, FixedType = CustomFixedType.Double)]
public double[] dv;
};
[CustomMarshalAs(CustomUnmanagedType.Union)]
@@ -136,10 +111,12 @@ namespace renderdoc
else return String.Format("{0}{1}x{2}", type.Str(), rows, columns);
}
public string RowValuesToString(int cols, double x, double y)
{
public string RowValuesToString(int cols, double x, double y, double z, double w)
{
if (cols == 1) return Formatter.Format(x);
else return Formatter.Format(x) + ", " + Formatter.Format(y);
else if (cols == 2) return Formatter.Format(x) + ", " + Formatter.Format(y);
else if (cols == 3) return Formatter.Format(x) + ", " + Formatter.Format(y) + ", " + Formatter.Format(z);
else return Formatter.Format(x) + ", " + Formatter.Format(y) + ", " + Formatter.Format(z) + ", " + Formatter.Format(w);
}
public string RowValuesToString(int cols, float x, float y, float z, float w)
@@ -169,7 +146,7 @@ namespace renderdoc
public string Row(int row, VarType t)
{
if(t == VarType.Double)
return RowValuesToString((int)columns, value.dv[row * columns + 0], value.dv[row * columns + 1]);
return RowValuesToString((int)columns, value.dv[row * columns + 0], value.dv[row * columns + 1], value.dv[row * columns + 2], value.dv[row * columns + 3]);
else if(t == VarType.Int)
return RowValuesToString((int)columns, value.iv[row * columns + 0], value.iv[row * columns + 1], value.iv[row * columns + 2], value.iv[row * columns + 3]);
else if(t == VarType.UInt)
renderdocui/Windows/Dialogs/ConstantBufferPreviewer.cs
+1 -1
View File
@@ -310,7 +310,7 @@ namespace renderdocui.Controls
ret[i].value.fv = new float[16];
ret[i].value.uv = new uint[16];
ret[i].value.iv = new int[16];
ret[i].value._dv_arr = new double[16];
ret[i].value.dv = new double[16];
}
}