Unverified Commit bc3c6338 authored by Rémi Verschelde's avatar Rémi Verschelde Committed by GitHub
Browse files

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

GLES2: Ensure extension checks for texture2DLod
parents d9235be5 f5f565e3

drivers/gles2/shaders/canvas.glsl

+0 −23
Original line number Diff line number Diff line
@@ -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

drivers/gles2/shaders/cubemap_filter.glsl

+2 −7
Original line number Diff line number Diff line
@@ -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

drivers/gles2/shaders/scene.glsl

+2 −8
Original line number Diff line number Diff line
@@ -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"

drivers/gles2/shaders/stdlib.glsl

+16 −0
Original line number Diff line number Diff line 
#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;