diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/rect.f.glsl | 22 | ||||
-rw-r--r-- | res/rect.v.glsl | 25 | ||||
-rw-r--r-- | res/text.f.glsl | 8 | ||||
-rw-r--r-- | res/text.v.glsl | 6 |
4 files changed, 48 insertions, 13 deletions
diff --git a/res/rect.f.glsl b/res/rect.f.glsl new file mode 100644 index 00000000..907ee858 --- /dev/null +++ b/res/rect.f.glsl @@ -0,0 +1,22 @@ +// Copyright 2016 Joe Wilm, The Alacritty Project Contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#version 330 core +in vec4 color; + +out vec4 FragColor; + +void main() +{ + FragColor = color; +} diff --git a/res/rect.v.glsl b/res/rect.v.glsl new file mode 100644 index 00000000..a353b6b0 --- /dev/null +++ b/res/rect.v.glsl @@ -0,0 +1,25 @@ +// Copyright 2016 Joe Wilm, The Alacritty Project Contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#version 330 core +layout (location = 0) in vec3 aPos; + +out vec4 color; + +uniform vec4 col; + +void main() +{ + gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0); + color = col; +} diff --git a/res/text.f.glsl b/res/text.f.glsl index c551179e..532cf929 100644 --- a/res/text.f.glsl +++ b/res/text.f.glsl @@ -15,8 +15,6 @@ in vec2 TexCoords; in vec3 fg; in vec4 bg; -in vec3 vbc; -flat in float vb; flat in int background; layout(location = 0, index = 0) out vec4 color; @@ -32,11 +30,7 @@ void main() discard; alphaMask = vec4(1.0); - if (vb == 0) { - color = vec4(bg.rgb, 1.0); - } else { - color = vec4(vbc, vb); - } + color = vec4(bg.rgb, 1.0); } else { vec3 textColor = texture(mask, TexCoords).rgb; alphaMask = vec4(textColor, textColor.r); diff --git a/res/text.v.glsl b/res/text.v.glsl index a13d99a7..32aee5ac 100644 --- a/res/text.v.glsl +++ b/res/text.v.glsl @@ -32,19 +32,15 @@ layout (location = 5) in vec4 backgroundColor; out vec2 TexCoords; out vec3 fg; out vec4 bg; -out vec3 vbc; // Terminal properties uniform vec2 termDim; uniform vec2 cellDim; -uniform float visualBell; -uniform vec3 visualBellColor; uniform int backgroundPass; // Orthographic projection uniform mat4 projection; -flat out float vb; flat out int background; void main() @@ -76,8 +72,6 @@ void main() TexCoords = uvOffset + vec2(position.x, 1 - position.y) * uvSize; } - vb = visualBell; - vbc = visualBellColor; background = backgroundPass; bg = vec4(backgroundColor.rgb / 255.0, backgroundColor.a); fg = textColor / vec3(255.0, 255.0, 255.0); |