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

Merge pull request #734 from zeux/master

Browse Source 
Fix Options::force_temporary to work with OpenGL GLSL
This commit is contained in:
Hans-Kristian Arntzen 2018-10-30 21:18:51 +01:00 committed by GitHub
commit dfd1bf8c56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spirv_glsl.cpp
View File

@ -5856,11 +5856,21 @@ std::pair<std::string, uint32_t> CompilerGLSL::flattened_access_chain_offset(con
bool CompilerGLSL::should_forward(uint32_t id) bool CompilerGLSL::should_forward(uint32_t id)
{ {
// Immutable expression can always be forwarded. // If id is a variable we will try to forward it regardless of force_temporary check below
// If not immutable, we can speculate about it by forwarding potentially mutable variables. // This is important because otherwise we'll get local sampler copies (highp sampler2D foo = bar) that are invalid in OpenGL GLSL
auto *var = maybe_get<SPIRVariable>(id); auto *var = maybe_get<SPIRVariable>(id);
bool forward = var ? var->forwardable : false; if (var && var->forwardable)
return (is_immutable(id) || forward) && !options.force_temporary; return true;
// For debugging emit temporary variables for all expressions
if (options.force_temporary)
return false;
// Immutable expression can always be forwarded.
if (is_immutable(id))
return true;
return false;
} }
void CompilerGLSL::track_expression_read(uint32_t id) void CompilerGLSL::track_expression_read(uint32_t id)