opengl: add #version to shaders - minimum 130 which is OpenGL 3.0
Change-Id: I5710ce91e804641d4c997bc3d06970a5ed0cb5b1 Reviewed-on: https://gerrit.libreoffice.org/27890 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
committed by
Tomaž Vajngerl
parent
8433d136bc
commit
f3d26af515
@@ -9,6 +9,8 @@
|
|||||||
|
|
||||||
/* TODO Use textureOffset for newest version of GLSL */
|
/* TODO Use textureOffset for newest version of GLSL */
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
uniform sampler2D sampler;
|
uniform sampler2D sampler;
|
||||||
uniform int xscale;
|
uniform int xscale;
|
||||||
uniform int yscale;
|
uniform int yscale;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
varying vec2 tex_coord;
|
varying vec2 tex_coord;
|
||||||
varying vec2 alpha_coord;
|
varying vec2 alpha_coord;
|
||||||
varying vec2 mask_coord;
|
varying vec2 mask_coord;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
attribute vec4 position;
|
attribute vec4 position;
|
||||||
attribute vec2 tex_coord_in;
|
attribute vec2 tex_coord_in;
|
||||||
attribute vec2 alpha_coord_in;
|
attribute vec2 alpha_coord_in;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
varying float fade_factor; // 0->1 fade factor used for AA
|
varying float fade_factor; // 0->1 fade factor used for AA
|
||||||
varying float multiply;
|
varying float multiply;
|
||||||
|
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
varying vec2 tex_coord;
|
varying vec2 tex_coord;
|
||||||
varying vec2 alpha_coord;
|
varying vec2 alpha_coord;
|
||||||
varying vec2 mask_coord;
|
varying vec2 mask_coord;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
attribute vec4 position;
|
attribute vec4 position;
|
||||||
attribute vec2 tex_coord_in;
|
attribute vec2 tex_coord_in;
|
||||||
attribute vec2 mask_coord_in;
|
attribute vec2 mask_coord_in;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
attribute vec2 position;
|
attribute vec2 position;
|
||||||
attribute vec4 extrusion_vectors;
|
attribute vec4 extrusion_vectors;
|
||||||
#ifdef USE_VERTEX_COLORS
|
#ifdef USE_VERTEX_COLORS
|
||||||
|
@@ -9,6 +9,8 @@
|
|||||||
|
|
||||||
/* TODO Use textureOffset for newest version of GLSL */
|
/* TODO Use textureOffset for newest version of GLSL */
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
uniform sampler2D sampler;
|
uniform sampler2D sampler;
|
||||||
uniform vec2 offsets[16];
|
uniform vec2 offsets[16];
|
||||||
uniform float kernel[16];
|
uniform float kernel[16];
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
/*precision mediump float;*/
|
/*precision mediump float;*/
|
||||||
varying vec2 tex_coord;
|
varying vec2 tex_coord;
|
||||||
varying vec2 mask_coord;
|
varying vec2 mask_coord;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
attribute vec4 position;
|
attribute vec4 position;
|
||||||
uniform mat4 mvp;
|
uniform mat4 mvp;
|
||||||
|
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
varying vec2 tex_coord;
|
varying vec2 tex_coord;
|
||||||
uniform sampler2D sampler;
|
uniform sampler2D sampler;
|
||||||
|
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
/*precision mediump float;*/
|
/*precision mediump float;*/
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
varying float fade_factor; // 0->1 fade factor used for AA
|
varying float fade_factor; // 0->1 fade factor used for AA
|
||||||
uniform vec4 color;
|
uniform vec4 color;
|
||||||
|
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
varying vec2 tex_coord;
|
varying vec2 tex_coord;
|
||||||
uniform sampler2D sampler;
|
uniform sampler2D sampler;
|
||||||
uniform vec4 color;
|
uniform vec4 color;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
/*precision mediump float;*/
|
/*precision mediump float;*/
|
||||||
varying vec2 tex_coord;
|
varying vec2 tex_coord;
|
||||||
varying vec2 mask_coord;
|
varying vec2 mask_coord;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
attribute vec4 position;
|
attribute vec4 position;
|
||||||
attribute vec2 tex_coord_in;
|
attribute vec2 tex_coord_in;
|
||||||
attribute vec2 mask_coord_in;
|
attribute vec2 mask_coord_in;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
varying vec2 tex_coord;
|
varying vec2 tex_coord;
|
||||||
uniform sampler2D sampler;
|
uniform sampler2D sampler;
|
||||||
uniform vec4 search_color;
|
uniform vec4 search_color;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
/*precision mediump float;*/
|
/*precision mediump float;*/
|
||||||
|
|
||||||
uniform vec4 color;
|
uniform vec4 color;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
/* precision mediump float; */
|
/* precision mediump float; */
|
||||||
varying vec2 tex_coord;
|
varying vec2 tex_coord;
|
||||||
uniform sampler2D sampler;
|
uniform sampler2D sampler;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
attribute vec4 position;
|
attribute vec4 position;
|
||||||
attribute vec2 tex_coord_in;
|
attribute vec2 tex_coord_in;
|
||||||
varying vec2 tex_coord;
|
varying vec2 tex_coord;
|
||||||
|
@@ -7,6 +7,8 @@
|
|||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#version 130
|
||||||
|
|
||||||
attribute vec4 position;
|
attribute vec4 position;
|
||||||
attribute vec2 tex_coord_in;
|
attribute vec2 tex_coord_in;
|
||||||
attribute vec2 mask_coord_in;
|
attribute vec2 mask_coord_in;
|
||||||
|
Reference in New Issue
Block a user