slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WMF: fix video rendering with ANGLE.

Browse Source 
The format of the offscreen surface used for video rendering should be
compatible with the EGL config.

Change-Id: Ic016245ce80c2483771e620c3eed345262d03c44
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Yoann Lopes
2014-09-23 16:47:17 +02:00
parent f788f8e5c6
commit 78dccc998f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/wmf/evrd3dpresentengine.cpp
View File

@@ -419,18 +419,19 @@ void D3DPresentEngine::createOffscreenTexture()
QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
m_eglDisplay = static_cast<EGLDisplay*>( m_eglDisplay = static_cast<EGLDisplay*>(
nativeInterface->nativeResourceForContext("eglDisplay", currentContext)); nativeInterface->nativeResourceForContext("eglDisplay", currentContext));
m_eglConfig = static_cast<EGLDisplay*>( m_eglConfig = static_cast<EGLConfig*>(
nativeInterface->nativeResourceForContext("eglConfig", currentContext)); nativeInterface->nativeResourceForContext("eglConfig", currentContext));
currentContext->functions()->glGenTextures(1, &m_glTexture); currentContext->functions()->glGenTextures(1, &m_glTexture);
int w = m_surfaceFormat.frameWidth(); int w = m_surfaceFormat.frameWidth();
int h = m_surfaceFormat.frameHeight(); int h = m_surfaceFormat.frameHeight();
bool hasAlpha = currentContext->format().hasAlpha();
EGLint attribs[] = { EGLint attribs[] = {
EGL_WIDTH, w, EGL_WIDTH, w,
EGL_HEIGHT, h, EGL_HEIGHT, h,
EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGB, EGL_TEXTURE_FORMAT, hasAlpha ? EGL_TEXTURE_RGBA : EGL_TEXTURE_RGB,
EGL_TEXTURE_TARGET, EGL_TEXTURE_2D, EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
EGL_NONE EGL_NONE
}; };
@@ -449,7 +450,7 @@ void D3DPresentEngine::createOffscreenTexture()
m_device->CreateTexture(w, h, 1, m_device->CreateTexture(w, h, 1,
D3DUSAGE_RENDERTARGET, D3DUSAGE_RENDERTARGET,
D3DFMT_X8R8G8B8, hasAlpha ? D3DFMT_A8R8G8B8 : D3DFMT_X8R8G8B8,
D3DPOOL_DEFAULT, D3DPOOL_DEFAULT,
&m_texture, &m_texture,
&share_handle); &share_handle);