summaryrefslogtreecommitdiff
path: root/chart2/opengl
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-21 03:31:33 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-21 04:21:41 +0200
commit50a5739cee2b26d9a70c321664f7166a32fa8647 (patch)
tree30a0bac2f0dd9e0418f08cd57e93931892aa3bd2 /chart2/opengl
parent016467d8a54bc5ed4990236dc990824b3efefa9c (diff)
small whitespace changes
Change-Id: I10aa08268bf148eb792440f13bcf044b350d6937
Diffstat (limited to 'chart2/opengl')
-rw-r--r--chart2/opengl/textFragmentShaderBatch.glsl5
-rw-r--r--chart2/opengl/textVertexShaderBatch.glsl1
2 files changed, 5 insertions, 1 deletions
diff --git a/chart2/opengl/textFragmentShaderBatch.glsl b/chart2/opengl/textFragmentShaderBatch.glsl
index d7bd4ae5e030..700888387008 100644
--- a/chart2/opengl/textFragmentShaderBatch.glsl
+++ b/chart2/opengl/textFragmentShaderBatch.glsl
@@ -6,15 +6,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+
#version 330 core
#extension GL_EXT_texture_array : enable
+
uniform sampler2DArray texArray;
in vec3 vTexCoord;
out vec4 actualColor;
void main()
{
- vec3 color = texture2DArray(texArray, vTexCoord.xyz).rgb;
+ vec3 color = texture2DArray(texArray, vTexCoord.xyz).rgb;
actualColor = vec4(color, 1.0 - color.r);
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/opengl/textVertexShaderBatch.glsl b/chart2/opengl/textVertexShaderBatch.glsl
index f89433339dfe..e61beb632ff1 100644
--- a/chart2/opengl/textVertexShaderBatch.glsl
+++ b/chart2/opengl/textVertexShaderBatch.glsl
@@ -6,6 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+
#version 330 core
in vec3 vPosition;
in vec3 texCoord;