From 555409ea73ad51f5e47f84d11350fb3ad6987342 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 12 Oct 2017 15:36:38 +0530 Subject: [PATCH] Apple's OpenGL drivers are sad Apparently they cant handle non-sequential binding locations. Sigh. --- kitty/cell_vertex.glsl | 6 +++--- kitty/graphics_vertex.glsl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kitty/cell_vertex.glsl b/kitty/cell_vertex.glsl index cbf6213a6..87caec2d3 100644 --- a/kitty/cell_vertex.glsl +++ b/kitty/cell_vertex.glsl @@ -14,9 +14,9 @@ layout(std140) uniform CellRenderData { // Have to use fixed locations here as all variants of the cell program share the same VAO // locations 0 and 1 are used in the graphics program which also shares the same VAO -layout(location=2) in uvec3 colors; -layout(location=3) in uvec4 sprite_coords; -layout(location=4) in float is_selected; +layout(location=0) in uvec3 colors; +layout(location=1) in uvec4 sprite_coords; +layout(location=2) in float is_selected; #if defined(FOREGROUND) || defined(ALL) diff --git a/kitty/graphics_vertex.glsl b/kitty/graphics_vertex.glsl index 12d72b368..cc433a5ad 100644 --- a/kitty/graphics_vertex.glsl +++ b/kitty/graphics_vertex.glsl @@ -1,6 +1,6 @@ #version 330 -layout(location=0) in vec4 src; +layout(location=3) in vec4 src; out vec2 texcoord; void main() {