Fixed D3DQUERYTYPE_TIMESTAMP behaviour.

A timestamp query records the current time when it's issued, not when the data is being retrieved. Change-Id: Idb6e7fe6736a5b54bd23ef1613eaf953da86aa08 Reviewed-on: https://swiftshader-review.googlesource.com/5771Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>

Fixed D3DQUERYTYPE_TIMESTAMP behaviour.
56dda25f · Branimir Karadžić · Nicolas Capens · 64ed0d75 · 56dda25f · 56dda25f
Commit 56dda25f authored Jul 01, 2016 by Branimir Karadžić Committed by Nicolas Capens Aug 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

Direct3DQuery9.cpp src/D3D9/Direct3DQuery9.cpp +8 -2

Direct3DQuery9.hpp src/D3D9/Direct3DQuery9.hpp +3 -1

No files found.
--- a/src/D3D9/Direct3DQuery9.cpp
+++ b/src/D3D9/Direct3DQuery9.cpp
@@ -169,7 +169,13 @@ namespace D3D9
 				device->setOcclusionEnabled(false);
 			}
 			break;
-		case D3DQUERYTYPE_TIMESTAMP:			if(flags != D3DISSUE_END) return INVALIDCALL(); break;
+		case D3DQUERYTYPE_TIMESTAMP:
+			if(flags == D3DISSUE_END)
+			{
+				timestamp = sw::Timer::counter();
+			}
+			else return INVALIDCALL();
+			break;
 		case D3DQUERYTYPE_TIMESTAMPDISJOINT:	if(flags != D3DISSUE_BEGIN && flags != D3DISSUE_END) return INVALIDCALL(); break;
 		case D3DQUERYTYPE_TIMESTAMPFREQ:		if(flags != D3DISSUE_END) return INVALIDCALL(); break;
 		case D3DQUERYTYPE_PIPELINETIMINGS:		if(flags != D3DISSUE_BEGIN && flags != D3DISSUE_END) return INVALIDCALL(); break;
@@ -227,7 +233,7 @@ namespace D3D9
 			case D3DQUERYTYPE_OCCLUSION:
 				*(DWORD*)data = query->data;
 				break;
-			case D3DQUERYTYPE_TIMESTAMP:			*(UINT64*)data = sw::Timer::counter(); break;     // FIXME: Verify behaviour
+			case D3DQUERYTYPE_TIMESTAMP:			*(UINT64*)data = timestamp; break;                // FIXME: Verify behaviour
 			case D3DQUERYTYPE_TIMESTAMPDISJOINT:	*(BOOL*)data = FALSE; break;                      // FIXME: Verify behaviour
 			case D3DQUERYTYPE_TIMESTAMPFREQ:		*(UINT64*)data = sw::Timer::frequency(); break;   // FIXME: Verify behaviour
 			case D3DQUERYTYPE_PIPELINETIMINGS:		UNIMPLEMENTED(); break;

--- a/src/D3D9/Direct3DQuery9.hpp
+++ b/src/D3D9/Direct3DQuery9.hpp
@@ -49,7 +49,9 @@ namespace D3D9
 		Direct3DDevice9 *const device;
 		const D3DQUERYTYPE type;
-		sw::Query *query;
+		// TODO: create a union, or subclasses for each type.
+		sw::Query *query;   // D3DQUERYTYPE_OCCLUSION
+		UINT64 timestamp;   // D3DQUERYTYPE_TIMESTAMP
 	};
 }