lucidiot
/
AssetStudio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SharpDX

This commit is contained in:
Perfare 2019-01-24 01:03:45 +08:00
parent fa91820016
commit 9e76d94eea
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
AssetStudio/Libraries/SharpDX.D3DCompiler.dll
View File

Binary file not shown.

BIN
AssetStudio/Libraries/SharpDX.dll
View File

Binary file not shown.

7
AssetStudioUtility/AssetStudioUtility.csproj
View File

@ -52,13 +52,6 @@
<Reference Include="dnlib">
<HintPath>..\AssetStudio\Libraries\dnlib.dll</HintPath>
</Reference>
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\AssetStudio\Libraries\SharpDX.dll</HintPath>
</Reference>
<Reference Include="SharpDX.D3DCompiler">
<HintPath>..\AssetStudio\Libraries\SharpDX.D3DCompiler.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />

13
AssetStudioUtility/ShaderConverter.cs
View File

@ -4,7 +4,6 @@ using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using Lz4;
using SharpDX.D3DCompiler;
namespace AssetStudio
{
@ -591,7 +590,7 @@ namespace AssetStudio
// 201608170 - Unity 5.5
// 201609010 - Unity 5.6, 2017.1 & 2017.2
// 201708220 - Unity 2017.3, Unity 2017.4 & Unity 2018.1
// 201802150 - Unity 2018.2
// 201802150 - Unity 2018.2 & Unity 2018.3
magic = reader.ReadInt32();
m_ProgramType = (ShaderGpuProgramType)reader.ReadInt32();
reader.BaseStream.Position += 12;
@ -644,8 +643,9 @@ namespace AssetStudio
case ShaderGpuProgramType.kShaderGpuProgramDX9PixelSM20:
case ShaderGpuProgramType.kShaderGpuProgramDX9PixelSM30:
{
var shaderBytecode = new ShaderBytecode(m_ProgramCode);
sb.Append(shaderBytecode.Disassemble());
/*var shaderBytecode = new ShaderBytecode(m_ProgramCode);
sb.Append(shaderBytecode.Disassemble());*/
sb.Append("// shader disassembly not supported on DXBC");
break;
}
case ShaderGpuProgramType.kShaderGpuProgramDX10Level9Vertex:
@ -666,8 +666,9 @@ namespace AssetStudio
}
var buff = new byte[m_ProgramCode.Length - start];
Buffer.BlockCopy(m_ProgramCode, start, buff, 0, buff.Length);
var shaderBytecode = new ShaderBytecode(buff);
sb.Append(shaderBytecode.Disassemble());
/*var shaderBytecode = new ShaderBytecode(buff);
sb.Append(shaderBytecode.Disassemble());*/
sb.Append("// shader disassembly not supported on DXBC");
break;
}
case ShaderGpuProgramType.kShaderGpuProgramMetalVS: