zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed redundant TextureFilterChanged method from DFrameBuffer.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-29 11:53:37 +02:00
parent 5861fdd4bd
commit b60fd4d8bc
8 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/rendering/gl/gl_framebuffer.cpp
View file

@ -340,11 +340,6 @@ IDataBuffer *OpenGLFrameBuffer::CreateDataBuffer(int bindingpoint, bool ssbo, bo
return new GLDataBuffer(bindingpoint, ssbo); return new GLDataBuffer(bindingpoint, ssbo);
} }
void OpenGLFrameBuffer::TextureFilterChanged()
{
if (GLRenderer != NULL && GLRenderer->mSamplerManager != NULL) GLRenderer->mSamplerManager->SetTextureFilterMode();
}
void OpenGLFrameBuffer::BlurScene(float amount) void OpenGLFrameBuffer::BlurScene(float amount)
{ {
GLRenderer->BlurScene(amount); GLRenderer->BlurScene(amount);

1
src/common/rendering/gl/gl_framebuffer.h
View file

@ -43,7 +43,6 @@ public:
void SetTextureFilterMode() override; void SetTextureFilterMode() override;
IHardwareTexture *CreateHardwareTexture(int numchannels) override; IHardwareTexture *CreateHardwareTexture(int numchannels) override;
void PrecacheMaterial(FMaterial *mat, int translation) override; void PrecacheMaterial(FMaterial *mat, int translation) override;
void TextureFilterChanged() override;
void BeginFrame() override; void BeginFrame() override;
void SetViewportRects(IntRect *bounds) override; void SetViewportRects(IntRect *bounds) override;
void BlurScene(float amount) override; void BlurScene(float amount) override;

4
src/common/rendering/hwrenderer/data/hw_cvars.cpp
View file

@ -121,13 +121,13 @@ CVAR(Int, gl_satformula, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
//========================================================================== //==========================================================================
CUSTOM_CVARD(Float, gl_texture_filter_anisotropic, 8, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL, "changes the OpenGL texture anisotropy setting") CUSTOM_CVARD(Float, gl_texture_filter_anisotropic, 8, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL, "changes the OpenGL texture anisotropy setting")
{ {
screen->TextureFilterChanged(); screen->SetTextureFilterMode();
} }
CUSTOM_CVARD(Int, gl_texture_filter, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL, "changes the texture filtering settings") CUSTOM_CVARD(Int, gl_texture_filter, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL, "changes the texture filtering settings")
{ {
if (self < 0 || self > 6) self=4; if (self < 0 || self > 6) self=4;
screen->TextureFilterChanged(); screen->SetTextureFilterMode();
} }
CVAR(Bool, gl_precache, false, CVAR_ARCHIVE) CVAR(Bool, gl_precache, false, CVAR_ARCHIVE)

5
src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp
View file

@ -329,11 +329,6 @@ IDataBuffer *PolyFrameBuffer::CreateDataBuffer(int bindingpoint, bool ssbo, bool
} }
void PolyFrameBuffer::SetTextureFilterMode() void PolyFrameBuffer::SetTextureFilterMode()
{
TextureFilterChanged();
}
void PolyFrameBuffer::TextureFilterChanged()
{ {
} }

1
src/common/rendering/polyrenderer/backend/poly_framebuffer.h
View file

@ -37,7 +37,6 @@ public:
void PrecacheMaterial(FMaterial *mat, int translation) override; void PrecacheMaterial(FMaterial *mat, int translation) override;
void UpdatePalette() override; void UpdatePalette() override;
void SetTextureFilterMode() override; void SetTextureFilterMode() override;
void TextureFilterChanged() override;
void BeginFrame() override; void BeginFrame() override;
void BlurScene(float amount) override; void BlurScene(float amount) override;
void PostProcessScene(bool swscene, int fixedcm, const std::function<void()> &afterBloomDrawEndScene2D) override; void PostProcessScene(bool swscene, int fixedcm, const std::function<void()> &afterBloomDrawEndScene2D) override;

1
src/common/rendering/v_video.h
View file

@ -200,7 +200,6 @@ public:
virtual IHardwareTexture *CreateHardwareTexture(int numchannels) { return nullptr; } virtual IHardwareTexture *CreateHardwareTexture(int numchannels) { return nullptr; }
virtual void PrecacheMaterial(FMaterial *mat, int translation) {} virtual void PrecacheMaterial(FMaterial *mat, int translation) {}
virtual FMaterial* CreateMaterial(FGameTexture* tex, int scaleflags); virtual FMaterial* CreateMaterial(FGameTexture* tex, int scaleflags);
virtual void TextureFilterChanged() {}
virtual void BeginFrame() {} virtual void BeginFrame() {}
virtual void SetWindowSize(int w, int h) {} virtual void SetWindowSize(int w, int h) {}
virtual void StartPrecaching() {} virtual void StartPrecaching() {}

5
src/common/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -419,11 +419,6 @@ IDataBuffer *VulkanFrameBuffer::CreateDataBuffer(int bindingpoint, bool ssbo, bo
} }
void VulkanFrameBuffer::SetTextureFilterMode() void VulkanFrameBuffer::SetTextureFilterMode()
{
TextureFilterChanged();
}
void VulkanFrameBuffer::TextureFilterChanged()
{ {
if (mSamplerManager) if (mSamplerManager)
{ {

1
src/common/rendering/vulkan/system/vk_framebuffer.h
View file

@ -77,7 +77,6 @@ public:
const char* DeviceName() const override; const char* DeviceName() const override;
int Backend() override { return 1; } int Backend() override { return 1; }
void SetTextureFilterMode() override; void SetTextureFilterMode() override;
void TextureFilterChanged() override;
void StartPrecaching() override; void StartPrecaching() override;
void BeginFrame() override; void BeginFrame() override;
void BlurScene(float amount) override; void BlurScene(float amount) override;