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

improved console shader export

This commit is contained in:
Perfare 2018-12-17 23:12:24 +08:00
parent f8ffaa0400
commit fabfc77a52
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
AssetStudioUtility/ShaderConverter.cs
View File

@ -440,9 +440,9 @@ namespace AssetStudio
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX9PixelSM20
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX9PixelSM30;
case ShaderCompilerPlatform.kShaderCompPlatformXbox360:
throw new NotSupportedException();
return programType == ShaderGpuProgramType.kShaderGpuProgramConsole;
case ShaderCompilerPlatform.kShaderCompPlatformPS3:
throw new NotSupportedException();
return programType == ShaderGpuProgramType.kShaderGpuProgramConsole;
case ShaderCompilerPlatform.kShaderCompPlatformD3D11:
return programType == ShaderGpuProgramType.kShaderGpuProgramDX11VertexSM40
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX11VertexSM50
@ -454,9 +454,9 @@ namespace AssetStudio
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX11DomainSM50;
case ShaderCompilerPlatform.kShaderCompPlatformGLES20:
return programType == ShaderGpuProgramType.kShaderGpuProgramGLES;
case ShaderCompilerPlatform.kShaderCompPlatformNaCl:
case ShaderCompilerPlatform.kShaderCompPlatformNaCl: //Obsolete
throw new NotSupportedException();
case ShaderCompilerPlatform.kShaderCompPlatformFlash:
case ShaderCompilerPlatform.kShaderCompPlatformFlash: //Obsolete
throw new NotSupportedException();
case ShaderCompilerPlatform.kShaderCompPlatformD3D11_9x:
return programType == ShaderGpuProgramType.kShaderGpuProgramDX10Level9Vertex
@ -466,12 +466,12 @@ namespace AssetStudio
|| programType == ShaderGpuProgramType.kShaderGpuProgramGLES31
|| programType == ShaderGpuProgramType.kShaderGpuProgramGLES3;
case ShaderCompilerPlatform.kShaderCompPlatformPSP2:
throw new NotSupportedException();
return programType == ShaderGpuProgramType.kShaderGpuProgramConsole;
case ShaderCompilerPlatform.kShaderCompPlatformPS4:
throw new NotSupportedException();
return programType == ShaderGpuProgramType.kShaderGpuProgramConsole;
case ShaderCompilerPlatform.kShaderCompPlatformXboxOne:
throw new NotSupportedException();
case ShaderCompilerPlatform.kShaderCompPlatformPSM:
return programType == ShaderGpuProgramType.kShaderGpuProgramConsole;
case ShaderCompilerPlatform.kShaderCompPlatformPSM: //Unknown
throw new NotSupportedException();
case ShaderCompilerPlatform.kShaderCompPlatformMetal:
return programType == ShaderGpuProgramType.kShaderGpuProgramMetalVS
@ -481,15 +481,15 @@ namespace AssetStudio
|| programType == ShaderGpuProgramType.kShaderGpuProgramGLCore41
|| programType == ShaderGpuProgramType.kShaderGpuProgramGLCore43;
case ShaderCompilerPlatform.kShaderCompPlatformN3DS:
throw new NotSupportedException();
return programType == ShaderGpuProgramType.kShaderGpuProgramConsole;
case ShaderCompilerPlatform.kShaderCompPlatformWiiU:
throw new NotSupportedException();
return programType == ShaderGpuProgramType.kShaderGpuProgramConsole;
case ShaderCompilerPlatform.kShaderCompPlatformVulkan:
return programType == ShaderGpuProgramType.kShaderGpuProgramSPIRV;
case ShaderCompilerPlatform.kShaderCompPlatformSwitch:
throw new NotSupportedException();
return programType == ShaderGpuProgramType.kShaderGpuProgramConsole;
case ShaderCompilerPlatform.kShaderCompPlatformXboxOneD3D12:
throw new NotSupportedException();
return programType == ShaderGpuProgramType.kShaderGpuProgramConsole;
default:
throw new NotSupportedException();
}
@ -689,6 +689,9 @@ namespace AssetStudio
sb.Append("// shader disassembly not supported on SPIR-V\n");
sb.Append("// https://github.com/KhronosGroup/SPIRV-Cross");
break;
case ShaderGpuProgramType.kShaderGpuProgramConsole:
sb.Append(Encoding.UTF8.GetString(m_ProgramCode));
break;
default:
sb.Append($"//shader disassembly not supported on {m_ProgramType}");
break;