Skip to content

Commit 1237f8a

Browse files
author
Tim Jones
committedApr 27, 2013
Remove VirtualMachine for now
1 parent cd75103 commit 1237f8a

File tree

7 files changed

+20
-233
lines changed

7 files changed

+20
-233
lines changed
 

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
src/Tests/[Dd]ebug*/
1212
src/Tests/[Rr]elease/
13-
Library/[Dd]ebug*/
14-
Library/[Rr]elease/
13+
src/SDK/Library/[Dd]ebug*/
14+
src/SDK/Library/[Rr]elease/
1515

1616
build/
1717

‎src/SDK/Include/ComponentMask.h

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#pragma once
2+
13
#include "PCH.h"
24

35
namespace SlimShader

‎src/SDK/Include/Number.h

+16-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ namespace SlimShader
99
/// <summary>
1010
/// Represents an int, float or uint.
1111
/// </summary>
12-
struct Number
12+
class Number
1313
{
1414
public :
1515
static Number Parse(BytecodeReader& reader, NumberType type);
16-
17-
Number(uint8_t rawBytes[4], NumberType type);
18-
Number() { }
16+
static Number FromRawBytes(uint8_t rawBytes[4], NumberType type);
17+
static Number FromFloat(float value);
1918

2019
NumberType GetType() const;
2120

@@ -36,4 +35,17 @@ namespace SlimShader
3635
float f;
3736
} _value;
3837
};
38+
39+
/// <summary>
40+
/// Represents four Numbers, or two doubles.
41+
/// </summary>
42+
union Number4
43+
{
44+
public :
45+
static Number4 FromRawBytes(uint8_t rawBytes[16]);
46+
47+
uint8_t RawBytes[16];
48+
Number Numbers[4];
49+
double Doubles[2];
50+
};
3951
};

‎src/Source/SlimShader.vcxproj

-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ copy Util\*.h ..\SDK\Include</Command>
209209
<ClInclude Include="Util\BytecodeReader.h" />
210210
<ClInclude Include="Util\Decoder.h" />
211211
<ClInclude Include="Util\PCH.h" />
212-
<ClInclude Include="VirtualMachine\VirtualMachine.h" />
213212
</ItemGroup>
214213
<ItemGroup>
215214
<ClCompile Include="Chunks\Common\ComponentMask.cpp" />
@@ -311,7 +310,6 @@ copy Util\*.h ..\SDK\Include</Command>
311310
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
312311
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
313312
</ClCompile>
314-
<ClCompile Include="VirtualMachine\VirtualMachine.cpp" />
315313
</ItemGroup>
316314
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
317315
<ImportGroup Label="ExtensionTargets">

‎src/Source/SlimShader.vcxproj.filters

-2
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@
182182
<ClInclude Include="Chunks\Shex\Tokens\TessellatorPartitioningDeclarationToken.h" />
183183
<ClInclude Include="Chunks\Shex\Tokens\ThreadGroupDeclarationToken.h" />
184184
<ClInclude Include="Chunks\Shex\Tokens\TypedUnorderedAccessViewDeclarationToken.h" />
185-
<ClInclude Include="VirtualMachine\VirtualMachine.h" />
186185
</ItemGroup>
187186
<ItemGroup>
188187
<ClCompile Include="Chunks\DxbcChunk.cpp">
@@ -289,6 +288,5 @@
289288
<ClCompile Include="Chunks\Shex\Tokens\TessellatorPartitioningDeclarationToken.cpp" />
290289
<ClCompile Include="Chunks\Shex\Tokens\ThreadGroupDeclarationToken.cpp" />
291290
<ClCompile Include="Chunks\Shex\Tokens\TypedUnorderedAccessViewDeclarationToken.cpp" />
292-
<ClCompile Include="VirtualMachine\VirtualMachine.cpp" />
293291
</ItemGroup>
294292
</Project>

‎src/Source/VirtualMachine/VirtualMachine.cpp

-164
This file was deleted.

‎src/Source/VirtualMachine/VirtualMachine.h

-59
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.