From 67c31c650bbfd2de8a8a5ed26752b7e1d05cceec Mon Sep 17 00:00:00 2001 From: Silent Date: Sun, 15 Nov 2020 21:18:56 +0100 Subject: [PATCH] Const qualify a few parameters in XbVertexShader.cpp functions No functional change, just preventing future me from a typo I made. Const-qualifying those parameters would have prevented it. --- src/core/hle/D3D8/XbVertexShader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/hle/D3D8/XbVertexShader.cpp b/src/core/hle/D3D8/XbVertexShader.cpp index 11976f75d..f8d54d697 100644 --- a/src/core/hle/D3D8/XbVertexShader.cpp +++ b/src/core/hle/D3D8/XbVertexShader.cpp @@ -289,7 +289,7 @@ xbox::X_D3DVertexShader* GetXboxVertexShader() return pXboxVertexShader; } -static bool UseXboxD3DVertexShaderTypeForVersion3948(xbox::X_D3DVertexShader* pXboxVertexShader) +static bool UseXboxD3DVertexShaderTypeForVersion3948(const xbox::X_D3DVertexShader* pXboxVertexShader) { // Don't check XDK version for our internal FVF vertex shader // because g_Xbox_VertexShader_ForFVF is an internal variable @@ -304,7 +304,7 @@ static bool UseXboxD3DVertexShaderTypeForVersion3948(xbox::X_D3DVertexShader* pX static xbox::X_VERTEXATTRIBUTEFORMAT* CxbxGetVertexShaderAttributes(xbox::X_D3DVertexShader* pXboxVertexShader) { if (UseXboxD3DVertexShaderTypeForVersion3948(pXboxVertexShader)) { - auto pXboxVertexShader3948 = (xbox::X_D3DVertexShader3948*)pXboxVertexShader; + auto pXboxVertexShader3948 = reinterpret_cast(pXboxVertexShader); return &(pXboxVertexShader3948->VertexAttribute); } @@ -314,7 +314,7 @@ static xbox::X_VERTEXATTRIBUTEFORMAT* CxbxGetVertexShaderAttributes(xbox::X_D3DV static DWORD* CxbxGetVertexShaderTokens(xbox::X_D3DVertexShader* pXboxVertexShader, DWORD* pNrTokens) { if (UseXboxD3DVertexShaderTypeForVersion3948(pXboxVertexShader)) { - auto pXboxVertexShader3948 = (xbox::X_D3DVertexShader3948*)pXboxVertexShader; + auto pXboxVertexShader3948 = reinterpret_cast(pXboxVertexShader); *pNrTokens = pXboxVertexShader3948->ProgramAndConstantsDwords; return &pXboxVertexShader3948->ProgramAndConstants[0]; }