From 3ceb0a854024b8dd27cad9d2546bfba4ee6e5e21 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 4 Feb 2017 11:47:19 +0100 Subject: [PATCH] Some simple renaming --- GPU/Directx9/FramebufferDX9.cpp | 2 +- GPU/Directx9/FramebufferDX9.h | 6 +++--- GPU/Directx9/GPU_DX9.cpp | 2 +- GPU/GLES/FramebufferManagerGLES.cpp | 6 +++--- GPU/GLES/FramebufferManagerGLES.h | 6 +++--- GPU/GLES/GPU_GLES.cpp | 4 ++-- GPU/GLES/TextureCacheGLES.cpp | 2 +- GPU/GLES/TextureCacheGLES.h | 6 +++--- GPU/Vulkan/GPU_Vulkan.cpp | 2 +- GPU/Vulkan/TextureCacheVulkan.h | 6 +++--- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index 20fee413ea..f930a3a73f 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -1304,7 +1304,7 @@ namespace DX9 { // all the irrelevant state checking it'll use to decide what to do. Should // do something more focused here. SetRenderFrameBuffer(gstate_c.IsDirty(DIRTY_FRAMEBUF), gstate_c.skipDrawReason); - transformDraw_->Flush(); + drawEngine_->Flush(); } void FramebufferManagerDX9::Resized() { diff --git a/GPU/Directx9/FramebufferDX9.h b/GPU/Directx9/FramebufferDX9.h index e3b6cb844e..a6f74c59a9 100644 --- a/GPU/Directx9/FramebufferDX9.h +++ b/GPU/Directx9/FramebufferDX9.h @@ -51,8 +51,8 @@ public: void SetShaderManager(ShaderManagerDX9 *sm) { shaderManager_ = sm; } - void SetTransformDrawEngine(DrawEngineDX9 *td) { - transformDraw_ = td; + void SetDrawEngine(DrawEngineDX9 *td) { + drawEngine_ = td; } virtual void DrawPixels(VirtualFramebuffer *vfb, int dstX, int dstY, const u8 *srcPixels, GEBufferFormat srcPixelFormat, int srcStride, int width, int height) override; @@ -133,7 +133,7 @@ private: TextureCacheDX9 *textureCache_; ShaderManagerDX9 *shaderManager_; - DrawEngineDX9 *transformDraw_; + DrawEngineDX9 *drawEngine_; // Used by post-processing shader std::vector extraFBOs_; diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 894fb0b7c4..605d24d37a 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -412,7 +412,7 @@ GPU_DX9::GPU_DX9(GraphicsContext *gfxCtx, Draw::DrawContext *draw) framebufferManagerDX9_->Init(); framebufferManagerDX9_->SetTextureCache(textureCacheDX9_); framebufferManagerDX9_->SetShaderManager(shaderManagerDX9_); - framebufferManagerDX9_->SetTransformDrawEngine(&drawEngine_); + framebufferManagerDX9_->SetDrawEngine(&drawEngine_); textureCacheDX9_->SetFramebufferManager(framebufferManagerDX9_); textureCacheDX9_->SetDepalShaderCache(&depalShaderCache_); textureCacheDX9_->SetShaderManager(shaderManagerDX9_); diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index d5fe587ddd..dc669fa661 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -509,8 +509,8 @@ void FramebufferManagerGLES::DrawActiveTexture(GLuint texture, float x, float y, glEnableVertexAttribArray(program->a_position); glEnableVertexAttribArray(program->a_texcoord0); if (gstate_c.Supports(GPU_SUPPORTS_VAO)) { - transformDraw_->BindBuffer(pos, sizeof(pos), texCoords, sizeof(texCoords)); - transformDraw_->BindElementBuffer(indices, sizeof(indices)); + drawEngine_->BindBuffer(pos, sizeof(pos), texCoords, sizeof(texCoords)); + drawEngine_->BindElementBuffer(indices, sizeof(indices)); glVertexAttribPointer(program->a_position, 3, GL_FLOAT, GL_FALSE, 12, 0); glVertexAttribPointer(program->a_texcoord0, 2, GL_FLOAT, GL_FALSE, 8, (void *)sizeof(pos)); glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_BYTE, 0); @@ -1963,7 +1963,7 @@ void FramebufferManagerGLES::FlushBeforeCopy() { // all the irrelevant state checking it'll use to decide what to do. Should // do something more focused here. SetRenderFrameBuffer(gstate_c.IsDirty(DIRTY_FRAMEBUF), gstate_c.skipDrawReason); - transformDraw_->Flush(); + drawEngine_->Flush(); } void FramebufferManagerGLES::Resized() { diff --git a/GPU/GLES/FramebufferManagerGLES.h b/GPU/GLES/FramebufferManagerGLES.h index 8527881e90..f64f5623bf 100644 --- a/GPU/GLES/FramebufferManagerGLES.h +++ b/GPU/GLES/FramebufferManagerGLES.h @@ -71,8 +71,8 @@ public: void SetShaderManager(ShaderManagerGLES *sm) { shaderManager_ = sm; } - void SetTransformDrawEngine(DrawEngineGLES *td) { - transformDraw_ = td; + void SetDrawEngine(DrawEngineGLES *td) { + drawEngine_ = td; } void DrawPixels(VirtualFramebuffer *vfb, int dstX, int dstY, const u8 *srcPixels, GEBufferFormat srcPixelFormat, int srcStride, int width, int height) override; @@ -166,7 +166,7 @@ private: TextureCacheGLES *textureCache_; ShaderManagerGLES *shaderManager_; - DrawEngineGLES *transformDraw_; + DrawEngineGLES *drawEngine_; // Used by post-processing shader std::vector extraFBOs_; diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index c42790feec..e522fb90d0 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -415,11 +415,11 @@ GPU_GLES::GPU_GLES(GraphicsContext *gfxCtx, Draw::DrawContext *draw) framebufferManagerGL_->Init(); framebufferManagerGL_->SetTextureCache(textureCacheGL_); framebufferManagerGL_->SetShaderManager(shaderManagerGL_); - framebufferManagerGL_->SetTransformDrawEngine(&drawEngine_); + framebufferManagerGL_->SetDrawEngine(&drawEngine_); textureCacheGL_->SetFramebufferManager(framebufferManagerGL_); textureCacheGL_->SetDepalShaderCache(&depalShaderCache_); textureCacheGL_->SetShaderManager(shaderManagerGL_); - textureCacheGL_->SetTransformDrawEngine(&drawEngine_); + textureCacheGL_->SetDrawEngine(&drawEngine_); fragmentTestCache_.SetTextureCache(textureCacheGL_); // Sanity check gstate diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp index 5f2951aac7..6f4bbef660 100644 --- a/GPU/GLES/TextureCacheGLES.cpp +++ b/GPU/GLES/TextureCacheGLES.cpp @@ -850,7 +850,7 @@ void TextureCacheGLES::ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFram TextureShaderApplier shaderApply(depal, framebuffer->bufferWidth, framebuffer->bufferHeight, framebuffer->renderWidth, framebuffer->renderHeight); shaderApply.ApplyBounds(gstate_c.vertBounds, gstate_c.curTextureXOffset, gstate_c.curTextureYOffset); - shaderApply.Use(transformDraw_); + shaderApply.Use(drawEngine_); glActiveTexture(GL_TEXTURE3); glBindTexture(GL_TEXTURE_2D, clutTexture); diff --git a/GPU/GLES/TextureCacheGLES.h b/GPU/GLES/TextureCacheGLES.h index 7e68ee0d13..d7e9c48bae 100644 --- a/GPU/GLES/TextureCacheGLES.h +++ b/GPU/GLES/TextureCacheGLES.h @@ -65,8 +65,8 @@ public: void SetShaderManager(ShaderManagerGLES *sm) { shaderManager_ = sm; } - void SetTransformDrawEngine(DrawEngineGLES *td) { - transformDraw_ = td; + void SetDrawEngine(DrawEngineGLES *td) { + drawEngine_ = td; } size_t NumLoadedTextures() const { @@ -129,7 +129,7 @@ private: FramebufferManagerGLES *framebufferManager_; DepalShaderCacheGLES *depalShaderCache_; ShaderManagerGLES *shaderManager_; - DrawEngineGLES *transformDraw_; + DrawEngineGLES *drawEngine_; const char *nextChangeReason_; bool nextNeedsRehash_; diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index 850aced4f3..a71267b862 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -414,7 +414,7 @@ GPU_Vulkan::GPU_Vulkan(GraphicsContext *gfxCtx, Draw::DrawContext *draw) textureCacheVulkan_->SetFramebufferManager(framebufferManagerVulkan_); textureCacheVulkan_->SetDepalShaderCache(&depalShaderCache_); textureCacheVulkan_->SetShaderManager(shaderManagerVulkan_); - textureCacheVulkan_->SetTransformDrawEngine(&drawEngine_); + textureCacheVulkan_->SetDrawEngine(&drawEngine_); // Sanity check gstate if ((int *)&gstate.transferstart - (int *)&gstate != 0xEA) { diff --git a/GPU/Vulkan/TextureCacheVulkan.h b/GPU/Vulkan/TextureCacheVulkan.h index 2d80f85f7a..f80cb98b10 100644 --- a/GPU/Vulkan/TextureCacheVulkan.h +++ b/GPU/Vulkan/TextureCacheVulkan.h @@ -111,8 +111,8 @@ public: void SetShaderManager(ShaderManagerVulkan *sm) { shaderManager_ = sm; } - void SetTransformDrawEngine(DrawEngineVulkan *td) { - transformDraw_ = td; + void SetDrawEngine(DrawEngineVulkan *td) { + drawEngine_ = td; } size_t NumLoadedTextures() const { @@ -171,7 +171,7 @@ private: FramebufferManagerVulkan *framebufferManager_; DepalShaderCacheVulkan *depalShaderCache_; ShaderManagerVulkan *shaderManager_; - DrawEngineVulkan *transformDraw_; + DrawEngineVulkan *drawEngine_; const char *nextChangeReason_; bool nextNeedsRehash_;