diff options
| -rw-r--r-- | src/compiler/spirv/vtn_private.h | 14 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_variables.c | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h index 59fcc94fcda..a377c901446 100644 --- a/src/compiler/spirv/vtn_private.h +++ b/src/compiler/spirv/vtn_private.h @@ -288,6 +288,20 @@ struct vtn_variable { nir_variable *var; nir_variable **members; + /** + * In some early released versions of GLSLang, it implemented all function + * calls by making copies of all parameters into temporary variables and + * passing those variables into the function. It even did so for samplers + * and images which violates the SPIR-V spec. Unfortunately, two games + * (Talos Principle and Doom) shipped with this old version of GLSLang and + * also happen to pass samplers into functions. Talos Principle received + * an update fairly shortly after release with an updated GLSLang. Doom, + * on the other hand, has never received an update so we need to work + * around this GLSLang issue in SPIR-V -> NIR. Hopefully, we can drop this + * hack at some point in the future. + */ + struct vtn_access_chain *copy_prop_sampler; + struct vtn_access_chain chain; }; diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 0f0cc1cd5c4..974adb5d5c7 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -96,6 +96,10 @@ rewrite_deref_types(nir_deref *deref, const struct glsl_type *type) nir_deref_var * vtn_access_chain_to_deref(struct vtn_builder *b, struct vtn_access_chain *chain) { + /* Do on-the-fly copy propagation for samplers. */ + if (chain->var->copy_prop_sampler) + return vtn_access_chain_to_deref(b, chain->var->copy_prop_sampler); + nir_deref_var *deref_var; if (chain->var->var) { deref_var = nir_deref_var_create(b, chain->var->var); @@ -1613,6 +1617,16 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode, case SpvOpStore: { struct vtn_access_chain *dest = vtn_value(b, w[1], vtn_value_type_access_chain)->access_chain; + + if (glsl_type_is_sampler(dest->var->type->type)) { + vtn_warn("OpStore of a sampler detected. Doing on-the-fly copy " + "propagation to workaround the problem."); + assert(dest->var->copy_prop_sampler == NULL); + dest->var->copy_prop_sampler = + vtn_value(b, w[2], vtn_value_type_access_chain)->access_chain; + break; + } + struct vtn_ssa_value *src = vtn_ssa_value(b, w[2]); vtn_variable_store(b, src, dest); break; |