diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2016-10-20 13:05:18 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-11-04 15:54:18 +0000 |
commit | dec5931ede57e1910d3f0ec62f575b027208320f (patch) | |
tree | 776c07c1df8ea02dbc4044a370e048f62571174d | |
parent | 6b571ae4608ac15256eb7582f442ce69975370f3 (diff) |
opengl: move shaders to its own directory
Change-Id: I9ca5a97ae3ed2472257f468f6751903b458529a7
Reviewed-on: https://gerrit.libreoffice.org/30502
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r-- | vcl/Package_opengl.mk | 50 | ||||
-rw-r--r-- | vcl/opengl/shaders/areaHashCRC64TFragmentShader.glsl (renamed from vcl/opengl/areaHashCRC64TFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/areaScaleFastFragmentShader.glsl (renamed from vcl/opengl/areaScaleFastFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/areaScaleFragmentShader.glsl (renamed from vcl/opengl/areaScaleFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/blendedTextureFragmentShader.glsl (renamed from vcl/opengl/blendedTextureFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/blendedTextureVertexShader.glsl (renamed from vcl/opengl/blendedTextureVertexShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/combinedFragmentShader.glsl (renamed from vcl/opengl/combinedFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/combinedTextureFragmentShader.glsl (renamed from vcl/opengl/combinedTextureFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/combinedTextureVertexShader.glsl (renamed from vcl/opengl/combinedTextureVertexShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/combinedVertexShader.glsl (renamed from vcl/opengl/combinedVertexShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/convolutionFragmentShader.glsl (renamed from vcl/opengl/convolutionFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/diffTextureFragmentShader.glsl (renamed from vcl/opengl/diffTextureFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/dumbVertexShader.glsl (renamed from vcl/opengl/dumbVertexShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/greyscaleFragmentShader.glsl (renamed from vcl/opengl/greyscaleFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/invert50FragmentShader.glsl (renamed from vcl/opengl/invert50FragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/lineFragmentShader.glsl (renamed from vcl/opengl/lineFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/lineVertexShader.glsl (renamed from vcl/opengl/lineVertexShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/linearGradientFragmentShader.glsl (renamed from vcl/opengl/linearGradientFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/maskFragmentShader.glsl (renamed from vcl/opengl/maskFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/maskedTextureFragmentShader.glsl (renamed from vcl/opengl/maskedTextureFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/maskedTextureVertexShader.glsl (renamed from vcl/opengl/maskedTextureVertexShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/radialGradientFragmentShader.glsl (renamed from vcl/opengl/radialGradientFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/replaceColorFragmentShader.glsl (renamed from vcl/opengl/replaceColorFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/solidFragmentShader.glsl (renamed from vcl/opengl/solidFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/textureFragmentShader.glsl (renamed from vcl/opengl/textureFragmentShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/textureVertexShader.glsl (renamed from vcl/opengl/textureVertexShader.glsl) | 0 | ||||
-rw-r--r-- | vcl/opengl/shaders/transformedTextureVertexShader.glsl (renamed from vcl/opengl/transformedTextureVertexShader.glsl) | 0 |
27 files changed, 25 insertions, 25 deletions
diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl.mk index 2fa917eeac42..15e3bee1da1a 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 index 901b481d8081..901b481d8081 100644 --- a/vcl/opengl/areaHashCRC64TFragmentShader.glsl +++ b/vcl/opengl/shaders/areaHashCRC64TFragmentShader.glsl diff --git a/vcl/opengl/areaScaleFastFragmentShader.glsl b/vcl/opengl/shaders/areaScaleFastFragmentShader.glsl index 57ad8fa97853..57ad8fa97853 100644 --- a/vcl/opengl/areaScaleFastFragmentShader.glsl +++ b/vcl/opengl/shaders/areaScaleFastFragmentShader.glsl diff --git a/vcl/opengl/areaScaleFragmentShader.glsl b/vcl/opengl/shaders/areaScaleFragmentShader.glsl index c83c5e0699f2..c83c5e0699f2 100644 --- a/vcl/opengl/areaScaleFragmentShader.glsl +++ b/vcl/opengl/shaders/areaScaleFragmentShader.glsl diff --git a/vcl/opengl/blendedTextureFragmentShader.glsl b/vcl/opengl/shaders/blendedTextureFragmentShader.glsl index 15dfcf7e77f5..15dfcf7e77f5 100644 --- a/vcl/opengl/blendedTextureFragmentShader.glsl +++ b/vcl/opengl/shaders/blendedTextureFragmentShader.glsl diff --git a/vcl/opengl/blendedTextureVertexShader.glsl b/vcl/opengl/shaders/blendedTextureVertexShader.glsl index 3e60d0e223ac..3e60d0e223ac 100644 --- a/vcl/opengl/blendedTextureVertexShader.glsl +++ b/vcl/opengl/shaders/blendedTextureVertexShader.glsl diff --git a/vcl/opengl/combinedFragmentShader.glsl b/vcl/opengl/shaders/combinedFragmentShader.glsl index 2515b174f7c1..2515b174f7c1 100644 --- a/vcl/opengl/combinedFragmentShader.glsl +++ b/vcl/opengl/shaders/combinedFragmentShader.glsl diff --git a/vcl/opengl/combinedTextureFragmentShader.glsl b/vcl/opengl/shaders/combinedTextureFragmentShader.glsl index 2990de8c4d99..2990de8c4d99 100644 --- a/vcl/opengl/combinedTextureFragmentShader.glsl +++ b/vcl/opengl/shaders/combinedTextureFragmentShader.glsl diff --git a/vcl/opengl/combinedTextureVertexShader.glsl b/vcl/opengl/shaders/combinedTextureVertexShader.glsl index 52d44d5538cb..52d44d5538cb 100644 --- a/vcl/opengl/combinedTextureVertexShader.glsl +++ b/vcl/opengl/shaders/combinedTextureVertexShader.glsl diff --git a/vcl/opengl/combinedVertexShader.glsl b/vcl/opengl/shaders/combinedVertexShader.glsl index b040ca2abe81..b040ca2abe81 100644 --- a/vcl/opengl/combinedVertexShader.glsl +++ b/vcl/opengl/shaders/combinedVertexShader.glsl diff --git a/vcl/opengl/convolutionFragmentShader.glsl b/vcl/opengl/shaders/convolutionFragmentShader.glsl index 4b2f316e0bba..4b2f316e0bba 100644 --- a/vcl/opengl/convolutionFragmentShader.glsl +++ b/vcl/opengl/shaders/convolutionFragmentShader.glsl diff --git a/vcl/opengl/diffTextureFragmentShader.glsl b/vcl/opengl/shaders/diffTextureFragmentShader.glsl index 8c50ddf98bd9..8c50ddf98bd9 100644 --- a/vcl/opengl/diffTextureFragmentShader.glsl +++ b/vcl/opengl/shaders/diffTextureFragmentShader.glsl diff --git a/vcl/opengl/dumbVertexShader.glsl b/vcl/opengl/shaders/dumbVertexShader.glsl index 80341b614e3b..80341b614e3b 100644 --- a/vcl/opengl/dumbVertexShader.glsl +++ b/vcl/opengl/shaders/dumbVertexShader.glsl diff --git a/vcl/opengl/greyscaleFragmentShader.glsl b/vcl/opengl/shaders/greyscaleFragmentShader.glsl index c37f0d5df9c7..c37f0d5df9c7 100644 --- a/vcl/opengl/greyscaleFragmentShader.glsl +++ b/vcl/opengl/shaders/greyscaleFragmentShader.glsl diff --git a/vcl/opengl/invert50FragmentShader.glsl b/vcl/opengl/shaders/invert50FragmentShader.glsl index 9222888f0449..9222888f0449 100644 --- a/vcl/opengl/invert50FragmentShader.glsl +++ b/vcl/opengl/shaders/invert50FragmentShader.glsl diff --git a/vcl/opengl/lineFragmentShader.glsl b/vcl/opengl/shaders/lineFragmentShader.glsl index 5a01de35656a..5a01de35656a 100644 --- a/vcl/opengl/lineFragmentShader.glsl +++ b/vcl/opengl/shaders/lineFragmentShader.glsl diff --git a/vcl/opengl/lineVertexShader.glsl b/vcl/opengl/shaders/lineVertexShader.glsl index 90939a974689..90939a974689 100644 --- a/vcl/opengl/lineVertexShader.glsl +++ b/vcl/opengl/shaders/lineVertexShader.glsl diff --git a/vcl/opengl/linearGradientFragmentShader.glsl b/vcl/opengl/shaders/linearGradientFragmentShader.glsl index bd1137c16481..bd1137c16481 100644 --- a/vcl/opengl/linearGradientFragmentShader.glsl +++ b/vcl/opengl/shaders/linearGradientFragmentShader.glsl diff --git a/vcl/opengl/maskFragmentShader.glsl b/vcl/opengl/shaders/maskFragmentShader.glsl index 864869c89b8e..864869c89b8e 100644 --- a/vcl/opengl/maskFragmentShader.glsl +++ b/vcl/opengl/shaders/maskFragmentShader.glsl diff --git a/vcl/opengl/maskedTextureFragmentShader.glsl b/vcl/opengl/shaders/maskedTextureFragmentShader.glsl index 31c793897b77..31c793897b77 100644 --- a/vcl/opengl/maskedTextureFragmentShader.glsl +++ b/vcl/opengl/shaders/maskedTextureFragmentShader.glsl diff --git a/vcl/opengl/maskedTextureVertexShader.glsl b/vcl/opengl/shaders/maskedTextureVertexShader.glsl index 6b5f327dae3f..6b5f327dae3f 100644 --- a/vcl/opengl/maskedTextureVertexShader.glsl +++ b/vcl/opengl/shaders/maskedTextureVertexShader.glsl diff --git a/vcl/opengl/radialGradientFragmentShader.glsl b/vcl/opengl/shaders/radialGradientFragmentShader.glsl index 94a86eb9510f..94a86eb9510f 100644 --- a/vcl/opengl/radialGradientFragmentShader.glsl +++ b/vcl/opengl/shaders/radialGradientFragmentShader.glsl diff --git a/vcl/opengl/replaceColorFragmentShader.glsl b/vcl/opengl/shaders/replaceColorFragmentShader.glsl index 24f6008e2871..24f6008e2871 100644 --- a/vcl/opengl/replaceColorFragmentShader.glsl +++ b/vcl/opengl/shaders/replaceColorFragmentShader.glsl diff --git a/vcl/opengl/solidFragmentShader.glsl b/vcl/opengl/shaders/solidFragmentShader.glsl index b77e2578d6af..b77e2578d6af 100644 --- a/vcl/opengl/solidFragmentShader.glsl +++ b/vcl/opengl/shaders/solidFragmentShader.glsl diff --git a/vcl/opengl/textureFragmentShader.glsl b/vcl/opengl/shaders/textureFragmentShader.glsl index b1fedcba567d..b1fedcba567d 100644 --- a/vcl/opengl/textureFragmentShader.glsl +++ b/vcl/opengl/shaders/textureFragmentShader.glsl diff --git a/vcl/opengl/textureVertexShader.glsl b/vcl/opengl/shaders/textureVertexShader.glsl index 7fbdcf1ebf1a..7fbdcf1ebf1a 100644 --- a/vcl/opengl/textureVertexShader.glsl +++ b/vcl/opengl/shaders/textureVertexShader.glsl diff --git a/vcl/opengl/transformedTextureVertexShader.glsl b/vcl/opengl/shaders/transformedTextureVertexShader.glsl index 3d67f78e0157..3d67f78e0157 100644 --- a/vcl/opengl/transformedTextureVertexShader.glsl +++ b/vcl/opengl/shaders/transformedTextureVertexShader.glsl |