maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #26928 from akien-mga/gles2-texture2DLod-ext-check

Browse source 
GLES2: Ensure extension checks for texture2DLod
This commit is contained in:
Rémi Verschelde 2019-03-11 20:51:36 +01:00 committed by GitHub
parent d9235be54b f5f565e3e4
commit bc3c6338cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/gles2/shaders/canvas.glsl
View file

@ -220,29 +220,6 @@ VERTEX_SHADER_CODE
/* clang-format off */
[fragment]
#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
#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

9
drivers/gles2/shaders/cubemap_filter.glsl
View file

@ -26,14 +26,12 @@ void main() {
[fragment]
#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
#endif // !USE_GLES_OVER_GL
#ifdef GL_ARB_shader_texture_lod
#extension GL_ARB_shader_texture_lod : enable
@ -44,8 +42,6 @@ void main() {
#define textureCubeLod(img, coord, lod) textureCube(img, coord, lod)
#endif
#ifdef USE_GLES_OVER_GL
#define lowp
#define mediump
@ -58,8 +54,7 @@ precision highp int;
precision mediump float;
precision mediump int;
#endif
#endif
#endif // USE_GLES_OVER_GL
#ifdef USE_SOURCE_PANORAMA
uniform sampler2D source_panorama; //texunit:0

10
drivers/gles2/shaders/scene.glsl
View file

@ -16,7 +16,6 @@ precision highp int;
#define M_PI 3.14159265359
//
// attributes
//
@ -676,14 +675,12 @@ VERTEX_SHADER_CODE
[fragment]
#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
#endif // !USE_GLES_OVER_GL
#ifdef GL_ARB_shader_texture_lod
#extension GL_ARB_shader_texture_lod : enable
@ -694,9 +691,6 @@ VERTEX_SHADER_CODE
#define textureCubeLod(img, coord, lod) textureCube(img, coord, lod)
#endif
#ifdef USE_GLES_OVER_GL
#define lowp
#define mediump
@ -709,7 +703,7 @@ precision highp int;
precision mediump float;
precision mediump int;
#endif
#endif
#endif // USE_GLES_OVER_GL
#include "stdlib.glsl"

16
drivers/gles2/shaders/stdlib.glsl
View file

@ -1,3 +1,19 @@
#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
vec2 select2(vec2 a, vec2 b, bvec2 c) {
vec2 ret;