Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GLES logging cleanup and unused extension removal #14384

Merged
merged 3 commits into from Sep 3, 2018
Merged

GLES logging cleanup and unused extension removal #14384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b5cdf7
RenderSystemGLES: remove unused extension test
lrusak Sep 2, 2018
fbe7352
RenderSystemGLES: remove logging of extension test
lrusak Sep 2, 2018
13155a6
LinuxRendererGLES: cleanup logging
lrusak Sep 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 15 additions & 17 deletions xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
View file
Open in desktop
Expand Up @@ -55,8 +55,6 @@ CLinuxRendererGLES::CPictureBuffer::~CPictureBuffer() = default;

CLinuxRendererGLES::CLinuxRendererGLES()
{
CLog::Log(LOGINFO, "Constructing CLinuxRendererGLES");

m_textureTarget = GL_TEXTURE_2D;

m_renderMethod = RENDER_GLSL;
Expand Down Expand Up @@ -469,21 +467,21 @@ void CLinuxRendererGLES::UpdateVideoFilter()
{
if (!m_fbo.fbo.Initialize())
{
CLog::Log(LOGERROR, "GL: Error initializing FBO");
CLog::Log(LOGERROR, "GLES: Error initializing FBO");
break;
}

if (!m_fbo.fbo.CreateAndBindToTexture(GL_TEXTURE_2D, m_sourceWidth, m_sourceHeight, GL_RGBA))
{
CLog::Log(LOGERROR, "GL: Error creating texture and binding to FBO");
CLog::Log(LOGERROR, "GLES: Error creating texture and binding to FBO");
break;
}
}

m_pVideoFilterShader = new ConvolutionFilterShader(m_scalingMethod);
if (!m_pVideoFilterShader->CompileAndLink())
{
CLog::Log(LOGERROR, "GL: Error compiling and linking video filter shader");
CLog::Log(LOGERROR, "GLES: Error compiling and linking video filter shader");
break;
}
SetTextureFilter(GL_LINEAR);
Expand All @@ -494,14 +492,14 @@ void CLinuxRendererGLES::UpdateVideoFilter()
case VS_SCALINGMETHOD_LANCZOS_SOFTWARE:
case VS_SCALINGMETHOD_SINC_SOFTWARE:
case VS_SCALINGMETHOD_SINC8:
CLog::Log(LOGERROR, "GL: TODO: This scaler has not yet been implemented");
CLog::Log(LOGERROR, "GLES: TODO: This scaler has not yet been implemented");
break;

default:
break;
}

CLog::Log(LOGERROR, "GL: Falling back to bilinear due to failure to init scaler");
CLog::Log(LOGERROR, "GLES: Falling back to bilinear due to failure to init scaler");
if (m_pVideoFilterShader)
{
delete m_pVideoFilterShader;
Expand All @@ -520,7 +518,7 @@ void CLinuxRendererGLES::LoadShaders(int field)
if (!LoadShadersHook())
{
int requestedMethod = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_VIDEOPLAYER_RENDERMETHOD);
CLog::Log(LOGDEBUG, "GL: Requested render method: %d", requestedMethod);
CLog::Log(LOGDEBUG, "GLES: Requested render method: %d", requestedMethod);

ReleaseShaders();

Expand All @@ -532,7 +530,7 @@ void CLinuxRendererGLES::LoadShaders(int field)
if (glCreateProgram())
{
// create regular scan shader
CLog::Log(LOGNOTICE, "GL: Selecting Single Pass YUV 2 RGB shader");
CLog::Log(LOGNOTICE, "GLES: Selecting Single Pass YUV 2 RGB shader");

EShaderFormat shaderFormat = GetShaderFormat();
m_pYUVProgShader = new YUV2RGBProgressiveShader(m_iFlags, shaderFormat);
Expand All @@ -550,7 +548,7 @@ void CLinuxRendererGLES::LoadShaders(int field)
else
{
ReleaseShaders();
CLog::Log(LOGERROR, "GL: Error enabling YUV2RGB GLSL shader");
CLog::Log(LOGERROR, "GLES: Error enabling YUV2RGB GLSL shader");
m_renderMethod = -1;
break;
}
Expand All @@ -559,7 +557,7 @@ void CLinuxRendererGLES::LoadShaders(int field)
default:
{
m_renderMethod = -1 ;
CLog::Log(LOGERROR, "GL: render method not supported");
CLog::Log(LOGERROR, "GLES: render method not supported");
}
}
}
Expand Down Expand Up @@ -588,7 +586,7 @@ void CLinuxRendererGLES::ReleaseShaders()

void CLinuxRendererGLES::UnInit()
{
CLog::Log(LOGDEBUG, "LinuxRendererGL: Cleaning up GL resources");
CLog::Log(LOGDEBUG, "LinuxRendererGLES: Cleaning up GLES resources");
CSingleLock lock(CServiceBroker::GetWinSystem()->GetGfxContext());

glFinish();
Expand Down Expand Up @@ -810,12 +808,12 @@ void CLinuxRendererGLES::RenderToFBO(int index, int field, bool weave /*= false*
{
if (!m_fbo.fbo.Initialize())
{
CLog::Log(LOGERROR, "GL: Error initializing FBO");
CLog::Log(LOGERROR, "GLES: Error initializing FBO");
return;
}
if (!m_fbo.fbo.CreateAndBindToTexture(GL_TEXTURE_2D, m_sourceWidth, m_sourceHeight, GL_RGBA))
{
CLog::Log(LOGERROR, "GL: Error creating texture and binding to FBO");
CLog::Log(LOGERROR, "GLES: Error creating texture and binding to FBO");
return;
}
}
Expand Down Expand Up @@ -844,7 +842,7 @@ void CLinuxRendererGLES::RenderToFBO(int index, int field, bool weave /*= false*
// make sure the yuv shader is loaded and ready to go
if (!pYUVShader || (!pYUVShader->OK()))
{
CLog::Log(LOGERROR, "GL: YUV shader not active, cannot do multipass render");
CLog::Log(LOGERROR, "GLES: YUV shader not active, cannot do multipass render");
return;
}

Expand Down Expand Up @@ -880,7 +878,7 @@ void CLinuxRendererGLES::RenderToFBO(int index, int field, bool weave /*= false*

if (!pYUVShader->Enable())
{
CLog::Log(LOGERROR, "GL: Error enabling YUV shader");
CLog::Log(LOGERROR, "GLES: Error enabling YUV shader");
}

m_fbo.width = planes[0].rect.x2 - planes[0].rect.x1;
Expand Down Expand Up @@ -1235,7 +1233,7 @@ bool CLinuxRendererGLES::CreateYV12Texture(int index)
format = GL_LUMINANCE;
internalformat = GetInternalFormat(format, im.bpp);

CLog::Log(LOGDEBUG, "GL: Creating YUV NPOT texture of size %d x %d", plane.texwidth, plane.texheight);
CLog::Log(LOGDEBUG, "GLES: Creating YUV NPOT texture of size %d x %d", plane.texwidth, plane.texheight);

glTexImage2D(m_textureTarget, 0, internalformat, plane.texwidth, plane.texheight, 0, format, GL_UNSIGNED_BYTE, NULL);

Expand Down
14 changes: 1 addition & 13 deletions xbmc/rendering/gles/RenderSystemGLES.cpp
View file
Open in desktop
Expand Up @@ -183,26 +183,14 @@ bool CRenderSystemGLES::IsExtSupported(const char* extension) const
// GLES has FBO as a core element, not an extension!
return true;
}
else if (strcmp( extension, "GL_TEXTURE_NPOT" ) == 0)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

{
// GLES supports non-power-of-two textures as standard.
return true;
/* Note: The wrap mode can only be GL_CLAMP_TO_EDGE and the minification filter can only be
* GL_NEAREST or GL_LINEAR (in other words, not mipmapped). The extension GL_OES_texture_npot
* relaxes these restrictions and allows wrap modes of GL_REPEAT and GL_MIRRORED_REPEAT and
* also allows npot textures to be mipmapped with the full set of minification filters
*/
}
else
{
std::string name;
name = " ";
name += extension;
name += " ";

bool supported = m_RenderExtensions.find(name) != std::string::npos;
CLog::Log(LOGDEBUG, "GLES: Extension Support Test - %s %s", extension, supported ? "YES" : "NO");
return supported;
return m_RenderExtensions.find(name) != std::string::npos;
}
}

Expand Down