From d198fee21bcfc666715fe108c1492ee492b3730c Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Sun, 22 Sep 2013 18:09:39 +0200 Subject: [PATCH] Remove more references to D3D9... --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 1 - Source/Core/VideoCommon/Src/VideoBackendBase.h | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index b09f736f6e..c57489ca0e 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -1142,7 +1142,6 @@ static inline void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_T out.SetConstantsUsed(C_ALPHA, C_ALPHA); - // using discard then return works the same in cg and dx9 but not in dx11 out.Write("\tif(!( "); uid_data.alpha_test_comp0 = bpmem.alpha_test.comp0; diff --git a/Source/Core/VideoCommon/Src/VideoBackendBase.h b/Source/Core/VideoCommon/Src/VideoBackendBase.h index cc4ff15416..1d691c8ba4 100644 --- a/Source/Core/VideoCommon/Src/VideoBackendBase.h +++ b/Source/Core/VideoCommon/Src/VideoBackendBase.h @@ -128,14 +128,14 @@ public: // the implementation needs not do synchronization logic, because calls to it are surrounded by PauseAndLock now virtual void DoState(PointerWrap &p) = 0; - + virtual void CheckInvalidState() = 0; }; extern std::vector g_available_video_backends; extern VideoBackend* g_video_backend; -// inherited by dx9/dx11/ogl backends +// inherited by D3D/OGL backends class VideoBackendHardware : public VideoBackend { void RunLoop(bool enable); @@ -150,7 +150,7 @@ class VideoBackendHardware : public VideoBackend u32 Video_AccessEFB(EFBAccessType, u32, u32, u32); u32 Video_GetQueryResult(PerfQueryType type); - + void Video_AddMessage(const char* pstr, unsigned int milliseconds); void Video_ClearMessages(); bool Video_Screenshot(const char* filename); @@ -171,9 +171,9 @@ class VideoBackendHardware : public VideoBackend void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); void DoState(PointerWrap &p); - + bool m_invalid; - + public: void CheckInvalidState();