Skip to content

Commit

Permalink
Merge pull request #14031 from MaxKellermann/rendersystem_methods
Browse files Browse the repository at this point in the history 
Remove unused Rendersystem methods
  • Loading branch information
@FernetMenta
FernetMenta committed Jun 14, 2018
2 parents 47419b9 + 5451983 commit 2c21462
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 131 deletions.
4 changes: 0 additions & 4 deletions xbmc/rendering/RenderSystem.h
View file
Expand Up @@ -66,16 +66,12 @@ class CRenderSystemBase
virtual void ApplyStateBlock() = 0;

virtual void SetCameraPosition(const CPoint &camera, int screenWidth, int screenHeight, float stereoFactor = 0.f) = 0;
virtual void ApplyHardwareTransform(const TransformMatrix &matrix) = 0;
virtual void RestoreHardwareTransform() = 0;
virtual void SetStereoMode(RENDER_STEREO_MODE mode, RENDER_STEREO_VIEW view)
{
m_stereoMode = mode;
m_stereoView = view;
}

virtual bool TestRender() = 0;

/**
* Project (x,y,z) 3d scene coordinates to (x,y) 2d screen coordinates
*/
Expand Down
5 changes: 0 additions & 5 deletions xbmc/rendering/dx/RenderSystemDX.cpp
View file
Expand Up @@ -462,11 +462,6 @@ CRect CRenderSystemDX::GetBackBufferRect()
return CRect(0.f, 0.f, static_cast<float>(outputSize.Width), static_cast<float>(outputSize.Height));
}

bool CRenderSystemDX::TestRender()
{
return true;
}

void CRenderSystemDX::GetViewPort(CRect& viewPort)
{
if (!m_bRenderCreated)
Expand Down
3 changes: 0 additions & 3 deletions xbmc/rendering/dx/RenderSystemDX.h
View file
Expand Up @@ -66,7 +66,6 @@ class CRenderSystemDX : public CRenderSystemBase, DX::IDeviceNotify
void SetCameraPosition(const CPoint &camera, int screenWidth, int screenHeight, float stereoFactor = 0.f) override;
void SetStereoMode(RENDER_STEREO_MODE mode, RENDER_STEREO_VIEW view) override;
bool SupportsStereo(RENDER_STEREO_MODE mode) const override;
bool TestRender() override;
void Project(float &x, float &y, float &z) override;
bool SupportsNPOT(bool dxt) const override;

Expand All @@ -88,8 +87,6 @@ class CRenderSystemDX : public CRenderSystemBase, DX::IDeviceNotify

// empty overrides
bool IsExtSupported(const char* extension) const override { return false; };
void ApplyHardwareTransform(const TransformMatrix &matrix) override {};
void RestoreHardwareTransform() override {};
bool ResetRenderSystem(int width, int height) override { return true; };

std::vector<AVPixelFormat> m_processorFormats;
Expand Down
36 changes: 0 additions & 36 deletions xbmc/rendering/gl/RenderSystemGL.cpp
View file
Expand Up @@ -378,42 +378,6 @@ void CRenderSystemGL::Project(float &x, float &y, float &z)
}
}

bool CRenderSystemGL::TestRender()
{
static float theta = 0.0;

glPushMatrix();
glRotatef( theta, 0.0f, 0.0f, 1.0f );
glBegin( GL_TRIANGLES );
glColor3f( 1.0f, 0.0f, 0.0f ); glVertex2f( 0.0f, 1.0f );
glColor3f( 0.0f, 1.0f, 0.0f ); glVertex2f( 0.87f, -0.5f );
glColor3f( 0.0f, 0.0f, 1.0f ); glVertex2f( -0.87f, -0.5f );
glEnd();
glPopMatrix();

theta += 1.0f;

return true;
}

void CRenderSystemGL::ApplyHardwareTransform(const TransformMatrix &finalMatrix)
{
if (!m_bRenderCreated)
return;

glMatrixModview.Push();
glMatrixModview->MultMatrixf(finalMatrix);
glMatrixModview.Load();
}

void CRenderSystemGL::RestoreHardwareTransform()
{
if (!m_bRenderCreated)
return;

glMatrixModview.PopLoad();
}

void CRenderSystemGL::CalculateMaxTexturesize()
{
GLint width = 256;
Expand Down
4 changes: 0 additions & 4 deletions xbmc/rendering/gl/RenderSystemGL.h
View file
Expand Up @@ -67,14 +67,10 @@ class CRenderSystemGL : public CRenderSystemBase

void SetCameraPosition(const CPoint &camera, int screenWidth, int screenHeight, float stereoFactor = 0.0f) override;

void ApplyHardwareTransform(const TransformMatrix &matrix) override;
void RestoreHardwareTransform() override;
void SetStereoMode(RENDER_STEREO_MODE mode, RENDER_STEREO_VIEW view) override;
bool SupportsStereo(RENDER_STEREO_MODE mode) const override;
bool SupportsNPOT(bool dxt) const override;

bool TestRender() override;

void Project(float &x, float &y, float &z) override;

std::string GetShaderPath(const std::string &filename) override;
Expand Down
63 changes: 0 additions & 63 deletions xbmc/rendering/gles/RenderSystemGLES.cpp
View file
Expand Up @@ -321,69 +321,6 @@ void CRenderSystemGLES::Project(float &x, float &y, float &z)
}
}

bool CRenderSystemGLES::TestRender()
{
static float theta = 0.0;

//RESOLUTION_INFO resInfo = CDisplaySettings::GetInstance().GetCurrentResolutionInfo();
//glViewport(0, 0, resInfo.iWidth, resInfo.iHeight);

glMatrixModview.Push();
glMatrixModview->Rotatef( theta, 0.0f, 0.0f, 1.0f );

EnableGUIShader(SM_DEFAULT);

GLfloat col[4] = {1.0f, 0.0f, 0.0f, 1.0f};
GLfloat ver[3][2];
GLint posLoc = GUIShaderGetPos();
GLint colLoc = GUIShaderGetCol();

glVertexAttribPointer(posLoc, 2, GL_FLOAT, 0, 0, ver);
glVertexAttribPointer(colLoc, 4, GL_FLOAT, 0, 0, col);

glEnableVertexAttribArray(posLoc);
glEnableVertexAttribArray(colLoc);

// Setup vertex position values
ver[0][0] = 0.0f;
ver[0][1] = 1.0f;
ver[1][0] = 0.87f;
ver[1][1] = -0.5f;
ver[2][0] = -0.87f;
ver[2][1] = -0.5f;

glDrawArrays(GL_TRIANGLES, 0, 3);

glDisableVertexAttribArray(posLoc);
glDisableVertexAttribArray(colLoc);

DisableGUIShader();

glMatrixModview.Pop();

theta += 1.0f;

return true;
}

void CRenderSystemGLES::ApplyHardwareTransform(const TransformMatrix &finalMatrix)
{
if (!m_bRenderCreated)
return;

glMatrixModview.Push();
glMatrixModview->MultMatrixf(finalMatrix);
glMatrixModview.Load();
}

void CRenderSystemGLES::RestoreHardwareTransform()
{
if (!m_bRenderCreated)
return;

glMatrixModview.PopLoad();
}

void CRenderSystemGLES::CalculateMaxTexturesize()
{
// GLES cannot do PROXY textures to determine maximum size,
Expand Down
4 changes: 0 additions & 4 deletions xbmc/rendering/gles/RenderSystemGLES.h
View file
Expand Up @@ -73,12 +73,8 @@ class CRenderSystemGLES : public CRenderSystemBase

void SetCameraPosition(const CPoint &camera, int screenWidth, int screenHeight, float stereoFactor = 0.0f) override;

void ApplyHardwareTransform(const TransformMatrix &matrix) override;
void RestoreHardwareTransform() override;
bool SupportsStereo(RENDER_STEREO_MODE mode) const override;

bool TestRender() override;

void Project(float &x, float &y, float &z) override;

std::string GetShaderPath(const std::string &filename) override { return "GLES/2.0/"; }
Expand Down
10 changes: 0 additions & 10 deletions xbmc/windowing/GraphicContext.cpp
View file
Expand Up @@ -1160,16 +1160,6 @@ void CGraphicContext::Flip(bool rendered, bool videoLayer)
}
}

void CGraphicContext::ApplyHardwareTransform()
{
CServiceBroker::GetRenderSystem()->ApplyHardwareTransform(m_finalTransform.matrix);
}

void CGraphicContext::RestoreHardwareTransform()
{
CServiceBroker::GetRenderSystem()->RestoreHardwareTransform();
}

void CGraphicContext::GetAllowedResolutions(std::vector<RESOLUTION> &res)
{
res.clear();
Expand Down
2 changes: 0 additions & 2 deletions xbmc/windowing/GraphicContext.h
View file
Expand Up @@ -170,8 +170,6 @@ class CGraphicContext : public CCriticalSection
*/
bool SetClipRegion(float x, float y, float w, float h);
void RestoreClipRegion();
void ApplyHardwareTransform();
void RestoreHardwareTransform();
void ClipRect(CRect &vertex, CRect &texture, CRect *diffuse = NULL);
CRect GetClipRegion();
void AddGUITransform();
Expand Down

0 comments on commit 2c21462

Please sign in to comment.