lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation of all debug shaders on GLES

Browse Source
This commit is contained in:
baldurk
2018-10-04 16:02:38 +01:00
parent cf41950897
commit 7a6580bb0f
6 changed files with 93 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/data/glsl/array2ms.comp
+4 -3
View File
@@ -23,12 +23,13 @@
******************************************************************************/
//#extension_nongles GL_ARB_compute_shader : require
//#extension_gles GL_OES_texture_storage_multisample_2d_array : require
layout (local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(binding = 0) uniform usampler2DArray srcArray;
layout(binding = 0) uniform PRECISION usampler2DArray srcArray;
// binding = 1 used as stencil read in the depth-stencil copy fragment shaders
layout(binding = 2) writeonly uniform uimage2DMSArray dstMS;
layout(rgba32ui, binding = 2) writeonly uniform PRECISION uimage2DMSArray dstMS;
#ifdef VULKAN
@@ -58,7 +59,7 @@ uniform ivec4 mscopy;
void main()
{
uvec3 id = gl_GlobalInvocationID;
ivec3 id = ivec3(gl_GlobalInvocationID);
int slice = sliceOffset + int(id.z / numMultiSamples);
int sampleIdx = sampleOffset + int(id.z % numMultiSamples);
renderdoc/data/glsl/deptharr2ms.frag
+2 -2
View File
@@ -24,8 +24,8 @@
//#extension_glcore GL_ARB_sample_shading : require
layout(binding = 0) uniform sampler2DArray srcDepthArray;
layout(binding = 1) uniform usampler2DArray srcStencilArray;
layout(binding = 0) uniform PRECISION sampler2DArray srcDepthArray;
layout(binding = 1) uniform PRECISION usampler2DArray srcStencilArray;
// binding = 2 used as an image in the colour copy compute shaders
#ifdef VULKAN
renderdoc/data/glsl/depthms2arr.frag
+2 -2
View File
@@ -22,8 +22,8 @@
* THE SOFTWARE.
******************************************************************************/
layout(binding = 0) uniform sampler2DMSArray srcDepthMS;
layout(binding = 1) uniform usampler2DMSArray srcStencilMS;
layout(binding = 0) uniform PRECISION sampler2DMSArray srcDepthMS;
layout(binding = 1) uniform PRECISION usampler2DMSArray srcStencilMS;
// binding = 2 used as an image in the colour copy compute shaders
#ifdef VULKAN
renderdoc/data/glsl/ms2array.comp
+3 -3
View File
@@ -26,9 +26,9 @@
layout (local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(binding = 0) uniform usampler2DMSArray srcMS;
layout(binding = 0) uniform PRECISION usampler2DMSArray srcMS;
// binding = 1 used as stencil read in the depth-stencil copy fragment shaders
layout(binding = 2) writeonly uniform uimage2DArray dstArray;
layout(rgba32ui, binding = 2) writeonly uniform PRECISION uimage2DArray dstArray;
#ifdef VULKAN
@@ -59,7 +59,7 @@ uniform ivec4 mscopy;
void main()
{
uvec3 id = gl_GlobalInvocationID;
ivec3 id = ivec3(gl_GlobalInvocationID);
int slice = int(id.z / numMultiSamples);
int sampleIdx = int(id.z % numMultiSamples);
renderdoc/driver/gl/gl_common.h
+3 -1
View File
@@ -655,7 +655,9 @@ extern bool IsGLES;
EXT_TO_CHECK(43, 31, ARB_program_interface_query) \
EXT_TO_CHECK(43, 31, ARB_shader_storage_buffer_object) \
EXT_TO_CHECK(43, 31, ARB_stencil_texturing) \
EXT_TO_CHECK(43, 32, ARB_texture_storage_multisample) \
/* See above with ARB_texture_multisample_no_array */ \
EXT_TO_CHECK(43, 32, ARB_texture_storage_multisample_no_array) \
EXT_TO_CHECK(43, 99, ARB_texture_storage_multisample) \
EXT_TO_CHECK(43, 99, ARB_texture_view) \
EXT_TO_CHECK(43, 31, ARB_vertex_attrib_binding) \
EXT_TO_CHECK(43, 32, KHR_debug) \
renderdoc/driver/gl/gl_debug.cpp
+79 -61
View File
@@ -244,6 +244,9 @@ void GLReplay::InitDebugData()
{
glslVersion = glslBaseVer = glslCSVer = 310;
shaderType = eShaderGLSLES;
if(GLCoreVersion >= 32)
glslVersion = glslBaseVer = glslCSVer = 320;
}
else
{
@@ -252,10 +255,6 @@ void GLReplay::InitDebugData()
shaderType = eShaderGLSL;
}
// TODO In case of GLES some currently unused shaders, which are guarded by HasExt[..] checks,
// still contain compile errors (e.g. array2ms.comp, ms2array.comp, quad*, etc.).
bool glesShadersAreComplete = !IsGLES;
GenerateGLSLShader(vs, shaderType, "", GetEmbeddedResource(glsl_blit_vert), glslBaseVer);
// used to combine with custom shaders.
@@ -300,6 +299,7 @@ void GLReplay::InitDebugData()
GenerateGLSLShader(vs, shaderType, "", GetEmbeddedResource(glsl_blit_vert), glslBaseVer);
DebugData.fixedcolFragShader = DebugData.quadoverdrawFragShader = 0;
DebugData.quadoverdrawResolveProg = 0;
if(IsGLES)
{
@@ -327,7 +327,6 @@ void GLReplay::InitDebugData()
MessageSource::RuntimeWarning,
"GL_ARB_shader_image_load_store/GL_ARB_gpu_shader5 not supported, "
"disabling quad overdraw feature.");
DebugData.quadoverdrawResolveProg = 0;
}
GenerateGLSLShader(fs, shaderType, "", GetEmbeddedResource(glsl_checkerboard_frag), glslBaseVer);
@@ -435,67 +434,72 @@ void GLReplay::InitDebugData()
ARRAY_COUNT(DebugData.minmaxTileProgram) >= (TEXDISPLAY_SINT_TEX | TEXDISPLAY_TYPEMASK) + 1,
"not enough programs");
string extensions =
"#extension GL_ARB_compute_shader : require\n"
"#extension GL_ARB_shader_storage_buffer_object : require\n";
string extensions = "#extension GL_ARB_compute_shader : require\n";
for(int t = 1; glesShadersAreComplete && HasExt[ARB_compute_shader] && t <= RESTYPE_TEXTYPEMAX;
t++)
if(!IsGLES)
extensions += "#extension GL_ARB_shader_storage_buffer_object : require\n";
if(HasExt[ARB_compute_shader] && HasExt[ARB_shader_storage_buffer_object])
{
// float, uint, sint
for(int i = 0; i < 3; i++)
for(int t = 1; t <= RESTYPE_TEXTYPEMAX; t++)
{
int idx = t;
if(i == 1)
idx |= TEXDISPLAY_UINT_TEX;
if(i == 2)
idx |= TEXDISPLAY_SINT_TEX;
// float, uint, sint
for(int i = 0; i < 3; i++)
{
string defines = extensions;
defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n";
defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
int idx = t;
if(i == 1)
idx |= TEXDISPLAY_UINT_TEX;
if(i == 2)
idx |= TEXDISPLAY_SINT_TEX;
GenerateGLSLShader(cs, shaderType, defines, GetEmbeddedResource(glsl_minmaxtile_comp),
glslCSVer);
{
string defines = extensions;
defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n";
defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
DebugData.minmaxTileProgram[idx] = CreateCShaderProgram(cs);
}
GenerateGLSLShader(cs, shaderType, defines, GetEmbeddedResource(glsl_minmaxtile_comp),
glslCSVer);
{
string defines = extensions;
defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n";
defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
DebugData.minmaxTileProgram[idx] = CreateCShaderProgram(cs);
}
GenerateGLSLShader(cs, shaderType, defines, GetEmbeddedResource(glsl_histogram_comp),
glslCSVer);
{
string defines = extensions;
defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n";
defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
DebugData.histogramProgram[idx] = CreateCShaderProgram(cs);
}
GenerateGLSLShader(cs, shaderType, defines, GetEmbeddedResource(glsl_histogram_comp),
glslCSVer);
if(t == 1)
{
string defines = extensions;
defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n";
defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
DebugData.histogramProgram[idx] = CreateCShaderProgram(cs);
}
GenerateGLSLShader(cs, shaderType, defines, GetEmbeddedResource(glsl_minmaxresult_comp),
glslCSVer);
if(t == 1)
{
string defines = extensions;
defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n";
defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
DebugData.minmaxResultProgram[i] = CreateCShaderProgram(cs);
GenerateGLSLShader(cs, shaderType, defines, GetEmbeddedResource(glsl_minmaxresult_comp),
glslCSVer);
DebugData.minmaxResultProgram[i] = CreateCShaderProgram(cs);
}
}
}
}
if(!HasExt[ARB_compute_shader])
else
{
RDCWARN("GL_ARB_compute_shader not supported, disabling min/max and histogram features.");
m_pDriver->AddDebugMessage(
MessageCategory::Portability, MessageSeverity::Medium, MessageSource::RuntimeWarning,
"GL_ARB_compute_shader not supported, disabling min/max and histogram features.");
RDCWARN(
"GL_ARB_compute_shader or ARB_shader_storage_buffer_object not supported, disabling "
"min/max and histogram features.");
m_pDriver->AddDebugMessage(MessageCategory::Portability, MessageSeverity::Medium,
MessageSource::RuntimeWarning,
"GL_ARB_compute_shader or ARB_shader_storage_buffer_object not "
"supported, disabling min/max and histogram features.");
}
drv.glGenBuffers(1, &DebugData.minmaxTileResult);
@@ -515,7 +519,8 @@ void GLReplay::InitDebugData()
eGL_DYNAMIC_READ);
}
if(glesShadersAreComplete && HasExt[ARB_compute_shader])
if(HasExt[ARB_compute_shader] && HasExt[ARB_texture_multisample] &&
HasExt[ARB_texture_storage_multisample])
{
GenerateGLSLShader(cs, shaderType, "", GetEmbeddedResource(glsl_ms2array_comp), glslCSVer);
DebugData.MS2Array = CreateCShaderProgram(cs);
@@ -527,15 +532,18 @@ void GLReplay::InitDebugData()
{
DebugData.MS2Array = 0;
DebugData.Array2MS = 0;
RDCWARN("GL_ARB_compute_shader not supported, disabling 2DMS save/load.");
m_pDriver->AddDebugMessage(MessageCategory::Portability, MessageSeverity::Medium,
MessageSource::RuntimeWarning,
"GL_ARB_compute_shader not supported, disabling 2DMS save/load.");
RDCWARN(
"GL_ARB_compute_shader, GL_ARB_texture_multisample, or ARB_texture_storage_multisample not "
"supported, disabling 2DMS save/load.");
m_pDriver->AddDebugMessage(
MessageCategory::Portability, MessageSeverity::Medium, MessageSource::RuntimeWarning,
"GL_ARB_compute_shader, GL_ARB_texture_multisample, or ARB_texture_storage_multisample not "
"supported, disabling 2DMS save/load.");
}
DebugData.DepthArray2MS = DebugData.DepthMS2Array = 0;
if(glesShadersAreComplete && HasExt[ARB_texture_multisample])
if(HasExt[ARB_texture_multisample])
{
GenerateGLSLShader(vs, shaderType, "", GetEmbeddedResource(glsl_blit_vert), glslBaseVer);
@@ -545,12 +553,22 @@ void GLReplay::InitDebugData()
GenerateGLSLShader(fs, shaderType, "", GetEmbeddedResource(glsl_deptharr2ms_frag), glslBaseVer);
DebugData.DepthArray2MS = CreateShaderProgram(vs, fs);
}
if(glesShadersAreComplete && HasExt[ARB_compute_shader])
else
{
string defines =
"#extension GL_ARB_compute_shader : require\n"
"#extension GL_ARB_shader_storage_buffer_object : require";
DebugData.MS2Array = 0;
DebugData.Array2MS = 0;
RDCWARN("GL_ARB_texture_multisample not supported, disabling 2DMS depth-stencil save/load.");
m_pDriver->AddDebugMessage(
MessageCategory::Portability, MessageSeverity::Medium, MessageSource::RuntimeWarning,
"GL_ARB_texture_multisample not supported, disabling 2DMS depth-stencil save/load.");
}
if(HasExt[ARB_compute_shader])
{
string defines = "#extension GL_ARB_compute_shader : require\n";
if(!IsGLES)
defines += "#extension GL_ARB_shader_storage_buffer_object : require";
GenerateGLSLShader(cs, shaderType, defines, GetEmbeddedResource(glsl_mesh_comp), glslCSVer);
DebugData.meshPickProgram = CreateCShaderProgram(cs);
}