diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-12-11 13:42:52 +0100 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-12-11 15:29:25 +0100 |
commit | 3b397f8a41ccc810ce5048d80b1e3dab827cb093 (patch) | |
tree | 52d7a6133116a3b46641d03c1839b730bcfb297b | |
parent | d9116f2235e1a79c86446fc67231684edac49d82 (diff) |
slideshow: windows build fixes
Change-Id: I9032af7583f0cf97664d2f84d5aead0cb1547c1a
-rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 4 | ||||
-rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 86cc2c729459..ac7cf3bf3da8 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -1921,7 +1921,7 @@ void HoneycombTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlide // The back (entering) slide needs to be drawn before the front (leaving) one in order for blending to work. - const float borderSize = 0.15; + const float borderSize = 0.15f; CHECK_GL_ERROR(); glUniform1f(maSelectedTextureLocation, 0.0); @@ -1956,7 +1956,7 @@ std::shared_ptr<OGLTransitionImpl> makeHoneycomb() const int NY = 21; TransitionSettings aSettings; - aSettings.mnRequiredGLVersion = 3.2; + aSettings.mnRequiredGLVersion = 3.2f; Primitives_t aSlide; Primitive aHexagon; diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx index 2b9daa50b007..d8cbbfeeb102 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx @@ -228,18 +228,18 @@ private: GLint m_nNormalLocation = -1; GLint m_nTexCoordLocation = -1; - GLuint m_nVertexArrayObject = -1; + GLuint m_nVertexArrayObject = 0u; std::vector<int> m_nFirstIndices; protected: /** GLSL program object */ - GLuint m_nProgramObject = 0; + GLuint m_nProgramObject = 0u; /** VBO in which to put primitive data */ - GLuint m_nVertexBufferObject = -1; + GLuint m_nVertexBufferObject = 0u; }; |