X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fd3d10state.cpp;h=d5e41da04146d3597264ed8f1dbea2e74c0f46c6;hb=940cdb8b143455fe2fc002ffd50f5e2ffcaf1260;hp=543017d780f603448a38283c7119254ede35bf68;hpb=65ba497caca56134f9b4f18658d104ce89092c11;p=apitrace

diff --git a/retrace/d3d10state.cpp b/retrace/d3d10state.cpp
index 543017d..d5e41da 100644
--- a/retrace/d3d10state.cpp
+++ b/retrace/d3d10state.cpp
@@ -28,14 +28,48 @@
 
 #include <iostream>
 
-#include "d3d11imports.hpp"
-#include "json.hpp"
-#include "d3dstate.hpp"
+#include "d3d10imports.hpp"
+#include "d3d10state.hpp"
 
 
 namespace d3dstate {
 
 
+const GUID
+GUID_D3DSTATE = {0x7D71CAC9,0x7F58,0x432C,{0xA9,0x75,0xA1,0x9F,0xCF,0xCE,0xFD,0x14}};
+
+
+static void
+dumpShaders(JSONWriter &json, ID3D10Device *pDevice)
+{
+    json.beginMember("shaders");
+    json.beginObject();
+
+    ID3D10VertexShader *pVertexShader = NULL;
+    pDevice->VSGetShader(&pVertexShader);
+    if (pVertexShader) {
+        dumpShader<ID3D10DeviceChild>(json, "VS", pVertexShader);
+        pVertexShader->Release();
+    }
+
+    ID3D10GeometryShader *pGeometryShader = NULL;
+    pDevice->GSGetShader(&pGeometryShader);
+    if (pGeometryShader) {
+        dumpShader<ID3D10DeviceChild>(json, "GS", pGeometryShader);
+        pGeometryShader->Release();
+    }
+
+    ID3D10PixelShader *pPixelShader = NULL;
+    pDevice->PSGetShader(&pPixelShader);
+    if (pPixelShader) {
+        dumpShader<ID3D10DeviceChild>(json, "PS", pPixelShader);
+    }
+
+    json.endObject();
+    json.endMember(); // shaders
+}
+
+
 void
 dumpDevice(std::ostream &os, ID3D10Device *pDevice)
 {
@@ -47,10 +81,7 @@ dumpDevice(std::ostream &os, ID3D10Device *pDevice)
     json.endObject();
     json.endMember(); // parameters
 
-    json.beginMember("shaders");
-    json.beginObject();
-    json.endObject();
-    json.endMember(); // shaders
+    dumpShaders(json, pDevice);
 
     json.beginMember("textures");
     json.beginObject();
@@ -58,7 +89,6 @@ dumpDevice(std::ostream &os, ID3D10Device *pDevice)
     json.endMember(); // textures
 
     dumpFramebuffer(json, pDevice);
-
 }