]> git.cworth.org Git - apitrace/commitdiff
d3dretrace: Fix MSVC build.
authorJosé Fonseca <jfonseca@vmware.com>
Wed, 11 Sep 2013 13:15:13 +0000 (14:15 +0100)
committerJosé Fonseca <jfonseca@vmware.com>
Wed, 11 Sep 2013 13:15:13 +0000 (14:15 +0100)
retrace/d3d10state_images.cpp

index 0341690c87d9f296277d339c8f8909263e474ece..d79c2493942dfb496672ba8cecfffbf5ea3db496 100644 (file)
@@ -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