rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-02 10:24:12 +01:00
Code Issues Projects Releases Wiki Activity

[tests] Simplified dxbc disasm test

Browse Source 
* Avoid buggy wstring conversion
* Native `D3DReadFileToBlob()` and `D3DWriteBlobToFile()` used
* Extended to be able write to file directly
This commit is contained in:
pchome 2018-03-05 15:04:30 +02:00 committed by GitHub
parent 5f3bfde727
commit f6bcd7438d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/dxbc/test_dxbc_disasm.cpp
View File

@ -1,6 +1,4 @@
#include <cstring>
#include <fstream>
#include <vector>
#include <iostream>
#include <d3dcompiler.h>
@ -8,7 +6,7 @@
#include <windows.h>
#include <windowsx.h>
#include "../test_utils.h"
#include "../util/com/com_pointer.h"
using namespace dxvk;
@ -20,25 +18,23 @@ int WINAPI WinMain(HINSTANCE hInstance,
LPWSTR* argv = CommandLineToArgvW(
GetCommandLineW(), &argc);
if (argc < 2) {
std::cerr << "Usage: dxbc-disasm input.dxbc" << std::endl;
if (argc < 2 || argc > 3) {
std::cerr << "Usage: dxbc-disasm input.dxbc [output]" << std::endl;
return 1;
}
std::ifstream ifile(str::fromws(argv[1]), std::ios::binary);
ifile.ignore(std::numeric_limits<std::streamsize>::max());
std::streamsize length = ifile.gcount();
ifile.clear();
ifile.seekg(0, std::ios_base::beg);
std::vector<char> dxbcCode(length);
ifile.read(dxbcCode.data(), length);
Com<ID3DBlob> assembly;
Com<ID3DBlob> binary;
// input file
if (FAILED(D3DReadFileToBlob(argv[1], &binary))) {
std::cerr << "Failed to read shader" << std::endl;
return 1;
}
HRESULT hr = D3DDisassemble(
dxbcCode.data(),
dxbcCode.size(),
binary->GetBufferPointer(),
binary->GetBufferSize(),
D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING, nullptr,
&assembly);
@ -47,7 +43,17 @@ int WINAPI WinMain(HINSTANCE hInstance,
return 1;
}
// output file variant
if (argc == 3 && FAILED(D3DWriteBlobToFile(assembly.ptr(), argv[2], 1))) {
std::cerr << "Failed to write shader" << std::endl;
return 1;
}
// stdout variant
if (argc == 2) {
std::string data((const char *)assembly->GetBufferPointer(), assembly->GetBufferSize());
std::cout << data;
}
return 0;
}