fna-workbench Commit Details

Date:

2016-02-08 22:39:09 (9 years 9 months ago)

Author:

Ethan Lee

Branch:

master

Commit:

d4341206a8bc290dd8a8798654e2afcfa523f14e

Parents:

494bfbb7312583688a8d809570008c5fa9971ee8

Message:

Fix StructureMembers enumeration

Changes:

File differences

-1066
1067 1067
1068 1068
1069 
1069
1070 1070
1071 1071
1072 1072
1073 
1074 1073
1075 
1074
1076 1075
1077 
1078 
1079 
1076
1077
1078
1080 1079
1081 1080
1082 1081
1083 1082
1084 1083
1085 1084
1086 
1087 
1085
1086
1088 1087
1089 
1088
1090 1089
1091 1090
1092 1091
+␉␉␉␉␉List<EffectParameter> memList = new List<EffectParameter>();␊
␉␉␉␉␉unsafe␊
␉␉␉␉␉{␊
␉␉␉␉␉␉MojoShader.MOJOSHADER_symbolStructMember* mem;␊
␉␉␉␉␉␉MojoShader.MOJOSHADER_symbolStructMember* mem = (MojoShader.MOJOSHADER_symbolStructMember*) param.value.type.members;␊
␉␉␉␉␉␉IntPtr curOffset = IntPtr.Zero;␊
␉␉␉␉␉␉for (int j = 0; j < param.value.type.member_count; j += 1)␊
␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉mem = (MojoShader.MOJOSHADER_symbolStructMember*) param.value.type.members;␊
␉␉␉␉␉␉␉memList.Add(new EffectParameter(␊
␉␉␉␉␉␉␉␉Marshal.PtrToStringAnsi(mem->name),␊
␉␉␉␉␉␉␉␉Marshal.PtrToStringAnsi(mem[j].name),␊
␉␉␉␉␉␉␉␉null,␊
␉␉␉␉␉␉␉␉(int) mem->info.rows,␊
␉␉␉␉␉␉␉␉(int) mem->info.columns,␊
␉␉␉␉␉␉␉␉(int) mem->info.elements,␊
␉␉␉␉␉␉␉␉(int) mem[j].info.rows,␊
␉␉␉␉␉␉␉␉(int) mem[j].info.columns,␊
␉␉␉␉␉␉␉␉(int) mem[j].info.elements,␊
␉␉␉␉␉␉␉␉XNAClass[(int) param.value.type.parameter_class],␊
␉␉␉␉␉␉␉␉XNAType[(int) param.value.type.parameter_type],␊
␉␉␉␉␉␉␉␉null, // FIXME: Nested structs! -flibit␊
␉␉␉␉␉␉␉␉null,␊
␉␉␉␉␉␉␉␉curOffset␊
␉␉␉␉␉␉␉));␊
␉␉␉␉␉␉␉uint memSize = mem->info.rows + mem->info.columns;␊
␉␉␉␉␉␉␉if (mem->info.elements > 0)␊
␉␉␉␉␉␉␉uint memSize = mem[j].info.rows + mem[j].info.columns;␊
␉␉␉␉␉␉␉if (mem[j].info.elements > 0)␊
␉␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉␉memSize *= mem->info.elements;␊
␉␉␉␉␉␉␉␉memSize *= mem[j].info.elements;␊
␉␉␉␉␉␉␉}␊
␉␉␉␉␉␉␉curOffset += (int) memSize * 4;␊
␉␉␉␉␉␉}␊
 ␉␉␉␉␉List<EffectParameter> memList = new List<EffectParameter>();␊
 ␉␉␉␉␉unsafe␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉MojoShader.MOJOSHADER_symbolStructMember* mem;␊
+␉␉␉␉␉␉MojoShader.MOJOSHADER_symbolStructMember* mem = (MojoShader.MOJOSHADER_symbolStructMember*) param.value.type.members;␊
 ␉␉␉␉␉␉IntPtr curOffset = IntPtr.Zero;␊
 ␉␉␉␉␉␉for (int j = 0; j < param.value.type.member_count; j += 1)␊
 ␉␉␉␉␉␉{␊
-␉␉␉␉␉␉␉mem = (MojoShader.MOJOSHADER_symbolStructMember*) param.value.type.members;␊
 ␉␉␉␉␉␉␉memList.Add(new EffectParameter(␊
-␉␉␉␉␉␉␉␉Marshal.PtrToStringAnsi(mem->name),␊
+␉␉␉␉␉␉␉␉Marshal.PtrToStringAnsi(mem[j].name),␊
 ␉␉␉␉␉␉␉␉null,␊
-␉␉␉␉␉␉␉␉(int) mem->info.rows,␊
-␉␉␉␉␉␉␉␉(int) mem->info.columns,␊
-␉␉␉␉␉␉␉␉(int) mem->info.elements,␊
+␉␉␉␉␉␉␉␉(int) mem[j].info.rows,␊
+␉␉␉␉␉␉␉␉(int) mem[j].info.columns,␊
+␉␉␉␉␉␉␉␉(int) mem[j].info.elements,␊
 ␉␉␉␉␉␉␉␉XNAClass[(int) param.value.type.parameter_class],␊
 ␉␉␉␉␉␉␉␉XNAType[(int) param.value.type.parameter_type],␊
 ␉␉␉␉␉␉␉␉null, // FIXME: Nested structs! -flibit␊
 ␉␉␉␉␉␉␉␉null,␊
 ␉␉␉␉␉␉␉␉curOffset␊
 ␉␉␉␉␉␉␉));␊
-␉␉␉␉␉␉␉uint memSize = mem->info.rows + mem->info.columns;␊
-␉␉␉␉␉␉␉if (mem->info.elements > 0)␊
+␉␉␉␉␉␉␉uint memSize = mem[j].info.rows + mem[j].info.columns;␊
+␉␉␉␉␉␉␉if (mem[j].info.elements > 0)␊
 ␉␉␉␉␉␉␉{␊
-␉␉␉␉␉␉␉␉memSize *= mem->info.elements;␊
+␉␉␉␉␉␉␉␉memSize *= mem[j].info.elements;␊
 ␉␉␉␉␉␉␉}␊
 ␉␉␉␉␉␉␉curOffset += (int) memSize * 4;␊
 ␉␉␉␉␉␉}␊

-107
108 108
109 109
110
110 111
111 112
112 113
... ...
114 115
115 116
116 117
117 
118 118
119 119
120 120
... ...
132 132
133 133
134 134
135 
135
136 136
137 137
138 138
139 139
140 140
141 141
142 
142
143 143
144 144
145 145
+␉␉␉ColumnCount = columnCount;␊
␉␉␉if (elementCount > 0)␊
␉␉␉{␊
␉␉␉␉int curOffset = 0;␊
␉␉␉␉List<EffectParameter> elements = new List<EffectParameter>(elementCount);␊
␉␉␉␉for (int i = 0; i < elementCount; i += 1)␊
␉␉␉␉{␊

␉␉␉␉␉if (structureMembers != null)␊
␉␉␉␉␉{␊
␉␉␉␉␉␉List<EffectParameter> memList = new List<EffectParameter>();␊
␉␉␉␉␉␉int curOffset = 0;␊
␉␉␉␉␉␉for (int j = 0; j < structureMembers.Count; j += 1)␊
␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉int memElems = 0;␊

␉␉␉␉␉␉␉␉structureMembers[j].ParameterType,␊
␉␉␉␉␉␉␉␉null, // FIXME: Nested structs! -flibit␊
␉␉␉␉␉␉␉␉structureMembers[j].Annotations,␊
␉␉␉␉␉␉␉␉new IntPtr(data.ToInt64() + (j * 4 * curOffset))␊
␉␉␉␉␉␉␉␉new IntPtr(data.ToInt64() + curOffset)␊
␉␉␉␉␉␉␉));␊
␉␉␉␉␉␉␉int memSize = structureMembers[j].RowCount * structureMembers[j].ColumnCount;␊
␉␉␉␉␉␉␉if (memElems > 0)␊
␉␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉␉memSize *= memElems;␊
␉␉␉␉␉␉␉}␊
␉␉␉␉␉␉␉curOffset += memSize;␊
␉␉␉␉␉␉␉curOffset += memSize * 4;␊
␉␉␉␉␉␉}␊
␉␉␉␉␉␉elementMembers = new EffectParameterCollection(memList);␊
␉␉␉␉␉}␊
 ...
 ...
 ␉␉␉ColumnCount = columnCount;␊
 ␉␉␉if (elementCount > 0)␊
 ␉␉␉{␊
+␉␉␉␉int curOffset = 0;␊
 ␉␉␉␉List<EffectParameter> elements = new List<EffectParameter>(elementCount);␊
 ␉␉␉␉for (int i = 0; i < elementCount; i += 1)␊
 ␉␉␉␉{␊
 ␉␉␉␉␉if (structureMembers != null)␊
 ␉␉␉␉␉{␊
 ␉␉␉␉␉␉List<EffectParameter> memList = new List<EffectParameter>();␊
-␉␉␉␉␉␉int curOffset = 0;␊
 ␉␉␉␉␉␉for (int j = 0; j < structureMembers.Count; j += 1)␊
 ␉␉␉␉␉␉{␊
 ␉␉␉␉␉␉␉int memElems = 0;␊
 ␉␉␉␉␉␉␉␉structureMembers[j].ParameterType,␊
 ␉␉␉␉␉␉␉␉null, // FIXME: Nested structs! -flibit␊
 ␉␉␉␉␉␉␉␉structureMembers[j].Annotations,␊
-␉␉␉␉␉␉␉␉new IntPtr(data.ToInt64() + (j * 4 * curOffset))␊
+␉␉␉␉␉␉␉␉new IntPtr(data.ToInt64() + curOffset)␊
 ␉␉␉␉␉␉␉));␊
 ␉␉␉␉␉␉␉int memSize = structureMembers[j].RowCount * structureMembers[j].ColumnCount;␊
 ␉␉␉␉␉␉␉if (memElems > 0)␊
 ␉␉␉␉␉␉␉{␊
 ␉␉␉␉␉␉␉␉memSize *= memElems;␊
 ␉␉␉␉␉␉␉}␊
-␉␉␉␉␉␉␉curOffset += memSize;␊
+␉␉␉␉␉␉␉curOffset += memSize * 4;␊
 ␉␉␉␉␉␉}␊
 ␉␉␉␉␉␉elementMembers = new EffectParameterCollection(memList);␊
 ␉␉␉␉␉}␊

Download the corresponding diff file

fna-workbench

File differences

Branches