[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/Module_vcl.mk vcl/opengl

[Markus Mohrhard]

 vcl/Module_vcl.mk                           |    3 +--
 vcl/opengl/maskFragmentShader.glsl          |    2 +-
 vcl/opengl/maskVertexShader.glsl            |    2 +-
 vcl/opengl/maskedTextureFragmentShader.glsl |    2 +-
 vcl/opengl/maskedTextureVertexShader.glsl   |    2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit f9db3b7b56564908f61f90a1287fd9bc2aefe5d2
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Nov 7 00:58:09 2014 +0100

    remove semicolon at the end of main in shader files
    
    Change-Id: Ic34bd301c72185a2b0baa3473df0f80477a35cc3

diff --git a/vcl/opengl/maskFragmentShader.glsl b/vcl/opengl/maskFragmentShader.glsl
index 35ecbd0..4a8204e 100644
--- a/vcl/opengl/maskFragmentShader.glsl
+++ b/vcl/opengl/maskFragmentShader.glsl
@@ -16,6 +16,6 @@ void main() {
    vec4 texel0;
    texel0 = texture2D(sampler, tex_coord);
    gl_FragColor = color * texel0.a;
-};
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/opengl/maskVertexShader.glsl b/vcl/opengl/maskVertexShader.glsl
index 303ddec..99d7f37 100644
--- a/vcl/opengl/maskVertexShader.glsl
+++ b/vcl/opengl/maskVertexShader.glsl
@@ -14,6 +14,6 @@ varying vec2 tex_coord;
 void main() {
    gl_Position = position;
    tex_coord = tex_coord_in;
-};
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/opengl/maskedTextureFragmentShader.glsl b/vcl/opengl/maskedTextureFragmentShader.glsl
index 5353250..a961f12 100644
--- a/vcl/opengl/maskedTextureFragmentShader.glsl
+++ b/vcl/opengl/maskedTextureFragmentShader.glsl
@@ -17,6 +17,6 @@ void main() {
    texel0 = texture2D(sampler, tex_coord);
    texel1 = texture2D(mask, tex_coord);
    gl_FragColor = texel0 * texel1.a;
-};
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/opengl/maskedTextureVertexShader.glsl b/vcl/opengl/maskedTextureVertexShader.glsl
index 303ddec..99d7f37 100644
--- a/vcl/opengl/maskedTextureVertexShader.glsl
+++ b/vcl/opengl/maskedTextureVertexShader.glsl
@@ -14,6 +14,6 @@ varying vec2 tex_coord;
 void main() {
    gl_Position = position;
    tex_coord = tex_coord_in;
-};
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7a842d8df5702b52539a075f125f7f1d2946bfd4
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Nov 7 00:56:55 2014 +0100

    remove outdevgrind from build until makefile is added
    
    Change-Id: Ie339541fa57a237048470b21fd28bd4411592433

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 385ac9b..fd321d6 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -27,8 +27,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
         StaticLibrary_vclmain \
         Executable_ui-previewer \
 		$(if $(filter LINUX MACOSX WNT,$(OS)), \
-	        Executable_icontest \
-	        Executable_outdevgrind)) \
+	        Executable_icontest )) \
     $(if $(filter-out ANDROID IOS WNT,$(OS)), \
         Executable_svdemo \
         Executable_svptest \