X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fd3d10state_images.cpp;h=fa27fee2ff7ff1715bdd3a5a3ad24213e52baf8b;hb=940cdb8b143455fe2fc002ffd50f5e2ffcaf1260;hp=781f937f0c0b5cd299c1dc7f29b1e1cbb362e20b;hpb=bb23f3a0bad625e3c427b9de991d4a42fa22e5f0;p=apitrace

diff --git a/retrace/d3d10state_images.cpp b/retrace/d3d10state_images.cpp
index 781f937..fa27fee 100644
--- a/retrace/d3d10state_images.cpp
+++ b/retrace/d3d10state_images.cpp
@@ -30,7 +30,9 @@
 #include <algorithm>
 
 #include "image.hpp"
+#include "json.hpp"
 #include "d3d10imports.hpp"
+#include "d3dstate.hpp"
 
 
 namespace d3dstate {
@@ -95,7 +97,7 @@ stageResource(ID3D10Device *pDevice,
             Desc.Usage = Usage;
             Desc.BindFlags = BindFlags;
             Desc.CPUAccessFlags = CPUAccessFlags;
-            Desc.MiscFlags &= ~D3D10_RESOURCE_MISC_TEXTURECUBE;
+            Desc.MiscFlags &= D3D10_RESOURCE_MISC_TEXTURECUBE;
 
             *pWidth = Desc.Width;
             *pHeight = Desc.Height;
@@ -179,10 +181,10 @@ unmapResource(ID3D10Resource *pResource, UINT Subresource) {
     }
 }
 
-image::Image *
-getRenderTargetImage(ID3D10Device *pDevice) {
+static image::Image *
+getRenderTargetViewImage(ID3D10Device *pDevice,
+                         ID3D10RenderTargetView *pRenderTargetView) {
     image::Image *image = NULL;
-    ID3D10RenderTargetView *pRenderTargetView = NULL;
     D3D10_RENDER_TARGET_VIEW_DESC Desc;
     ID3D10Resource *pResource = NULL;
     ID3D10Resource *pStagingResource = NULL;
@@ -194,9 +196,8 @@ getRenderTargetImage(ID3D10Device *pDevice) {
     const unsigned char *src;
     unsigned char *dst;
 
-    pDevice->OMGetRenderTargets(1, &pRenderTargetView, NULL);
     if (!pRenderTargetView) {
-        goto no_rendertarget;
+        return NULL;
     }
 
     pRenderTargetView->GetResource(&pResource);
@@ -300,12 +301,55 @@ no_staging:
     if (pResource) {
         pResource->Release();
     }
+    return image;
+}
+
+
+image::Image *
+getRenderTargetImage(ID3D10Device *pDevice) {
+    ID3D10RenderTargetView *pRenderTargetView = NULL;
+    pDevice->OMGetRenderTargets(1, &pRenderTargetView, NULL);
+
+    image::Image *image = NULL;
     if (pRenderTargetView) {
+        image = getRenderTargetViewImage(pDevice, pRenderTargetView);
         pRenderTargetView->Release();
     }
-no_rendertarget:
+
     return image;
 }
 
 
+void
+dumpFramebuffer(JSONWriter &json, ID3D10Device *pDevice)
+{
+    json.beginMember("framebuffer");
+    json.beginObject();
+
+    ID3D10RenderTargetView *pRenderTargetViews[D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT];
+    pDevice->OMGetRenderTargets(D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, pRenderTargetViews, NULL);
+
+    for (UINT i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) {
+        if (!pRenderTargetViews[i]) {
+            continue;
+        }
+
+        image::Image *image;
+        image = getRenderTargetViewImage(pDevice, pRenderTargetViews[i]);
+        if (image) {
+            char label[64];
+            _snprintf(label, sizeof label, "RENDER_TARGET_%u", i);
+            json.beginMember(label);
+            json.writeImage(image, "UNKNOWN");
+            json.endMember(); // RENDER_TARGET_*
+        }
+
+        pRenderTargetViews[i]->Release();
+    }
+
+    json.endObject();
+    json.endMember(); // framebuffer
+}
+
+
 } /* namespace d3dstate */