From ee0fdfe385b70d95b3c3d590468fa6e329bf2cc7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 11 Sep 2013 14:15:13 +0100 Subject: [PATCH] d3dretrace: Fix MSVC build. --- retrace/d3d10state_images.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/retrace/d3d10state_images.cpp b/retrace/d3d10state_images.cpp index 0341690..d79c249 100644 --- a/retrace/d3d10state_images.cpp +++ b/retrace/d3d10state_images.cpp @@ -388,15 +388,16 @@ getDepthStencilViewImage(ID3D10Device *pDevice, static void dumpStageTextures(JSONWriter &json, ID3D10Device *pDevice, const char *stageName, - ID3D10ShaderResourceView *pShaderResourceViews[D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT]) + UINT NumViews, + ID3D10ShaderResourceView **ppShaderResourceViews) { - for (UINT i = 0; i < ARRAYSIZE(pShaderResourceViews); ++i) { - if (!pShaderResourceViews[i]) { + for (UINT i = 0; i < NumViews; ++i) { + if (!ppShaderResourceViews[i]) { continue; } image::Image *image; - image = getShaderResourceViewImage(pDevice, pShaderResourceViews[i]); + image = getShaderResourceViewImage(pDevice, ppShaderResourceViews[i]); if (image) { char label[64]; _snprintf(label, sizeof label, "%s_RESOURCE_%u", stageName, i); @@ -405,7 +406,7 @@ dumpStageTextures(JSONWriter &json, ID3D10Device *pDevice, const char *stageName json.endMember(); // *_RESOURCE_* } - pShaderResourceViews[i]->Release(); + ppShaderResourceViews[i]->Release(); } } @@ -419,13 +420,13 @@ dumpTextures(JSONWriter &json, ID3D10Device *pDevice) ID3D10ShaderResourceView *pShaderResourceViews[D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT]; pDevice->PSGetShaderResources(0, ARRAYSIZE(pShaderResourceViews), pShaderResourceViews); - dumpStageTextures(json, pDevice, "PS", pShaderResourceViews); + dumpStageTextures(json, pDevice, "PS", ARRAYSIZE(pShaderResourceViews), pShaderResourceViews); pDevice->VSGetShaderResources(0, ARRAYSIZE(pShaderResourceViews), pShaderResourceViews); - dumpStageTextures(json, pDevice, "VS", pShaderResourceViews); + dumpStageTextures(json, pDevice, "VS", ARRAYSIZE(pShaderResourceViews), pShaderResourceViews); pDevice->GSGetShaderResources(0, ARRAYSIZE(pShaderResourceViews), pShaderResourceViews); - dumpStageTextures(json, pDevice, "GS", pShaderResourceViews); + dumpStageTextures(json, pDevice, "GS", ARRAYSIZE(pShaderResourceViews), pShaderResourceViews); json.endObject(); json.endMember(); // textures -- 2.43.0