godotengine/godot-angle-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-angle-static.git synced 2026-01-06 02:09:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Expand support in angle_shader_translator

Browse Source 
1. Add GLES3.2 support
2. Add support for tessellation control and eveluation shaders
3. Enable "variables" compile option when generating SPIRV

Bug: angleproject:7773
Change-Id: I372343bf70edf80d40a410d70ccb63334f2b1450
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3967819
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
This commit is contained in:
Mohan Maiya
2022-10-19 16:52:36 -07:00
committed by Angle LUCI CQ
parent 6193274a52
commit 3245e55530
1 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
samples/shader_translator/shader_translator.cpp
View File

@@ -85,6 +85,8 @@ int main(int argc, char *argv[])
ShHandle fragmentCompiler = 0;
ShHandle computeCompiler = 0;
ShHandle geometryCompiler = 0;
ShHandle tessEvalCompiler = 0;
ShHandle tessControlCompiler = 0;
ShShaderSpec spec = SH_GLES2_SPEC;
ShShaderOutput output = SH_ESSL_OUTPUT;
@@ -125,6 +127,10 @@ int main(int argc, char *argv[])
{
spec = SH_GLES3_1_SPEC;
}
else if (argv[0][5] == '2')
{
spec = SH_GLES3_2_SPEC;
}
else
{
spec = SH_GLES3_SPEC;
@@ -192,6 +198,7 @@ int main(int argc, char *argv[])
case 'v':
output = SH_SPIRV_VULKAN_OUTPUT;
compileOptions.initializeUninitializedLocals = true;
compileOptions.variables = true;
break;
case 'h':
if (argv[0][4] == '1' && argv[0][5] == '1')
@@ -317,11 +324,32 @@ int main(int argc, char *argv[])
case GL_GEOMETRY_SHADER_EXT:
if (geometryCompiler == 0)
{
resources.EXT_geometry_shader = 1;
geometryCompiler =
sh::ConstructCompiler(GL_GEOMETRY_SHADER_EXT, spec, output, &resources);
}
compiler = geometryCompiler;
break;
case GL_TESS_CONTROL_SHADER_EXT:
if (tessControlCompiler == 0)
{
assert(spec == SH_GLES3_1_SPEC || spec == SH_GLES3_2_SPEC);
resources.EXT_tessellation_shader = 1;
tessControlCompiler = sh::ConstructCompiler(GL_TESS_CONTROL_SHADER_EXT,
spec, output, &resources);
}
compiler = tessControlCompiler;
break;
case GL_TESS_EVALUATION_SHADER_EXT:
if (tessEvalCompiler == 0)
{
assert(spec == SH_GLES3_1_SPEC || spec == SH_GLES3_2_SPEC);
resources.EXT_tessellation_shader = 1;
tessEvalCompiler = sh::ConstructCompiler(GL_TESS_EVALUATION_SHADER_EXT,
spec, output, &resources);
}
compiler = tessEvalCompiler;
break;
default:
break;
}
@@ -381,19 +409,39 @@ int main(int argc, char *argv[])
}
if ((vertexCompiler == 0) && (fragmentCompiler == 0) && (computeCompiler == 0) &&
(geometryCompiler == 0))
(geometryCompiler == 0) && (tessControlCompiler == 0) && (tessEvalCompiler == 0))
{
failCode = EFailUsage;
}
if (failCode == EFailUsage)
{
usage();
}
if (vertexCompiler)
{
sh::Destruct(vertexCompiler);
}
if (fragmentCompiler)
{
sh::Destruct(fragmentCompiler);
}
if (computeCompiler)
{
sh::Destruct(computeCompiler);
}
if (geometryCompiler)
{
sh::Destruct(geometryCompiler);
}
if (tessControlCompiler)
{
sh::Destruct(tessControlCompiler);
}
if (tessEvalCompiler)
{
sh::Destruct(tessEvalCompiler);
}
sh::Finalize();
#if defined(ANGLE_ENABLE_VULKAN)
@@ -411,13 +459,14 @@ void usage()
// clang-format off
printf(
"Usage: translate [-i -o -u -l -b=e -b=g -b=h9 -x=i -x=d] file1 file2 ...\n"
"Where: filename : filename ending in .frag or .vert\n"
"Where: filename : filename ending in .frag*, .vert*, .comp*, .geom*, .tcs* or .tes*\n"
" -i : print intermediate tree\n"
" -o : print translated code\n"
" -u : print active attribs, uniforms, varyings and program outputs\n"
" -s=e2 : use GLES2 spec (this is by default)\n"
" -s=e3 : use GLES3 spec\n"
" -s=e31 : use GLES31 spec (in development)\n"
" -s=e32 : use GLES32 spec (in development)\n"
" -s=w : use WebGL 1.0 spec\n"
" -s=wn : use WebGL 1.0 spec with no highp support in fragment shaders\n"
" -s=w2 : use WebGL 2.0 spec\n"
@@ -454,6 +503,10 @@ void usage()
//
// .frag* = fragment shader
// .vert* = vertex shader
// .comp* = compute shader
// .geom* = geometry shader
// .tcs* = tessellation control shader
// .tes* = tessellation evaluation shader
//
sh::GLenum FindShaderType(const char *fileName)
{
@@ -476,6 +529,10 @@ sh::GLenum FindShaderType(const char *fileName)
return GL_COMPUTE_SHADER;
if (strncmp(ext, ".geom", 5) == 0)
return GL_GEOMETRY_SHADER_EXT;
if (strncmp(ext, ".tcs", 5) == 0)
return GL_TESS_CONTROL_SHADER_EXT;
if (strncmp(ext, ".tes", 5) == 0)
return GL_TESS_EVALUATION_SHADER_EXT;
}
return GL_FRAGMENT_SHADER;