Merge remote-tracking branch 'origin/upstream-master' into 71-based

Change-Id: Id64d87edf3764b7b2a539f34018a458c8fcce302

1 files changed, 22 insertions, 0 deletions

diff --git a/chromium/third_party/glslang/src/Test/spv.test.frag b/chromium/third_party/glslang/src/Test/spv.test.frag
new file mode 100644
index 00000000000..68e712824e5
--- /dev/null
+++ b/chromium/third_party/glslang/src/Test/spv.test.frag
@@ -0,0 +1,22 @@
+#version 400
+
+uniform sampler2D texSampler2D;
+uniform sampler3D texSampler3D;
+
+in float blend;
+in vec2 scale;
+in vec4 u;
+
+in vec2 t;
+in vec3 coords;
+
+void main()
+{  
+    float blendscale = 1.789;
+
+    vec4 v = texture(texSampler2D, (t + scale) / scale ).wzyx;
+
+	vec4 w = texture(texSampler3D, coords) + v;
+    
+    gl_FragColor = mix(w, u, blend * blendscale);
+}