vcl/Package_opengl.mk | 50 ++---
vcl/opengl/areaHashCRC64TFragmentShader.glsl | 87 ---------
vcl/opengl/areaScaleFastFragmentShader.glsl | 59 ------
vcl/opengl/areaScaleFragmentShader.glsl | 151 -----------------
vcl/opengl/blendedTextureFragmentShader.glsl | 33 ---
vcl/opengl/blendedTextureVertexShader.glsl | 28 ---
vcl/opengl/combinedFragmentShader.glsl | 44 ----
vcl/opengl/combinedTextureFragmentShader.glsl | 73 --------
vcl/opengl/combinedTextureVertexShader.glsl | 43 ----
vcl/opengl/combinedVertexShader.glsl | 76 --------
vcl/opengl/convolutionFragmentShader.glsl | 30 ---
vcl/opengl/diffTextureFragmentShader.glsl | 30 ---
vcl/opengl/dumbVertexShader.glsl | 20 --
vcl/opengl/greyscaleFragmentShader.glsl | 20 --
vcl/opengl/invert50FragmentShader.glsl | 25 --
vcl/opengl/lineFragmentShader.glsl | 38 ----
vcl/opengl/lineVertexShader.glsl | 37 ----
vcl/opengl/linearGradientFragmentShader.glsl | 23 --
vcl/opengl/maskFragmentShader.glsl | 23 --
vcl/opengl/maskedTextureFragmentShader.glsl | 27 ---
vcl/opengl/maskedTextureVertexShader.glsl | 26 --
vcl/opengl/radialGradientFragmentShader.glsl | 23 --
vcl/opengl/replaceColorFragmentShader.glsl | 25 --
vcl/opengl/shaders/areaHashCRC64TFragmentShader.glsl | 87 +++++++++
vcl/opengl/shaders/areaScaleFastFragmentShader.glsl | 59 ++++++
vcl/opengl/shaders/areaScaleFragmentShader.glsl | 151 +++++++++++++++++
vcl/opengl/shaders/blendedTextureFragmentShader.glsl | 33 +++
vcl/opengl/shaders/blendedTextureVertexShader.glsl | 28 +++
vcl/opengl/shaders/combinedFragmentShader.glsl | 44 ++++
vcl/opengl/shaders/combinedTextureFragmentShader.glsl | 73 ++++++++
vcl/opengl/shaders/combinedTextureVertexShader.glsl | 43 ++++
vcl/opengl/shaders/combinedVertexShader.glsl | 76 ++++++++
vcl/opengl/shaders/convolutionFragmentShader.glsl | 30 +++
vcl/opengl/shaders/diffTextureFragmentShader.glsl | 30 +++
vcl/opengl/shaders/dumbVertexShader.glsl | 20 ++
vcl/opengl/shaders/greyscaleFragmentShader.glsl | 20 ++
vcl/opengl/shaders/invert50FragmentShader.glsl | 25 ++
vcl/opengl/shaders/lineFragmentShader.glsl | 38 ++++
vcl/opengl/shaders/lineVertexShader.glsl | 37 ++++
vcl/opengl/shaders/linearGradientFragmentShader.glsl | 23 ++
vcl/opengl/shaders/maskFragmentShader.glsl | 23 ++
vcl/opengl/shaders/maskedTextureFragmentShader.glsl | 27 +++
vcl/opengl/shaders/maskedTextureVertexShader.glsl | 26 ++
vcl/opengl/shaders/radialGradientFragmentShader.glsl | 23 ++
vcl/opengl/shaders/replaceColorFragmentShader.glsl | 25 ++
vcl/opengl/shaders/solidFragmentShader.glsl | 19 ++
vcl/opengl/shaders/textureFragmentShader.glsl | 20 ++
vcl/opengl/shaders/textureVertexShader.glsl | 22 ++
vcl/opengl/shaders/transformedTextureVertexShader.glsl | 28 +++
vcl/opengl/solidFragmentShader.glsl | 19 --
vcl/opengl/textureFragmentShader.glsl | 20 --
vcl/opengl/textureVertexShader.glsl | 22 --
vcl/opengl/transformedTextureVertexShader.glsl | 28 ---
53 files changed, 1055 insertions(+), 1055 deletions(-)
New commits:
commit dec5931ede57e1910d3f0ec62f575b027208320f
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Thu Oct 20 13:05:18 2016 +0200
opengl: move shaders to its own directory
Change-Id: I9ca5a97ae3ed2472257f468f6751903b458529a7
Reviewed-on: https://gerrit.libreoffice.org/30502
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl.mk
index 2fa917e..15e3bee 100644
--- a/vcl/Package_opengl.mk
+++ b/vcl/Package_opengl.mk
@@ -7,35 +7,35 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,vcl_opengl_shader,$(SRCDIR)/vcl/opengl))
+$(eval $(call
gb_Package_Package,vcl_opengl_shader,$(SRCDIR)/vcl/opengl/shaders))
$(eval $(call
gb_Package_add_files,vcl_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
areaHashCRC64TFragmentShader.glsl \
- areaScaleFastFragmentShader.glsl \
- areaScaleFragmentShader.glsl \
- blendedTextureFragmentShader.glsl \
- blendedTextureVertexShader.glsl \
- dumbVertexShader.glsl \
- diffTextureFragmentShader.glsl \
- greyscaleFragmentShader.glsl \
+ areaScaleFastFragmentShader.glsl \
+ areaScaleFragmentShader.glsl \
+ blendedTextureFragmentShader.glsl \
+ blendedTextureVertexShader.glsl \
+ dumbVertexShader.glsl \
+ diffTextureFragmentShader.glsl \
+ greyscaleFragmentShader.glsl \
invert50FragmentShader.glsl \
- convolutionFragmentShader.glsl \
- linearGradientFragmentShader.glsl \
- combinedTextureFragmentShader.glsl \
- combinedTextureVertexShader.glsl \
- combinedFragmentShader.glsl \
- combinedVertexShader.glsl \
- lineFragmentShader.glsl \
- lineVertexShader.glsl \
- maskFragmentShader.glsl \
- maskedTextureVertexShader.glsl \
- maskedTextureFragmentShader.glsl \
- radialGradientFragmentShader.glsl \
- replaceColorFragmentShader.glsl \
- solidFragmentShader.glsl \
- textureFragmentShader.glsl \
- textureVertexShader.glsl \
- transformedTextureVertexShader.glsl \
+ convolutionFragmentShader.glsl \
+ linearGradientFragmentShader.glsl \
+ combinedTextureFragmentShader.glsl \
+ combinedTextureVertexShader.glsl \
+ combinedFragmentShader.glsl \
+ combinedVertexShader.glsl \
+ lineFragmentShader.glsl \
+ lineVertexShader.glsl \
+ maskFragmentShader.glsl \
+ maskedTextureVertexShader.glsl \
+ maskedTextureFragmentShader.glsl \
+ radialGradientFragmentShader.glsl \
+ replaceColorFragmentShader.glsl \
+ solidFragmentShader.glsl \
+ textureFragmentShader.glsl \
+ textureVertexShader.glsl \
+ transformedTextureVertexShader.glsl \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/opengl/areaHashCRC64TFragmentShader.glsl
b/vcl/opengl/shaders/areaHashCRC64TFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/areaHashCRC64TFragmentShader.glsl
rename to vcl/opengl/shaders/areaHashCRC64TFragmentShader.glsl
diff --git a/vcl/opengl/areaScaleFastFragmentShader.glsl
b/vcl/opengl/shaders/areaScaleFastFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/areaScaleFastFragmentShader.glsl
rename to vcl/opengl/shaders/areaScaleFastFragmentShader.glsl
diff --git a/vcl/opengl/areaScaleFragmentShader.glsl
b/vcl/opengl/shaders/areaScaleFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/areaScaleFragmentShader.glsl
rename to vcl/opengl/shaders/areaScaleFragmentShader.glsl
diff --git a/vcl/opengl/blendedTextureFragmentShader.glsl
b/vcl/opengl/shaders/blendedTextureFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/blendedTextureFragmentShader.glsl
rename to vcl/opengl/shaders/blendedTextureFragmentShader.glsl
diff --git a/vcl/opengl/blendedTextureVertexShader.glsl
b/vcl/opengl/shaders/blendedTextureVertexShader.glsl
similarity index 100%
rename from vcl/opengl/blendedTextureVertexShader.glsl
rename to vcl/opengl/shaders/blendedTextureVertexShader.glsl
diff --git a/vcl/opengl/combinedFragmentShader.glsl
b/vcl/opengl/shaders/combinedFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/combinedFragmentShader.glsl
rename to vcl/opengl/shaders/combinedFragmentShader.glsl
diff --git a/vcl/opengl/combinedTextureFragmentShader.glsl
b/vcl/opengl/shaders/combinedTextureFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/combinedTextureFragmentShader.glsl
rename to vcl/opengl/shaders/combinedTextureFragmentShader.glsl
diff --git a/vcl/opengl/combinedTextureVertexShader.glsl
b/vcl/opengl/shaders/combinedTextureVertexShader.glsl
similarity index 100%
rename from vcl/opengl/combinedTextureVertexShader.glsl
rename to vcl/opengl/shaders/combinedTextureVertexShader.glsl
diff --git a/vcl/opengl/combinedVertexShader.glsl
b/vcl/opengl/shaders/combinedVertexShader.glsl
similarity index 100%
rename from vcl/opengl/combinedVertexShader.glsl
rename to vcl/opengl/shaders/combinedVertexShader.glsl
diff --git a/vcl/opengl/convolutionFragmentShader.glsl
b/vcl/opengl/shaders/convolutionFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/convolutionFragmentShader.glsl
rename to vcl/opengl/shaders/convolutionFragmentShader.glsl
diff --git a/vcl/opengl/diffTextureFragmentShader.glsl
b/vcl/opengl/shaders/diffTextureFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/diffTextureFragmentShader.glsl
rename to vcl/opengl/shaders/diffTextureFragmentShader.glsl
diff --git a/vcl/opengl/dumbVertexShader.glsl
b/vcl/opengl/shaders/dumbVertexShader.glsl
similarity index 100%
rename from vcl/opengl/dumbVertexShader.glsl
rename to vcl/opengl/shaders/dumbVertexShader.glsl
diff --git a/vcl/opengl/greyscaleFragmentShader.glsl
b/vcl/opengl/shaders/greyscaleFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/greyscaleFragmentShader.glsl
rename to vcl/opengl/shaders/greyscaleFragmentShader.glsl
diff --git a/vcl/opengl/invert50FragmentShader.glsl
b/vcl/opengl/shaders/invert50FragmentShader.glsl
similarity index 100%
rename from vcl/opengl/invert50FragmentShader.glsl
rename to vcl/opengl/shaders/invert50FragmentShader.glsl
diff --git a/vcl/opengl/lineFragmentShader.glsl
b/vcl/opengl/shaders/lineFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/lineFragmentShader.glsl
rename to vcl/opengl/shaders/lineFragmentShader.glsl
diff --git a/vcl/opengl/lineVertexShader.glsl
b/vcl/opengl/shaders/lineVertexShader.glsl
similarity index 100%
rename from vcl/opengl/lineVertexShader.glsl
rename to vcl/opengl/shaders/lineVertexShader.glsl
diff --git a/vcl/opengl/linearGradientFragmentShader.glsl
b/vcl/opengl/shaders/linearGradientFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/linearGradientFragmentShader.glsl
rename to vcl/opengl/shaders/linearGradientFragmentShader.glsl
diff --git a/vcl/opengl/maskFragmentShader.glsl
b/vcl/opengl/shaders/maskFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/maskFragmentShader.glsl
rename to vcl/opengl/shaders/maskFragmentShader.glsl
diff --git a/vcl/opengl/maskedTextureFragmentShader.glsl
b/vcl/opengl/shaders/maskedTextureFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/maskedTextureFragmentShader.glsl
rename to vcl/opengl/shaders/maskedTextureFragmentShader.glsl
diff --git a/vcl/opengl/maskedTextureVertexShader.glsl
b/vcl/opengl/shaders/maskedTextureVertexShader.glsl
similarity index 100%
rename from vcl/opengl/maskedTextureVertexShader.glsl
rename to vcl/opengl/shaders/maskedTextureVertexShader.glsl
diff --git a/vcl/opengl/radialGradientFragmentShader.glsl
b/vcl/opengl/shaders/radialGradientFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/radialGradientFragmentShader.glsl
rename to vcl/opengl/shaders/radialGradientFragmentShader.glsl
diff --git a/vcl/opengl/replaceColorFragmentShader.glsl
b/vcl/opengl/shaders/replaceColorFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/replaceColorFragmentShader.glsl
rename to vcl/opengl/shaders/replaceColorFragmentShader.glsl
diff --git a/vcl/opengl/solidFragmentShader.glsl
b/vcl/opengl/shaders/solidFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/solidFragmentShader.glsl
rename to vcl/opengl/shaders/solidFragmentShader.glsl
diff --git a/vcl/opengl/textureFragmentShader.glsl
b/vcl/opengl/shaders/textureFragmentShader.glsl
similarity index 100%
rename from vcl/opengl/textureFragmentShader.glsl
rename to vcl/opengl/shaders/textureFragmentShader.glsl
diff --git a/vcl/opengl/textureVertexShader.glsl
b/vcl/opengl/shaders/textureVertexShader.glsl
similarity index 100%
rename from vcl/opengl/textureVertexShader.glsl
rename to vcl/opengl/shaders/textureVertexShader.glsl
diff --git a/vcl/opengl/transformedTextureVertexShader.glsl
b/vcl/opengl/shaders/transformedTextureVertexShader.glsl
similarity index 100%
rename from vcl/opengl/transformedTextureVertexShader.glsl
rename to vcl/opengl/shaders/transformedTextureVertexShader.glsl
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
