diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-17 09:26:33 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-17 16:17:49 -0500 |
| commit | 25459cb0c9afdf46c3d90ae8ba0b6ffb375f67da (patch) | |
| tree | 570b2d40f8ea03acff30ad327660662d74c5ba4a /avmedia | |
| parent | bc348d6fef453c268093092e29bf671208c06b48 (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.
(cherry picked from commit c67026f27023008d124c8ab76533169f032b04f6)
Conflicts:
external/libgltf/UnpackedTarball_libgltf.mk
Change-Id: Ic4382266432ea474aeb3e603b32a998b9aeed280
Reviewed-on: https://gerrit.libreoffice.org/10947
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
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 ba7e9f2b4d93..a052dc9a3a5e 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -241,18 +241,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 ) |