diff options
| -rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 36 | ||||
| -rw-r--r-- | drivers/gles2/shaders/cubemap_filter.glsl | 5 | ||||
| -rw-r--r-- | drivers/gles2/shaders/scene.glsl | 22 | ||||
| -rw-r--r-- | drivers/gles2/shaders/stdlib.glsl | 3 |
4 files changed, 27 insertions, 39 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index e5a78bb90f..a2c14cd3d2 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -1,23 +1,6 @@ /* clang-format off */ [vertex] -#ifndef USE_GLES_OVER_GL -#ifdef GL_EXT_shader_texture_lod -#extension GL_EXT_shader_texture_lod : enable -#define texture2DLod(img, coord, lod) texture2DLodEXT(img, coord, lod) -#define textureCubeLod(img, coord, lod) textureCubeLodEXT(img, coord, lod) -#endif -#endif // !USE_GLES_OVER_GL - -#ifdef GL_ARB_shader_texture_lod -#extension GL_ARB_shader_texture_lod : enable -#endif - -#if !defined(GL_EXT_shader_texture_lod) && !defined(GL_ARB_shader_texture_lod) -#define texture2DLod(img, coord, lod) texture2D(img, coord, lod) -#define textureCubeLod(img, coord, lod) textureCube(img, coord, lod) -#endif - #ifdef USE_GLES_OVER_GL #define lowp #define mediump @@ -237,6 +220,25 @@ VERTEX_SHADER_CODE /* clang-format off */ [fragment] +// texture2DLodEXT and textureCubeLodEXT are fragment shader specific. +// Do not copy these defines in the [vertex] section. +#ifndef USE_GLES_OVER_GL +#ifdef GL_EXT_shader_texture_lod +#extension GL_EXT_shader_texture_lod : enable +#define texture2DLod(img, coord, lod) texture2DLodEXT(img, coord, lod) +#define textureCubeLod(img, coord, lod) textureCubeLodEXT(img, coord, lod) +#endif +#endif // !USE_GLES_OVER_GL + +#ifdef GL_ARB_shader_texture_lod +#extension GL_ARB_shader_texture_lod : enable +#endif + +#if !defined(GL_EXT_shader_texture_lod) && !defined(GL_ARB_shader_texture_lod) +#define texture2DLod(img, coord, lod) texture2D(img, coord, lod) +#define textureCubeLod(img, coord, lod) textureCube(img, coord, lod) +#endif + #ifdef USE_GLES_OVER_GL #define lowp #define mediump diff --git a/drivers/gles2/shaders/cubemap_filter.glsl b/drivers/gles2/shaders/cubemap_filter.glsl index 128da15b39..19fd62253f 100644 --- a/drivers/gles2/shaders/cubemap_filter.glsl +++ b/drivers/gles2/shaders/cubemap_filter.glsl @@ -25,6 +25,8 @@ void main() { /* clang-format off */ [fragment] +// texture2DLodEXT and textureCubeLodEXT are fragment shader specific. +// Do not copy these defines in the [vertex] section. #ifndef USE_GLES_OVER_GL #ifdef GL_EXT_shader_texture_lod #extension GL_EXT_shader_texture_lod : enable @@ -54,7 +56,8 @@ precision highp int; precision mediump float; precision mediump int; #endif -#endif // USE_GLES_OVER_GL + +#endif #ifdef USE_SOURCE_PANORAMA uniform sampler2D source_panorama; //texunit:0 diff --git a/drivers/gles2/shaders/scene.glsl b/drivers/gles2/shaders/scene.glsl index 95856f9c22..4a1e2a65e3 100644 --- a/drivers/gles2/shaders/scene.glsl +++ b/drivers/gles2/shaders/scene.glsl @@ -1,23 +1,6 @@ /* clang-format off */ [vertex] -#ifndef USE_GLES_OVER_GL -#ifdef GL_EXT_shader_texture_lod -#extension GL_EXT_shader_texture_lod : enable -#define texture2DLod(img, coord, lod) texture2DLodEXT(img, coord, lod) -#define textureCubeLod(img, coord, lod) textureCubeLodEXT(img, coord, lod) -#endif -#endif // !USE_GLES_OVER_GL - -#ifdef GL_ARB_shader_texture_lod -#extension GL_ARB_shader_texture_lod : enable -#endif - -#if !defined(GL_EXT_shader_texture_lod) && !defined(GL_ARB_shader_texture_lod) -#define texture2DLod(img, coord, lod) texture2D(img, coord, lod) -#define textureCubeLod(img, coord, lod) textureCube(img, coord, lod) -#endif - #ifdef USE_GLES_OVER_GL #define lowp #define mediump @@ -33,6 +16,7 @@ precision highp int; #define M_PI 3.14159265359 + // // attributes // @@ -691,6 +675,8 @@ VERTEX_SHADER_CODE /* clang-format off */ [fragment] +// texture2DLodEXT and textureCubeLodEXT are fragment shader specific. +// Do not copy these defines in the [vertex] section. #ifndef USE_GLES_OVER_GL #ifdef GL_EXT_shader_texture_lod #extension GL_EXT_shader_texture_lod : enable @@ -720,7 +706,7 @@ precision highp int; precision mediump float; precision mediump int; #endif -#endif // USE_GLES_OVER_GL +#endif #include "stdlib.glsl" diff --git a/drivers/gles2/shaders/stdlib.glsl b/drivers/gles2/shaders/stdlib.glsl index d853907ff9..3674d70c9f 100644 --- a/drivers/gles2/shaders/stdlib.glsl +++ b/drivers/gles2/shaders/stdlib.glsl @@ -1,6 +1,3 @@ -// Our GLSL "stdlib" -// texture2DLod defines *must* be done before including this, -// but before any non-preprocessor statement. vec2 select2(vec2 a, vec2 b, bvec2 c) { vec2 ret; |