Kaydet (Commit) 3c99db4c authored tarafından Markus Mohrhard's avatar Markus Mohrhard

fix problems around shaders

Change-Id: I1577fb81cb3cf1fac3f5ba5d560d96cb83d4483d
üst b4ed7cc3
...@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,slideshow)) ...@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,slideshow))
$(eval $(call gb_Module_add_targets,slideshow,\ $(eval $(call gb_Module_add_targets,slideshow,\
$(if $(filter TRUE,$(ENABLE_OPENGL)),Library_OGLTrans) \ $(if $(filter TRUE,$(ENABLE_OPENGL)),Library_OGLTrans) \
Library_slideshow \ Library_slideshow \
Package_opengl \
)) ))
# not working # not working
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
$(eval $(call gb_Package_Package,slideshow_opengl_shader,$(SRCDIR)/slideshow/opengl)) $(eval $(call gb_Package_Package,slideshow_opengl_shader,$(SRCDIR)/slideshow/opengl))
$(eval $(call gb_Package_add_files,slideshow_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\ $(eval $(call gb_Package_add_files,slideshow_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\
slideshow/opengl/basicVertexShader.glsl \ basicVertexShader.glsl \
slideshow/opengl/dissolveFragmentShader.glsl \ dissolveFragmentShader.glsl \
slideshow/opengl/staticFragmentShader.glsl \ staticFragmentShader.glsl \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -1473,7 +1473,7 @@ private: ...@@ -1473,7 +1473,7 @@ private:
GLuint StaticNoiseTransition::makeShader_() GLuint StaticNoiseTransition::makeShader_()
{ {
return OpenGLHelper::LoadShaders( "basicVertexShader.glsl", "staticFragmentShader.glsl" ); return OpenGLHelper::LoadShaders( "basicVertexShader", "staticFragmentShader" );
} }
shared_ptr<OGLTransitionImpl> shared_ptr<OGLTransitionImpl>
...@@ -1524,7 +1524,7 @@ private: ...@@ -1524,7 +1524,7 @@ private:
GLuint DissolveTransition::makeShader_() GLuint DissolveTransition::makeShader_()
{ {
return OpenGLHelper::LoadShaders( "basicVertexShader.glsl", "dissolveFragmentShader.glsl" ); return OpenGLHelper::LoadShaders( "basicVertexShader", "dissolveFragmentShader" );
} }
shared_ptr<OGLTransitionImpl> shared_ptr<OGLTransitionImpl>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment