diff options
| author | NeoBrainX <NeoBrainX@gmail.com> | 2013-03-01 19:30:37 +0100 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@gmail.com> | 2013-03-01 19:30:37 +0100 |
| commit | 5a7bb2abfae1d37d01bef16d3113a0b54813b81f (patch) | |
| tree | 78b6b29b5384c241b5d26dc4081b2787ed44b76c /Source/Core/VideoCommon | |
| parent | b94f65b66608148450c22615ea896d90bbc27ed4 (diff) | |
D3D11: Port perf queries code to the PerfQueryBase interface.
Remove deprecated PerfQuery methods from RenderBase.
Windows build fix.
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/RenderBase.h | 5 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoCommon.vcxproj.filters | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 7f2853bcc3..55678f3f5a 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -128,11 +128,6 @@ public: static unsigned int GetPrevPixelFormat() { return prev_efb_format; } static void StorePixelFormat(unsigned int new_format) { prev_efb_format = new_format; } - virtual void ResetPixelPerf() {}; - virtual void ResumePixelPerf(bool efb_copies) {}; - virtual void PausePixelPerf(bool efb_copies) {}; - virtual u32 GetPixelPerfResult(PixelPerfQuery type) { return 0; }; - // TODO: doesn't belong here virtual void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4) = 0; virtual void SetPSConstant4fv(unsigned int const_number, const float *f) = 0; diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index 86b2e03221..330b23d370 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -101,6 +101,9 @@ <ClCompile Include="Src\MainBase.cpp"> <Filter>Base</Filter> </ClCompile> + <ClCompile Include="Src\PerfQueryBase.cpp"> + <Filter>Base</Filter> + </ClCompile> <ClCompile Include="Src\RenderBase.cpp"> <Filter>Base</Filter> </ClCompile> @@ -113,8 +116,6 @@ <ClCompile Include="Src\LightingShaderGen.cpp"> <Filter>Shader Generators</Filter> </ClCompile> - <ClCompile Include="Src\PerfQueryBase.cpp"> - <Filter>Base</Filter> <ClCompile Include="Src\FPSCounter.cpp"> <Filter>Util</Filter> </ClCompile> @@ -239,6 +240,9 @@ <ClInclude Include="Src\MainBase.h"> <Filter>Base</Filter> </ClInclude> + <ClInclude Include="Src\PerfQueryBase.h"> + <Filter>Base</Filter> + </ClInclude> <ClInclude Include="Src\RenderBase.h"> <Filter>Base</Filter> </ClInclude> @@ -251,8 +255,6 @@ <ClInclude Include="Src\LightingShaderGen.h"> <Filter>Shader Generators</Filter> </ClInclude> - <ClInclude Include="Src\PerfQueryBase.h"> - <Filter>Base</Filter> <ClInclude Include="Src\FPSCounter.h"> <Filter>Util</Filter> </ClInclude> |