From d6bb3305fdcfd224a24fa580b490c9417fd8a3e8 Mon Sep 17 00:00:00 2001 From: AstroSnail Date: Thu, 7 Jun 2018 02:33:32 +0100 Subject: [PATCH] Change shader versions from 1.10 to 3.30 Minimum OpenGL version is 3.3 Core, so it is reasonable to use GLSL 3.30 --- data/shaders/chunk.frag | 4 ++-- data/shaders/chunk.vert | 10 +++++----- data/shaders/skybox.frag | 4 ++-- data/shaders/skybox.vert | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data/shaders/chunk.frag b/data/shaders/chunk.frag index 724589a..48c2b9c 100644 --- a/data/shaders/chunk.frag +++ b/data/shaders/chunk.frag @@ -1,6 +1,6 @@ -#version 110 +#version 330 -varying vec2 uv_p; +in vec2 uv_p; void main(void) { gl_FragColor = vec4(uv_p.xy, 0.5f, 1.0f); diff --git a/data/shaders/chunk.vert b/data/shaders/chunk.vert index bd068c1..e66a23f 100644 --- a/data/shaders/chunk.vert +++ b/data/shaders/chunk.vert @@ -1,9 +1,9 @@ -#version 110 +#version 330 -attribute vec3 position; -attribute vec3 normal; -attribute vec2 uv; -varying vec2 uv_p; +in vec3 position; +in vec3 normal; +in vec2 uv; +out vec2 uv_p; uniform mat4 projectionMatrix; uniform mat4 viewMatrix; diff --git a/data/shaders/skybox.frag b/data/shaders/skybox.frag index 027df6b..29d04bb 100644 --- a/data/shaders/skybox.frag +++ b/data/shaders/skybox.frag @@ -1,6 +1,6 @@ -#version 110 +#version 330 -varying vec3 cardial_color; +in vec3 cardial_color; void main(void) { gl_FragColor = vec4(cardial_color.xyz, 1.0f); diff --git a/data/shaders/skybox.vert b/data/shaders/skybox.vert index d92a982..131e605 100644 --- a/data/shaders/skybox.vert +++ b/data/shaders/skybox.vert @@ -1,8 +1,8 @@ -#version 110 +#version 330 -attribute vec3 position; -attribute vec3 color; -varying vec3 cardial_color; +in vec3 position; +in vec3 color; +out vec3 cardial_color; uniform mat4 projectionMatrix; uniform mat4 viewMatrix;