alacritty

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 3f0d11381dd72f9ed3db040210293a2f7fa74ea3
parent 20f319860908c2fa86bba25bb1e7bf8ba1a464e1
Author: M. Stoeckl <manuel.stoeckl93@gmail.com>
Date:   Sun,  3 Feb 2019 16:45:09 +0000

Remove unused coordinate from rect shader


Diffstat:
Mres/rect.f.glsl | 3++-
Mres/rect.v.glsl | 9++-------
Msrc/renderer/mod.rs | 22+++++++++++-----------
3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/res/rect.f.glsl b/res/rect.f.glsl @@ -12,7 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. #version 330 core -in vec4 color; + +uniform vec4 color; out vec4 FragColor; diff --git a/res/rect.v.glsl b/res/rect.v.glsl @@ -12,14 +12,9 @@ // 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; +layout (location = 0) in vec2 aPos; void main() { - gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0); - color = col; + gl_Position = vec4(aPos.x, aPos.y, 0.0, 1.0); } diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs @@ -134,7 +134,7 @@ pub struct RectShaderProgram { // Program id id: GLuint, /// Rectangle color - u_col: GLint, + u_color: GLint, } #[derive(Copy, Debug, Clone)] @@ -720,7 +720,7 @@ impl QuadRenderer { gl::BindBuffer(gl::ARRAY_BUFFER, self.rect_vbo); // Position - gl::VertexAttribPointer(0, 3, gl::FLOAT, gl::FALSE, (size_of::<f32>() * 3) as _, ptr::null()); + gl::VertexAttribPointer(0, 2, gl::FLOAT, gl::FALSE, (size_of::<f32>() * 2) as _, ptr::null()); gl::EnableVertexAttribArray(0); } @@ -876,11 +876,11 @@ impl QuadRenderer { unsafe { // Setup vertices - let vertices: [f32; 12] = [ - x + width, y , 0.0, - x + width, y - height, 0.0, - x , y - height, 0.0, - x , y , 0.0, + let vertices: [f32; 8] = [ + x + width, y , + x + width, y - height, + x , y - height, + x , y , ]; // Load vertex data into array buffer @@ -1285,13 +1285,13 @@ impl RectShaderProgram { } // get uniform locations - let u_col = unsafe { - gl::GetUniformLocation(program, b"col\0".as_ptr() as *const _) + let u_color = unsafe { + gl::GetUniformLocation(program, b"color\0".as_ptr() as *const _) }; let shader = RectShaderProgram { id: program, - u_col, + u_color, }; unsafe { gl::UseProgram(0) } @@ -1302,7 +1302,7 @@ impl RectShaderProgram { fn set_color(&self, color: Rgb, alpha: f32) { unsafe { gl::Uniform4f( - self.u_col, + self.u_color, f32::from(color.r) / 255., f32::from(color.g) / 255., f32::from(color.b) / 255.,