diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-13 02:01:52 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-13 02:01:52 +0200 |
| commit | 3c99db4ca0405ab74f0e327ef9444c6cfdb7fc5b (patch) | |
| tree | ba60ff1e83dc3f12c99ec1e3a45c6819ff7e1510 /slideshow | |
| parent | b4ed7cc37eb50380b3eccfba12edf08805dc25b5 (diff) | |
fix problems around shaders
Change-Id: I1577fb81cb3cf1fac3f5ba5d560d96cb83d4483d
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/Module_slideshow.mk | 1 | ||||
| -rw-r--r-- | slideshow/Package_opengl.mk | 6 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/slideshow/Module_slideshow.mk b/slideshow/Module_slideshow.mk index 3959028f211c..5d9978b09825 100644 --- a/slideshow/Module_slideshow.mk +++ b/slideshow/Module_slideshow.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,slideshow)) $(eval $(call gb_Module_add_targets,slideshow,\ $(if $(filter TRUE,$(ENABLE_OPENGL)),Library_OGLTrans) \ Library_slideshow \ + Package_opengl \ )) # not working diff --git a/slideshow/Package_opengl.mk b/slideshow/Package_opengl.mk index 866bfd0b94a8..a7e9a8cead73 100644 --- a/slideshow/Package_opengl.mk +++ b/slideshow/Package_opengl.mk @@ -10,9 +10,9 @@ $(eval $(call gb_Package_Package,slideshow_opengl_shader,$(SRCDIR)/slideshow/opengl)) $(eval $(call gb_Package_add_files,slideshow_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\ - slideshow/opengl/basicVertexShader.glsl \ - slideshow/opengl/dissolveFragmentShader.glsl \ - slideshow/opengl/staticFragmentShader.glsl \ + basicVertexShader.glsl \ + dissolveFragmentShader.glsl \ + staticFragmentShader.glsl \ )) # vim: set noet sw=4 ts=4: diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 63d5753ecc18..222590c74fcb 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -1473,7 +1473,7 @@ private: GLuint StaticNoiseTransition::makeShader_() { - return OpenGLHelper::LoadShaders( "basicVertexShader.glsl", "staticFragmentShader.glsl" ); + return OpenGLHelper::LoadShaders( "basicVertexShader", "staticFragmentShader" ); } shared_ptr<OGLTransitionImpl> @@ -1524,7 +1524,7 @@ private: GLuint DissolveTransition::makeShader_() { - return OpenGLHelper::LoadShaders( "basicVertexShader.glsl", "dissolveFragmentShader.glsl" ); + return OpenGLHelper::LoadShaders( "basicVertexShader", "dissolveFragmentShader" ); } shared_ptr<OGLTransitionImpl> |