diff --git a/GPU/Common/FramebufferCommon.cpp b/GPU/Common/FramebufferCommon.cpp index 8c6a4d0651..88ebcbac98 100644 --- a/GPU/Common/FramebufferCommon.cpp +++ b/GPU/Common/FramebufferCommon.cpp @@ -101,7 +101,8 @@ void CenterDisplayOutputRect(float *x, float *y, float *w, float *h, float origW } -FramebufferManagerCommon::FramebufferManagerCommon() : +FramebufferManagerCommon::FramebufferManagerCommon(Draw::DrawContext *draw) : + draw_(draw), displayFramebufPtr_(0), displayStride_(0), displayFormat_(GE_FORMAT_565), diff --git a/GPU/Common/FramebufferCommon.h b/GPU/Common/FramebufferCommon.h index 3ae836ce53..45ee3853a8 100644 --- a/GPU/Common/FramebufferCommon.h +++ b/GPU/Common/FramebufferCommon.h @@ -138,9 +138,13 @@ enum BindFramebufferColorFlags { BINDFBCOLOR_APPLY_TEX_OFFSET = 4, }; +namespace Draw { +class DrawContext; +} + class FramebufferManagerCommon { public: - FramebufferManagerCommon(); + FramebufferManagerCommon(Draw::DrawContext *draw); virtual ~FramebufferManagerCommon(); virtual void Init(); @@ -282,6 +286,8 @@ protected: dstBuffer->reallyDirtyAfterDisplay = true; } + Draw::DrawContext *draw_; + u32 displayFramebufPtr_; u32 displayStride_; GEBufferFormat displayFormat_; diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index e32c391a64..bcaec6d426 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -37,10 +37,15 @@ // Videos should be updated every few frames, so we forge quickly. #define VIDEO_DECIMATE_AGE 4 -TextureCacheCommon::TextureCacheCommon() - : cacheSizeEstimate_(0), nextTexture_(nullptr), - clutLastFormat_(0xFFFFFFFF), clutTotalBytes_(0), clutMaxBytes_(0), clutRenderAddress_(0xFFFFFFFF), - clutAlphaLinear_(false) { +TextureCacheCommon::TextureCacheCommon(Draw::DrawContext *draw) + : draw_(draw), + cacheSizeEstimate_(0), + nextTexture_(nullptr), + clutLastFormat_(0xFFFFFFFF), + clutTotalBytes_(0), + clutMaxBytes_(0), + clutRenderAddress_(0xFFFFFFFF), + clutAlphaLinear_(false) { // TODO: Clamp down to 256/1KB? Need to check mipmapShareClut and clamp loadclut. clutBufRaw_ = (u32 *)AllocateAlignedMemory(1024 * sizeof(u32), 16); // 4KB clutBufConverted_ = (u32 *)AllocateAlignedMemory(1024 * sizeof(u32), 16); // 4KB diff --git a/GPU/Common/TextureCacheCommon.h b/GPU/Common/TextureCacheCommon.h index 4c2be709d6..9fd087a8e0 100644 --- a/GPU/Common/TextureCacheCommon.h +++ b/GPU/Common/TextureCacheCommon.h @@ -42,9 +42,13 @@ struct VirtualFramebuffer; class CachedTextureVulkan; +namespace Draw { +class DrawContext; +} + class TextureCacheCommon { public: - TextureCacheCommon(); + TextureCacheCommon(Draw::DrawContext *draw); virtual ~TextureCacheCommon(); void LoadClut(u32 clutAddr, u32 loadBytes); @@ -176,6 +180,7 @@ protected: void DecimateVideos(); + Draw::DrawContext *draw_; TextureReplacer replacer; TexCache cache; diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index 724240dfaa..ae945cede4 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -74,6 +74,17 @@ static const char * pscode = " return c;\n" "}\n"; +void DXSetViewport(float x, float y, float w, float h, float minZ, float maxZ) { + D3DVIEWPORT9 vp; + vp.X = (DWORD)x; + vp.Y = (DWORD)y; + vp.Width = (DWORD)w; + vp.Height = (DWORD)h; + vp.MinZ = minZ; + vp.MaxZ = maxZ; + pD3Ddevice->SetViewport(&vp); +} + void FramebufferManagerDX9::ClearBuffer(bool keepState) { if (keepState) { dxstate.scissorTest.force(false); @@ -108,12 +119,13 @@ static const char * pscode = dxstate.stencilMask.set(0xFF); } - FramebufferManagerDX9::FramebufferManagerDX9() : - drawPixelsTex_(0), - convBuf(0), - stencilUploadPS_(nullptr), - stencilUploadVS_(nullptr), - stencilUploadFailed_(false) { + FramebufferManagerDX9::FramebufferManagerDX9(Draw::DrawContext *draw) + : FramebufferManagerCommon(draw), + drawPixelsTex_(0), + convBuf(0), + stencilUploadPS_(nullptr), + stencilUploadVS_(nullptr), + stencilUploadFailed_(false) { std::string errorMsg; if (!CompileVertexShader(vscode, &pFramebufferVertexShader, nullptr, errorMsg)) { diff --git a/GPU/Directx9/FramebufferDX9.h b/GPU/Directx9/FramebufferDX9.h index 9a668990be..177f2cefe0 100644 --- a/GPU/Directx9/FramebufferDX9.h +++ b/GPU/Directx9/FramebufferDX9.h @@ -42,7 +42,7 @@ class ShaderManagerDX9; class FramebufferManagerDX9 : public FramebufferManagerCommon { public: - FramebufferManagerDX9(); + FramebufferManagerDX9(Draw::DrawContext *draw); ~FramebufferManagerDX9(); void SetTextureCache(TextureCacheDX9 *tc) { diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 605d24d37a..5f97bffce0 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -399,9 +399,9 @@ GPU_DX9::GPU_DX9(GraphicsContext *gfxCtx, Draw::DrawContext *draw) dxstate.SetVSyncInterval(g_Config.bVSync); shaderManagerDX9_ = new ShaderManagerDX9(); - framebufferManagerDX9_ = new FramebufferManagerDX9(); + framebufferManagerDX9_ = new FramebufferManagerDX9(draw); framebufferManager_ = framebufferManagerDX9_; - textureCacheDX9_ = new TextureCacheDX9(); + textureCacheDX9_ = new TextureCacheDX9(draw); textureCache_ = textureCacheDX9_; drawEngineCommon_ = &drawEngine_; shaderManager_ = shaderManagerDX9_; diff --git a/GPU/Directx9/TextureCacheDX9.cpp b/GPU/Directx9/TextureCacheDX9.cpp index 317f3e8e39..00fd208cc5 100644 --- a/GPU/Directx9/TextureCacheDX9.cpp +++ b/GPU/Directx9/TextureCacheDX9.cpp @@ -62,7 +62,12 @@ namespace DX9 { #define TEXCACHE_MIN_PRESSURE 16 * 1024 * 1024 // Total in VRAM #define TEXCACHE_SECOND_MIN_PRESSURE 4 * 1024 * 1024 -TextureCacheDX9::TextureCacheDX9() : secondCacheSizeEstimate_(0), clearCacheNextFrame_(false), lowMemoryMode_(false), texelsScaledThisFrame_(0) { +TextureCacheDX9::TextureCacheDX9(Draw::DrawContext *draw) + : TextureCacheCommon(draw), + secondCacheSizeEstimate_(0), + clearCacheNextFrame_(false), + lowMemoryMode_(false), + texelsScaledThisFrame_(0) { timesInvalidatedAllThisFrame_ = 0; lastBoundTexture = INVALID_TEX; decimationCounter_ = TEXCACHE_DECIMATION_INTERVAL; diff --git a/GPU/Directx9/TextureCacheDX9.h b/GPU/Directx9/TextureCacheDX9.h index 59729a939c..1b0e14b8e9 100644 --- a/GPU/Directx9/TextureCacheDX9.h +++ b/GPU/Directx9/TextureCacheDX9.h @@ -37,7 +37,7 @@ class ShaderManagerDX9; class TextureCacheDX9 : public TextureCacheCommon { public: - TextureCacheDX9(); + TextureCacheDX9(Draw::DrawContext *draw); ~TextureCacheDX9(); void SetTexture(bool force = false); diff --git a/GPU/Directx9/helper/global.cpp b/GPU/Directx9/helper/global.cpp index 7d4b4f4f1f..5f4cb3e31d 100644 --- a/GPU/Directx9/helper/global.cpp +++ b/GPU/Directx9/helper/global.cpp @@ -11,17 +11,6 @@ LPDIRECT3DDEVICE9 pD3Ddevice = nullptr; LPDIRECT3DDEVICE9EX pD3DdeviceEx = nullptr; LPDIRECT3D9 pD3D = nullptr; -void DXSetViewport(float x, float y, float w, float h, float minZ, float maxZ) { - D3DVIEWPORT9 vp; - vp.X = (DWORD)x; - vp.Y = (DWORD)y; - vp.Width = (DWORD)w; - vp.Height = (DWORD)h; - vp.MinZ = minZ; - vp.MaxZ = maxZ; - pD3Ddevice->SetViewport(&vp); -} - IDirect3DVertexDeclaration9* pFramebufferVertexDecl = nullptr; static const D3DVERTEXELEMENT9 VertexElements[] = { diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index 1ff719e6ec..b50bcef160 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -236,7 +236,8 @@ void FramebufferManagerGLES::DestroyDraw2DProgram() { } } -FramebufferManagerGLES::FramebufferManagerGLES() : +FramebufferManagerGLES::FramebufferManagerGLES(Draw::DrawContext *draw) : + FramebufferManagerCommon(draw), drawPixelsTex_(0), drawPixelsTexFormat_(GE_FORMAT_INVALID), convBuf_(nullptr), diff --git a/GPU/GLES/FramebufferManagerGLES.h b/GPU/GLES/FramebufferManagerGLES.h index f64f5623bf..4d97dc348f 100644 --- a/GPU/GLES/FramebufferManagerGLES.h +++ b/GPU/GLES/FramebufferManagerGLES.h @@ -62,7 +62,7 @@ struct CardboardSettings { class FramebufferManagerGLES : public FramebufferManagerCommon { public: - FramebufferManagerGLES(); + FramebufferManagerGLES(Draw::DrawContext *draw); ~FramebufferManagerGLES(); void SetTextureCache(TextureCacheGLES *tc) { diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 340ae6e499..2ab675f09b 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -400,9 +400,9 @@ GPU_GLES::GPU_GLES(GraphicsContext *gfxCtx, Draw::DrawContext *draw) CheckGPUFeatures(); shaderManagerGL_ = new ShaderManagerGLES(); - framebufferManagerGL_ = new FramebufferManagerGLES(); + framebufferManagerGL_ = new FramebufferManagerGLES(draw); framebufferManager_ = framebufferManagerGL_; - textureCacheGL_ = new TextureCacheGLES(); + textureCacheGL_ = new TextureCacheGLES(draw); textureCache_ = textureCacheGL_; drawEngineCommon_ = &drawEngine_; shaderManager_ = shaderManagerGL_; diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp index 9c53eb6d64..b6e7abdaad 100644 --- a/GPU/GLES/TextureCacheGLES.cpp +++ b/GPU/GLES/TextureCacheGLES.cpp @@ -70,7 +70,12 @@ #define INVALID_TEX -1 -TextureCacheGLES::TextureCacheGLES() : secondCacheSizeEstimate_(0), clearCacheNextFrame_(false), lowMemoryMode_(false), texelsScaledThisFrame_(0) { +TextureCacheGLES::TextureCacheGLES(Draw::DrawContext *draw) + : TextureCacheCommon(draw), + secondCacheSizeEstimate_(0), + clearCacheNextFrame_(false), + lowMemoryMode_(false), + texelsScaledThisFrame_(0) { timesInvalidatedAllThisFrame_ = 0; lastBoundTexture = INVALID_TEX; decimationCounter_ = TEXCACHE_DECIMATION_INTERVAL; diff --git a/GPU/GLES/TextureCacheGLES.h b/GPU/GLES/TextureCacheGLES.h index d7e9c48bae..e69845e4ec 100644 --- a/GPU/GLES/TextureCacheGLES.h +++ b/GPU/GLES/TextureCacheGLES.h @@ -44,7 +44,7 @@ inline bool UseBGRA8888() { class TextureCacheGLES : public TextureCacheCommon { public: - TextureCacheGLES(); + TextureCacheGLES(Draw::DrawContext *draw); ~TextureCacheGLES(); void SetTexture(bool force = false); diff --git a/GPU/Vulkan/FramebufferVulkan.cpp b/GPU/Vulkan/FramebufferVulkan.cpp index 7aa1c00dae..6ac25670bd 100644 --- a/GPU/Vulkan/FramebufferVulkan.cpp +++ b/GPU/Vulkan/FramebufferVulkan.cpp @@ -78,7 +78,8 @@ void main() { void ConvertFromRGBA8888_Vulkan(u8 *dst, const u8 *src, u32 dstStride, u32 srcStride, u32 width, u32 height, GEBufferFormat format); -FramebufferManagerVulkan::FramebufferManagerVulkan(VulkanContext *vulkan) : +FramebufferManagerVulkan::FramebufferManagerVulkan(Draw::DrawContext *draw, VulkanContext *vulkan) : + FramebufferManagerCommon(draw), vulkan_(vulkan), drawPixelsTex_(nullptr), drawPixelsTexFormat_(GE_FORMAT_INVALID), diff --git a/GPU/Vulkan/FramebufferVulkan.h b/GPU/Vulkan/FramebufferVulkan.h index b72f2405e1..5ef6bccb54 100644 --- a/GPU/Vulkan/FramebufferVulkan.h +++ b/GPU/Vulkan/FramebufferVulkan.h @@ -75,7 +75,7 @@ struct CardboardSettings { class FramebufferManagerVulkan : public FramebufferManagerCommon { public: - FramebufferManagerVulkan(VulkanContext *vulkan); + FramebufferManagerVulkan(Draw::DrawContext *draw, VulkanContext *vulkan); ~FramebufferManagerVulkan(); void SetTextureCache(TextureCacheVulkan *tc) { diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index a71267b862..c487329946 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -397,9 +397,9 @@ GPU_Vulkan::GPU_Vulkan(GraphicsContext *gfxCtx, Draw::DrawContext *draw) shaderManagerVulkan_ = new ShaderManagerVulkan(vulkan_); pipelineManager_ = new PipelineManagerVulkan(vulkan_); - framebufferManagerVulkan_ = new FramebufferManagerVulkan(vulkan_); + framebufferManagerVulkan_ = new FramebufferManagerVulkan(draw, vulkan_); framebufferManager_ = framebufferManagerVulkan_; - textureCacheVulkan_ = new TextureCacheVulkan(vulkan_); + textureCacheVulkan_ = new TextureCacheVulkan(draw, vulkan_); textureCache_ = textureCacheVulkan_; drawEngineCommon_ = &drawEngine_; shaderManager_ = shaderManagerVulkan_; diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index 518605a48b..7cd2a6ee83 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -140,17 +140,20 @@ void SamplerCache::DeviceRestore(VulkanContext *vulkan) { vulkan_ = vulkan; } -TextureCacheVulkan::TextureCacheVulkan(VulkanContext *vulkan) - : vulkan_(vulkan), samplerCache_(vulkan), secondCacheSizeEstimate_(0), - clearCacheNextFrame_(false), lowMemoryMode_(false), texelsScaledThisFrame_(0) { +TextureCacheVulkan::TextureCacheVulkan(Draw::DrawContext *draw, VulkanContext *vulkan) + : TextureCacheCommon(draw), + vulkan_(vulkan), + samplerCache_(vulkan), + secondCacheSizeEstimate_(0), + clearCacheNextFrame_(false), + lowMemoryMode_(false), + texelsScaledThisFrame_(0) { timesInvalidatedAllThisFrame_ = 0; lastBoundTexture = nullptr; decimationCounter_ = TEXCACHE_DECIMATION_INTERVAL; allocator_ = new VulkanDeviceAllocator(vulkan_, TEXCACHE_MIN_SLAB_SIZE, TEXCACHE_MAX_SLAB_SIZE); SetupTextureDecoder(); - - nextTexture_ = nullptr; } TextureCacheVulkan::~TextureCacheVulkan() { diff --git a/GPU/Vulkan/TextureCacheVulkan.h b/GPU/Vulkan/TextureCacheVulkan.h index f80cb98b10..12c65d5345 100644 --- a/GPU/Vulkan/TextureCacheVulkan.h +++ b/GPU/Vulkan/TextureCacheVulkan.h @@ -86,7 +86,7 @@ private: class TextureCacheVulkan : public TextureCacheCommon { public: - TextureCacheVulkan(VulkanContext *vulkan); + TextureCacheVulkan(Draw::DrawContext *draw, VulkanContext *vulkan); ~TextureCacheVulkan(); void SetTexture();