AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for shadowXY() sample instructions in legacy GLSL

Browse Source
This commit is contained in:
Sidney Just 2018-06-22 00:28:40 -07:00
parent 0039cb86fc
commit f6dad78c99
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spirv_glsl.cpp
View File

@ -3542,6 +3542,7 @@ string CompilerGLSL::legacy_tex_op(const std::string &op, const SPIRType &imgtyp
require_extension_internal("GL_ARB_shader_texture_lod");
}
// texture
if (op == "texture")
return join("texture", type);
else if (op == "textureLod")
@ -3562,6 +3563,27 @@ string CompilerGLSL::legacy_tex_op(const std::string &op, const SPIRType &imgtyp
else
return join("texture", type);
}
// shadow
else if (op == "shadow")
return join("shadow", type);
else if (op == "shadowLodOffset")
{
if (use_explicit_lod)
return join("shadow", type, "LodOffset");
else
return join("shadow", type);
}
else if (op == "shadowProjGrad")
return join("shadow", type, "ProjGrad");
else if (op == "shadowGrad")
return join("shadow", type, "Grad");
else if (op == "shadowProjLodOffset")
{
if (use_explicit_lod)
return join("shadow", type, "ProjLodOffset");
else
return join("shadow", type);
}
else
{
SPIRV_CROSS_THROW(join("Unsupported legacy texture op: ", op));
@ -3924,6 +3946,10 @@ void CompilerGLSL::emit_texture_op(const Instruction &i)
coffset, offset, bias, comp, sample, &forward);
expr += ")";
// texture(samplerXShadow) returns float. shadowX() returns vec4. Swizzle here.
if (is_legacy() && ((imgtype.basetype == SPIRType::SampledImage) || (imgtype.basetype == SPIRType::Sampler)) && imgtype.image.depth)
expr += ".r";
emit_op(result_type, id, expr, forward);
for (auto &inherit : inherited_expressions)
inherit_expression_dependencies(id, inherit);
@ -3968,7 +3994,10 @@ string CompilerGLSL::to_function_name(uint32_t, const SPIRType &imgtype, bool is
fname += "texelFetch";
else
{
fname += "texture";
if (is_legacy() && ((imgtype.basetype == SPIRType::SampledImage) || (imgtype.basetype == SPIRType::Sampler)) && imgtype.image.depth)
fname += "shadow";
else
fname += "texture";
if (is_gather)
fname += "Gather";