commit 7ca57aeef51bc18bf2876ec596f0f2253169d02e parent 63e5da3b1e0d947db85547747aeacdd48103ba57 Author: Michael Savage <mikejsavage@gmail.com> Date: Fri Jul 7 21:24:08 +0300 Fix shaders on OSX Diffstat:
shaders/debug_render_shadow_map.glsl | | | 2 | +- |
shaders/flat_textured.glsl | | | 2 | +- |
shaders/shadowed_vertex_colours.glsl | | | 2 | +- |
shaders/skybox.glsl | | | 2 | +- |
shaders/text.glsl | | | 2 | +- |
shaders/write_shadow_map.glsl | | | 2 | +- |
diff --git a/shaders/debug_render_shadow_map.glsl b/shaders/debug_render_shadow_map.glsl @@ -1,6 +1,6 @@ uniform sampler2D tex; -#if VERTEX_SHADER +#ifdef VERTEX_SHADER in vec2 position; out vec2 uv; diff --git a/shaders/flat_textured.glsl b/shaders/flat_textured.glsl @@ -1,4 +1,4 @@ -#if VERTEX_SHADER +#ifdef VERTEX_SHADER in vec3 position; in vec4 colour; diff --git a/shaders/shadowed_vertex_colours.glsl b/shaders/shadowed_vertex_colours.glsl @@ -26,7 +26,7 @@ struct VSOut { vec3 colour; }; -#if VERTEX_SHADER +#ifdef VERTEX_SHADER in vec3 position; in vec3 normal; diff --git a/shaders/skybox.glsl b/shaders/skybox.glsl @@ -1,4 +1,4 @@ -#if VERTEX_SHADER +#ifdef VERTEX_SHADER in vec3 position; out vec3 pos; diff --git a/shaders/text.glsl b/shaders/text.glsl @@ -7,7 +7,7 @@ layout( std140 ) uniform window { uvec2 window_size; }; -#if VERTEX_SHADER +#ifdef VERTEX_SHADER in vec3 position; in vec4 colour; diff --git a/shaders/write_shadow_map.glsl b/shaders/write_shadow_map.glsl @@ -1,4 +1,4 @@ -#if VERTEX_SHADER +#ifdef VERTEX_SHADER in vec3 position;