Shader refactoring: Share the uniform buffer across shaders

Get rid of some code duplication and share the uniform buffer that we
use across our shaders, so that we will only need to modify it in one
place in the future.

Change-Id: I649ce30b2b982dbb0e81f3c8793b33ad7f0429bb
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/multimedia/shaders/externalsampler.frag b/src/multimedia/shaders/externalsampler.frag
index 6431ea773..f786bc4e1 100644
--- a/src/multimedia/shaders/externalsampler.frag
+++ b/src/multimedia/shaders/externalsampler.frag
@@ -1,15 +1,11 @@
 #version 440
+#extension GL_GOOGLE_include_directive : enable
+
+#include "uniformbuffer.glsl"
 
 layout(location = 0) in vec2 texCoord;
 layout(location = 0) out vec4 fragColor;
 
-layout(std140, binding = 0) uniform buf {
-    mat4 matrix;
-    mat4 colorMatrix;
-    float opacity;
-    float width;
-} ubuf;
-
 layout(binding = 1) uniform sampler2D plane1Texture;
 
 void main()