make displayAsHex a real member of ShaderVariable, for use in qrenderdoc

This commit is contained in:
baldurk
2016-11-25 14:15:56 +01:00
parent ddd6eac703
commit 2f14e2ac70
2 changed files with 7 additions and 6 deletions
+6 -4
View File
@@ -38,7 +38,7 @@ struct ShaderVariable
{
name = "";
rows = columns = 0;
isStruct = false;
displayAsHex = isStruct = false;
type = eVar_Float;
for(int i = 0; i < 16; i++)
value.uv[i] = 0;
@@ -48,7 +48,7 @@ struct ShaderVariable
name = n;
rows = 1;
columns = 4;
isStruct = false;
displayAsHex = isStruct = false;
for(int i = 0; i < 16; i++)
value.uv[i] = 0;
type = eVar_Float;
@@ -62,7 +62,7 @@ struct ShaderVariable
name = n;
rows = 1;
columns = 4;
isStruct = false;
displayAsHex = isStruct = false;
for(int i = 0; i < 16; i++)
value.uv[i] = 0;
type = eVar_Int;
@@ -76,7 +76,7 @@ struct ShaderVariable
name = n;
rows = 1;
columns = 4;
isStruct = false;
displayAsHex = isStruct = false;
for(int i = 0; i < 16; i++)
value.uv[i] = 0;
type = eVar_UInt;
@@ -91,6 +91,8 @@ struct ShaderVariable
VarType type;
bool32 displayAsHex;
union
{
struct
+1 -2
View File
@@ -38,8 +38,7 @@ namespace renderdoc
public VarType type;
[CustomMarshalAs(CustomUnmanagedType.Skip)]
public bool displayAsHex = false;
public bool displayAsHex;
[StructLayout(LayoutKind.Sequential)]
public struct ValueUnion