rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-04-04 19:25:19 +02:00
Code Issues Projects Releases Wiki Activity

[d3d8/9] Use shader version macros where applicable

Browse Source
This commit is contained in:
WinterSnowfall 2025-01-28 12:39:28 +02:00 committed by Robin Kertels
parent e3f1d4c021
commit bd69d1efdc
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/d3d8/d3d8_device.cpp
View File

@ -1788,8 +1788,8 @@ namespace dxvk {
// Validate VS version for non-FF shaders
if (pFunction != nullptr) {
const uint32_t majorVersion = (pFunction[0] >> 8) & 0xff;
const uint32_t minorVersion = pFunction[0] & 0xff;
const uint32_t majorVersion = D3DSHADER_VERSION_MAJOR(pFunction[0]);
const uint32_t minorVersion = D3DSHADER_VERSION_MINOR(pFunction[0]);
if (unlikely(majorVersion != 1 || minorVersion > 1)) {
Logger::err(str::format("D3D8Device::CreateVertexShader: Unsupported VS version ", majorVersion, ".", minorVersion));
@ -2027,8 +2027,8 @@ namespace dxvk {
if (unlikely(pFunction == nullptr || pHandle == nullptr))
return D3DERR_INVALIDCALL;
const uint32_t majorVersion = (pFunction[0] >> 8) & 0xff;
const uint32_t minorVersion = pFunction[0] & 0xff;
const uint32_t majorVersion = D3DSHADER_VERSION_MAJOR(pFunction[0]);
const uint32_t minorVersion = D3DSHADER_VERSION_MINOR(pFunction[0]);
if (unlikely(m_isFixedFunctionOnly || majorVersion != 1 || minorVersion > 4)) {
Logger::err(str::format("D3D8Device::CreatePixelShader: Unsupported PS version ", majorVersion, ".", minorVersion));

8
src/d3d8/d3d8_main.cpp
View File

@ -26,8 +26,8 @@ extern "C" {
if (unlikely(pPixelShader == nullptr)) {
errorMessage = "D3D8: ValidatePixelShader: Null pPixelShader";
} else {
const uint32_t majorVersion = (pPixelShader[0] >> 8) & 0xff;
const uint32_t minorVersion = pPixelShader[0] & 0xff;
const uint32_t majorVersion = D3DSHADER_VERSION_MAJOR(pPixelShader[0]);
const uint32_t minorVersion = D3DSHADER_VERSION_MINOR(pPixelShader[0]);
if (unlikely(majorVersion != 1 || minorVersion > 4)) {
errorMessage = dxvk::str::format("D3D8: ValidatePixelShader: Unsupported PS version ",
@ -69,8 +69,8 @@ extern "C" {
if (unlikely(pVertexShader == nullptr)) {
errorMessage = "D3D8: ValidateVertexShader: Null pVertexShader";
} else {
const uint32_t majorVersion = (pVertexShader[0] >> 8) & 0xff;
const uint32_t minorVersion = pVertexShader[0] & 0xff;
const uint32_t majorVersion = D3DSHADER_VERSION_MAJOR(pVertexShader[0]);
const uint32_t minorVersion = D3DSHADER_VERSION_MINOR(pVertexShader[0]);
if (unlikely(majorVersion != 1 || minorVersion > 1)) {
errorMessage = dxvk::str::format("D3D8: ValidateVertexShader: Unsupported VS version ",

8
src/d3d9/d3d9_device.cpp
View File

@ -3314,8 +3314,8 @@ namespace dxvk {
if (unlikely(ppShader == nullptr))
return D3DERR_INVALIDCALL;
const uint32_t majorVersion = (pFunction[0] >> 8) & 0xff;
const uint32_t minorVersion = pFunction[0] & 0xff;
const uint32_t majorVersion = D3DSHADER_VERSION_MAJOR(pFunction[0]);
const uint32_t minorVersion = D3DSHADER_VERSION_MINOR(pFunction[0]);
// Late fixed-function capable hardware exposed support for VS 1.1
const uint32_t shaderModelVS = m_d3d9Options.shaderModel == 0 ? 1 : m_d3d9Options.shaderModel;
@ -3692,8 +3692,8 @@ namespace dxvk {
if (unlikely(ppShader == nullptr))
return D3DERR_INVALIDCALL;
const uint32_t majorVersion = (pFunction[0] >> 8) & 0xff;
const uint32_t minorVersion = pFunction[0] & 0xff;
const uint32_t majorVersion = D3DSHADER_VERSION_MAJOR(pFunction[0]);
const uint32_t minorVersion = D3DSHADER_VERSION_MINOR(pFunction[0]);
if (unlikely(majorVersion > m_d3d9Options.shaderModel
|| (majorVersion == 1 && minorVersion > 4)

4
src/d3d9/d3d9_shader_validator.cpp
View File

@ -156,8 +156,8 @@ namespace dxvk {
"IDirect3DShaderValidator9::Instruction: Bad version token. It indicates neither a pixel shader nor a vertex shader.");
}
m_majorVersion = (headerToken >> 8) & 0xff;
m_minorVersion = headerToken & 0xff;
m_majorVersion = D3DSHADER_VERSION_MAJOR(headerToken);
m_minorVersion = D3DSHADER_VERSION_MINOR(headerToken);
m_ctx = std::make_unique<DxsoDecodeContext>(DxsoProgramInfo{ programType, m_minorVersion, m_majorVersion });
m_state = D3D9ShaderValidatorState::ValidatingInstructions;