diff options
| author | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
| commit | 450aa6f7df9e67dd256b86f94e65eaf707032aad (patch) | |
| tree | 04aa207d84ddc8ca246d2573aaaf756b3ce8a0b5 /LibOVR/Src/Util/Util_LatencyTest2Reader.cpp | |
| parent | 3c7b8a17e907f4ef2afd9f77db566a3f6179cbe4 (diff) | |
| parent | 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c (diff) | |
Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1
Conflicts:
LibOVR/Include/OVR_CAPI_0_5_0.h
LibOVR/Src/CAPI/CAPI_HMDState.cpp
LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
LibOVR/Src/Kernel/OVR_System.cpp
LibOVR/Src/OVR_CAPI.cpp
LibOVR/Src/OVR_Profile.cpp
LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
LibOVRKernel/Src/Kernel/OVR_Types.h
Diffstat (limited to 'LibOVR/Src/Util/Util_LatencyTest2Reader.cpp')
| -rw-r--r-- | LibOVR/Src/Util/Util_LatencyTest2Reader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/LibOVR/Src/Util/Util_LatencyTest2Reader.cpp b/LibOVR/Src/Util/Util_LatencyTest2Reader.cpp index e34bf19..6131c30 100644 --- a/LibOVR/Src/Util/Util_LatencyTest2Reader.cpp +++ b/LibOVR/Src/Util/Util_LatencyTest2Reader.cpp @@ -63,7 +63,7 @@ FrameTimeRecordSet::FrameTimeRecordSet() void FrameTimeRecordSet::AddValue(int readValue, double timeSeconds) { Records[NextWriteIndex].ReadbackIndex = readValue; - Records[NextWriteIndex].TimeSeconds = timeSeconds; + Records[NextWriteIndex].TimeSeconds = timeSeconds; NextWriteIndex++; if (NextWriteIndex == RecordCount) NextWriteIndex = 0; @@ -110,7 +110,7 @@ void RecordStateReader::GetRecordSet(FrameTimeRecordSet& recordset) return; } - recordset = Updater->SharedLatencyTestState.GetState(); + recordset = Updater->LatencyTest.GetState(); return; } |