diff options
| author | magumagu <magumagu9@gmail.com> | 2015-03-16 11:50:42 -0700 |
|---|---|---|
| committer | magumagu <magumagu9@gmail.com> | 2015-03-16 11:50:42 -0700 |
| commit | adb8bbed900bccf7e7fbfa5e79d3262bede18e21 (patch) | |
| tree | e32c61e43c53fdb73c00b18de3be109b2f0bd722 /Source/Core/VideoBackends/D3D/D3DUtil.cpp | |
| parent | 0b6562b53f2d315bfc88d943658c05f75cd8fc2a (diff) | |
| parent | ad64336137013a823c212e4e491dbb435aa11e5f (diff) | |
Merge pull request #2217 from shuffle2/quiet-warnings
quiet some warnings which appear on vs2015.
Diffstat (limited to 'Source/Core/VideoBackends/D3D/D3DUtil.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/D3DUtil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/D3D/D3DUtil.cpp b/Source/Core/VideoBackends/D3D/D3DUtil.cpp index dd54756be1..581b028ac1 100644 --- a/Source/Core/VideoBackends/D3D/D3DUtil.cpp +++ b/Source/Core/VideoBackends/D3D/D3DUtil.cpp @@ -399,10 +399,10 @@ int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dw D3D::context->Draw(3 * dwNumTriangles, 0); dwNumTriangles = 0; - D3D11_MAPPED_SUBRESOURCE vbmap; - hr = context->Map(m_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &vbmap); + D3D11_MAPPED_SUBRESOURCE _vbmap; + hr = context->Map(m_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &_vbmap); if (FAILED(hr)) PanicAlert("Mapping vertex buffer failed, %s %d\n", __FILE__, __LINE__); - pVertices = (D3D::FONT2DVERTEX*)vbmap.pData; + pVertices = (D3D::FONT2DVERTEX*)_vbmap.pData; } sx += w + spacing * scalex * size; } |