From 991ea3c0081fec6747f55d8adca691dc64fe9d26 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 7 Jun 2016 19:40:11 -0500 Subject: [PATCH] [nk] fix nuklear in linux and don't request a core context on windows --- gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h | 2 +- gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h | 2 +- gfx/drivers/gl_shaders/shaders_common.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h index f93675553a..0ace8b1a3c 100644 --- a/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h +++ b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h @@ -1,6 +1,6 @@ #include "shaders_common.h" -static const char *nuklear_fragment_shader = GLSL_330( +static const char *nuklear_fragment_shader = GLSL_300( precision mediump float; uniform sampler2D Texture; in vec2 Frag_UV; diff --git a/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h index b0c46850d1..a8c7a0bcea 100644 --- a/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h +++ b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h @@ -1,6 +1,6 @@ #include "shaders_common.h" -static const char *nuklear_vertex_shader = GLSL_330( +static const char *nuklear_vertex_shader = GLSL_300( uniform mat4 ProjMtx; in vec2 Position; in vec2 TexCoord; diff --git a/gfx/drivers/gl_shaders/shaders_common.h b/gfx/drivers/gl_shaders/shaders_common.h index a07c3a852c..2838bb4631 100644 --- a/gfx/drivers/gl_shaders/shaders_common.h +++ b/gfx/drivers/gl_shaders/shaders_common.h @@ -6,6 +6,7 @@ #define GLSL_330(src) "#version 330 es\nprecision mediump float;\n" #src #else #define GLSL(src) "" #src +#define GLSL_300(src) "#version 300 es\n" #src #define GLSL_330(src) "#version 330 core\n" #src #endif