- removed RequireGLNodes from FRenderer interface.

It returned true for both renderers anyway.
This commit is contained in:
Christoph Oelckers 2018-03-31 00:33:09 +02:00
parent 6cd26dec01
commit 5bdea6278c
5 changed files with 1 additions and 14 deletions

View file

@ -1010,7 +1010,6 @@ struct FGLInterface : public FRenderer
void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, double fov) override; void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, double fov) override;
void PreprocessLevel() override; void PreprocessLevel() override;
void CleanLevelData() override; void CleanLevelData() override;
bool RequireGLNodes() override;
int GetMaxViewPitch(bool down) override; int GetMaxViewPitch(bool down) override;
void SetClearColor(int color) override; void SetClearColor(int color) override;
@ -1178,11 +1177,6 @@ void FGLInterface::CleanLevelData()
gl_CleanLevelData(); gl_CleanLevelData();
} }
bool FGLInterface::RequireGLNodes()
{
return true;
}
uint32_t FGLInterface::GetCaps() uint32_t FGLInterface::GetCaps()
{ {
// describe our basic feature set // describe our basic feature set

View file

@ -3639,7 +3639,7 @@ void P_SetupLevel (const char *lumpname, int position)
// This is motivated as follows: // This is motivated as follows:
bool RequireGLNodes = Renderer->RequireGLNodes() || am_textured; bool RequireGLNodes = true; // Even the software renderer needs GL nodes now.
for (i = 0; i < (int)countof(times); ++i) for (i = 0; i < (int)countof(times); ++i)
{ {

View file

@ -52,7 +52,6 @@ struct FRenderer
virtual void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) = 0; virtual void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) = 0;
virtual void PreprocessLevel() {} virtual void PreprocessLevel() {}
virtual void CleanLevelData() {} virtual void CleanLevelData() {}
virtual bool RequireGLNodes() { return false; }
virtual uint32_t GetCaps() { return 0; } virtual uint32_t GetCaps() { return 0; }
}; };

View file

@ -255,11 +255,6 @@ int FSoftwareRenderer::GetMaxViewPitch(bool down)
return (r_polyrenderer) ? int(maxviewpitch) : (down ? MAX_DN_ANGLE : ((cl_oldfreelooklimit) ? MAX_UP_ANGLE : MAX_DN_ANGLE)); return (r_polyrenderer) ? int(maxviewpitch) : (down ? MAX_DN_ANGLE : ((cl_oldfreelooklimit) ? MAX_UP_ANGLE : MAX_DN_ANGLE));
} }
bool FSoftwareRenderer::RequireGLNodes()
{
return true;
}
void FSoftwareRenderer::OnModeSet () void FSoftwareRenderer::OnModeSet ()
{ {
mScene.ScreenResized(); mScene.ScreenResized();

View file

@ -25,7 +25,6 @@ struct FSoftwareRenderer : public FRenderer
void DrawRemainingPlayerSprites() override; void DrawRemainingPlayerSprites() override;
int GetMaxViewPitch(bool down) override; int GetMaxViewPitch(bool down) override;
bool RequireGLNodes() override;
void OnModeSet() override; void OnModeSet() override;
void SetClearColor(int color) override; void SetClearColor(int color) override;