diff --git a/src/d3d9/d3d9_state.cpp b/src/d3d9/d3d9_state.cpp index c0ee06ec..2c32bef4 100644 --- a/src/d3d9/d3d9_state.cpp +++ b/src/d3d9/d3d9_state.cpp @@ -5,12 +5,6 @@ namespace dxvk { D3D9CapturableState::D3D9CapturableState() { - for (uint32_t i = 0; i < textures.size(); i++) - textures[i] = nullptr; - - for (uint32_t i = 0; i < clipPlanes.size(); i++) - clipPlanes[i] = D3D9ClipPlane(); - for (uint32_t i = 0; i < streamFreq.size(); i++) streamFreq[i] = 1; diff --git a/src/d3d9/d3d9_state.h b/src/d3d9/d3d9_state.h index 90154b37..d87b8f53 100644 --- a/src/d3d9/d3d9_state.h +++ b/src/d3d9/d3d9_state.h @@ -27,7 +27,7 @@ namespace dxvk { } struct D3D9ClipPlane { - float coeff[4]; + float coeff[4] = {}; }; struct D3D9RenderStateInfo { @@ -189,40 +189,40 @@ namespace dxvk { Com vertexDecl; Com indices; - std::array renderStates = { 0 }; + std::array renderStates = {}; std::array< std::array, - SamplerCount> samplerStates; + SamplerCount> samplerStates = {}; - std::array vertexBuffers; + std::array vertexBuffers = {}; std::array< IDirect3DBaseTexture9*, - SamplerCount> textures; + SamplerCount> textures = {}; Com vertexShader; Com pixelShader; - D3DVIEWPORT9 viewport; - RECT scissorRect; + D3DVIEWPORT9 viewport = {}; + RECT scissorRect = {}; std::array< D3D9ClipPlane, - caps::MaxClipPlanes> clipPlanes; + caps::MaxClipPlanes> clipPlanes = {}; std::array< std::array, - caps::TextureStageCount> textureStages; + caps::TextureStageCount> textureStages = {}; D3D9ShaderConstantsVSSoftware vsConsts; D3D9ShaderConstantsPS psConsts; - std::array streamFreq; + std::array streamFreq = {}; - std::array transforms; + std::array transforms = {}; - D3DMATERIAL9 material = D3DMATERIAL9(); + D3DMATERIAL9 material = {}; std::vector> lights; std::array enabledLightIndices;