diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-17 09:26:33 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-17 09:26:33 +0200 |
| commit | c67026f27023008d124c8ab76533169f032b04f6 (patch) | |
| tree | e75c7a43fc700fb11fef8485e4f5138039a8e083 /avmedia | |
| parent | d4fccd7d2c22024800482ff2e3179f700fc83a9f (diff) | |
libgltf: Append shader language version to the shader files
In general glTF shader files does not contain version
directives and in some case it make shader compiler
using GLSL 1.1 which leads to that the shader compiler
fails.
So we need to append the choosen version number which is
GLSL 1.3 in case of libgltf, but this also means that
from that point OpenGL 3.0 is the new reuirements since
GLSL 1.3 is available only from that version.
Change-Id: Ic4382266432ea474aeb3e603b32a998b9aeed280
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 431bdb8bf9dc..ff766e3b3626 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -234,18 +234,7 @@ awt::Size SAL_CALL OGLPlayer::getPreferredPlayerWindowSize() throw ( uno::Runtim static bool lcl_CheckOpenGLRequirements() { - float fVersion = OpenGLHelper::getGLVersion(); - - if( fVersion >= 3.0 ) - { - return true; - } - else if( fVersion >= 2.1 ) - { - return glewIsSupported("GL_ARB_framebuffer_object GL_ARB_vertex_array_object"); - } - - return false; + return OpenGLHelper::getGLVersion() >= 3.0; } uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments ) |