浏览代码

Fix problem with texture2Dlod, closes #25263

Juan Linietsky 6 年之前
父节点
当前提交
2d57ec2460
共有 3 个文件被更改,包括 10 次插入3 次删除
  1. 4 1
      drivers/gles2/shaders/canvas.glsl
  2. 3 1
      drivers/gles2/shaders/cubemap_filter.glsl
  3. 3 1
      drivers/gles2/shaders/scene.glsl

+ 4 - 1
drivers/gles2/shaders/canvas.glsl

@@ -223,16 +223,19 @@ VERTEX_SHADER_CODE
 #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
 
-#endif
+
 
 
 #ifdef USE_GLES_OVER_GL

+ 3 - 1
drivers/gles2/shaders/cubemap_filter.glsl

@@ -33,6 +33,8 @@ void main() {
 #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
@@ -42,7 +44,7 @@ void main() {
 #define textureCubeLod(img, coord, lod) textureCube(img, coord, lod)
 #endif
 
-#endif
+
 
 #ifdef USE_GLES_OVER_GL
 #define lowp

+ 3 - 1
drivers/gles2/shaders/scene.glsl

@@ -664,6 +664,8 @@ VERTEX_SHADER_CODE
 #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
@@ -673,7 +675,7 @@ VERTEX_SHADER_CODE
 #define textureCubeLod(img, coord, lod) textureCube(img, coord, lod)
 #endif
 
-#endif
+
 
 
 #ifdef USE_GLES_OVER_GL