lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-22 21:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GLES shader compile errors

Browse Source 
Detected two shader compile errors while replaying GLES apps:
1. „#extension directive must occur before any non-preprocessor token” -  Fix the order of precisions and extensions in the shader code.
2. „extension 'GL_OES_texture_cube_map_array' is not supported”  - Do not add extensions if they are actually not supported. TEXTURE_CUBE_MAP_ARRAY was added to GLES 3.2 so   GL_OES_texture_cube_map_array and GL_EXT_texture_cube_map_array are no longer used.
This commit is contained in:
tabi.katalin
2019-02-25 11:30:25 +00:00
committed by Baldur Karlsson
parent e9e1d91b34
commit 2507532623
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/data/glsl/glsl_globals.h
+2
View File
@@ -56,6 +56,8 @@
#define PRECISION
#else
#define PRECISION highp
precision highp float;
precision highp int;
#endif
#ifndef FLT_EPSILON
renderdoc/data/glsl/trisize.geom
+2 -2
View File
@@ -22,13 +22,13 @@
* THE SOFTWARE.
******************************************************************************/
#include "glsl_globals.h"
#if defined(OPENGL_ES)
#extension GL_EXT_geometry_shader : enable
#extension GL_OES_geometry_shader : enable
#endif
#include "glsl_globals.h"
layout(triangles) in;
layout(triangle_strip, max_vertices = 3) out;
renderdoc/data/glsl_shaders.cpp
+1 -3
View File
@@ -98,9 +98,7 @@ std::string GenerateGLSLShader(const std::string &shader, ShaderType type, int v
if(type == eShaderGLSLES)
combined +=
"#define OPENGL 1\n"
"#define OPENGL_ES 1\n"
"precision highp float;\n"
"precision highp int;\n";
"#define OPENGL_ES 1\n";
else if(type == eShaderGLSL)
combined +=
"#define OPENGL 1\n"
renderdoc/driver/gl/gl_common.h
+2 -2
View File
@@ -734,8 +734,8 @@ extern bool IsGLES;
EXT_TO_CHECK(99, 32, EXT_primitive_bounding_box) \
EXT_TO_CHECK(99, 32, OES_primitive_bounding_box) \
EXT_TO_CHECK(99, 32, OES_texture_border_color) \
EXT_TO_CHECK(99, 32, EXT_texture_cube_map_array) \
EXT_TO_CHECK(99, 32, OES_texture_cube_map_array) \
EXT_TO_CHECK(99, 99, EXT_texture_cube_map_array) \
EXT_TO_CHECK(99, 99, OES_texture_cube_map_array) \
EXT_TO_CHECK(99, 32, OES_texture_storage_multisample_2d_array) \
EXT_TO_CHECK(99, 99, EXT_clip_cull_distance) \
EXT_TO_CHECK(99, 99, EXT_multisample_compatibility) \
renderdoc/driver/gl/gl_debug.cpp
+1 -1
View File
@@ -332,7 +332,7 @@ void GLReplay::InitDebugData()
if(GLCoreVersion >= 32)
glslVersion = glslBaseVer = glslCSVer = 320;
if(HasExt[OES_texture_cube_map_array] || HasExt[EXT_texture_cube_map_array])
if(HasExt[OES_texture_cube_map_array] || HasExt[EXT_texture_cube_map_array] || GLCoreVersion >= 32)
texSampleDefines += "#define TEXSAMPLE_CUBE_ARRAY 1\n";
if(HasExt[OES_texture_cube_map_array])