diff options
-rw-r--r-- | xbmc/guilib/TextureGL.cpp | 5 | ||||
-rw-r--r-- | xbmc/rendering/RenderSystem.cpp | 10 | ||||
-rw-r--r-- | xbmc/rendering/RenderSystem.h | 4 | ||||
-rw-r--r-- | xbmc/rendering/gles/RenderSystemGLES.cpp | 18 |
4 files changed, 3 insertions, 34 deletions
diff --git a/xbmc/guilib/TextureGL.cpp b/xbmc/guilib/TextureGL.cpp index ac49d18461..02582c6174 100644 --- a/xbmc/guilib/TextureGL.cpp +++ b/xbmc/guilib/TextureGL.cpp @@ -183,11 +183,12 @@ void CGLTexture::LoadToGPU() internalformat = pixelformat = GL_RGB; break; case XB_FMT_A8R8G8B8: - if (CServiceBroker::GetRenderSystem().SupportsBGRA()) + if (CServiceBroker::GetRenderSystem().IsExtSupported("GL_EXT_texture_format_BGRA8888") || + CServiceBroker::GetRenderSystem().IsExtSupported("GL_IMG_texture_format_BGRA8888")) { internalformat = pixelformat = GL_BGRA_EXT; } - else if (CServiceBroker::GetRenderSystem().SupportsBGRAApple()) + else if (CServiceBroker::GetRenderSystem().IsExtSupported("GL_APPLE_texture_format_BGRA8888")) { // Apple's implementation does not conform to spec. Instead, they require // differing format/internalformat, more like GL. diff --git a/xbmc/rendering/RenderSystem.cpp b/xbmc/rendering/RenderSystem.cpp index 93c2decc34..d35dafbcb4 100644 --- a/xbmc/rendering/RenderSystem.cpp +++ b/xbmc/rendering/RenderSystem.cpp @@ -59,16 +59,6 @@ bool CRenderSystemBase::SupportsDXT() const return (m_renderCaps & RENDER_CAPS_DXT) == RENDER_CAPS_DXT; } -bool CRenderSystemBase::SupportsBGRA() const -{ - return (m_renderCaps & RENDER_CAPS_BGRA) == RENDER_CAPS_BGRA; -} - -bool CRenderSystemBase::SupportsBGRAApple() const -{ - return (m_renderCaps & RENDER_CAPS_BGRA_APPLE) == RENDER_CAPS_BGRA_APPLE; -} - bool CRenderSystemBase::SupportsStereo(RENDER_STEREO_MODE mode) const { switch(mode) diff --git a/xbmc/rendering/RenderSystem.h b/xbmc/rendering/RenderSystem.h index 50d24b7fe3..be7709f8e5 100644 --- a/xbmc/rendering/RenderSystem.h +++ b/xbmc/rendering/RenderSystem.h @@ -48,8 +48,6 @@ enum RENDER_CAPS_DXT = (1 << 0), RENDER_CAPS_NPOT = (1 << 1), RENDER_CAPS_DXT_NPOT = (1 << 2), - RENDER_CAPS_BGRA = (1 << 3), - RENDER_CAPS_BGRA_APPLE = (1 << 4) }; class CGUIImage; @@ -109,8 +107,6 @@ public: const std::string& GetRenderRenderer() const { return m_RenderRenderer; } const std::string& GetRenderVersionString() const { return m_RenderVersion; } bool SupportsDXT() const; - bool SupportsBGRA() const; - bool SupportsBGRAApple() const; bool SupportsNPOT(bool dxt) const; virtual bool SupportsStereo(RENDER_STEREO_MODE mode) const; unsigned int GetMaxTextureSize() const { return m_maxTextureSize; } diff --git a/xbmc/rendering/gles/RenderSystemGLES.cpp b/xbmc/rendering/gles/RenderSystemGLES.cpp index 22f818fe42..5afa6683ac 100644 --- a/xbmc/rendering/gles/RenderSystemGLES.cpp +++ b/xbmc/rendering/gles/RenderSystemGLES.cpp @@ -52,7 +52,6 @@ bool CRenderSystemGLES::InitRenderSystem() m_bVSync = false; m_iVSyncMode = 0; m_bVsyncInit = false; - m_renderCaps = 0; // Get the GLES version number m_RenderVersionMajor = 0; m_RenderVersionMinor = 0; @@ -89,23 +88,6 @@ bool CRenderSystemGLES::InitRenderSystem() LogGraphicsInfo(); - m_renderCaps |= RENDER_CAPS_NPOT; - - if (IsExtSupported("GL_EXT_texture_format_BGRA8888")) - { - m_renderCaps |= RENDER_CAPS_BGRA; - } - - if (IsExtSupported("GL_IMG_texture_format_BGRA8888")) - { - m_renderCaps |= RENDER_CAPS_BGRA; - } - - if (IsExtSupported("GL_APPLE_texture_format_BGRA8888")) - { - m_renderCaps |= RENDER_CAPS_BGRA_APPLE; - } - m_bRenderCreated = true; InitialiseShader(); |