From 96da22e974ccb9e8ae0e388f8a3a90d95e858d32 Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Tue, 4 Nov 2003 23:22:18 +0000 Subject: [PATCH] YES! --- Cxbx.opt | Bin 67072 -> 67072 bytes Source/Win32/CxbxKrnl/EmuD3D8.cpp | 1 + Source/Win32/CxbxKrnl/EmuKrnl.cpp | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Cxbx.opt b/Cxbx.opt index 261c288b80447518ad0a22e18db4a9e41a34e517..67460583a7f072980cb35950053109d516222989 100644 GIT binary patch literal 67072 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 IMeG0n4~|-)SO5S3 literal 67072 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::EmuPrimitiveType(g_dwD3DIVBPrim), XTL::EmuD3DVertex2PrimitiveCount(g_dwD3DIVBPrim, g_dwD3DIVBInd), pStreamData, i/g_dwD3DIVBInd); + // HACK: TODO: probably unnecessary!!! g_pD3DDevice8->Present(0,0,0,0); free(pStreamData); diff --git a/Source/Win32/CxbxKrnl/EmuKrnl.cpp b/Source/Win32/CxbxKrnl/EmuKrnl.cpp index 0ac565b07..48b50adf6 100644 --- a/Source/Win32/CxbxKrnl/EmuKrnl.cpp +++ b/Source/Win32/CxbxKrnl/EmuKrnl.cpp @@ -589,7 +589,7 @@ XBSYSAPI EXPORTNUM(126) xboxkrnl::ULONGLONG NTAPI xboxkrnl::KeQueryPerformanceCo ::LARGE_INTEGER Counter; - QueryPerformanceFrequency(&Counter); + QueryPerformanceCounter(&Counter); EmuSwapFS(); // Xbox FS @@ -610,6 +610,7 @@ XBSYSAPI EXPORTNUM(127) xboxkrnl::ULONGLONG NTAPI xboxkrnl::KeQueryPerformanceFr } #endif + // Xbox Performance Counter Frequency := 337F98h ::LARGE_INTEGER Frequency; QueryPerformanceFrequency(&Frequency);