X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=609cdb1968ac896627045cf8de82c61dd9284d15;hb=30904c6b6e7d885d9ade818328a2137c204e7efe;hp=7bec551b166fd4b3303c23591c24886f1baac9b6;hpb=7ab4261d281c7885bbdfb0a782ed231b2cd08293;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 7bec551b..609cdb19 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -690,6 +690,9 @@ void SpirVGenerator::visit(Swizzle &swizzle)
 
 void SpirVGenerator::visit(UnaryExpression &unary)
 {
+	if(composite_access)
+		return visit_isolated(unary);
+
 	unary.expression->visit(*this);
 
 	char oper = unary.oper->token[0];
@@ -774,6 +777,8 @@ void SpirVGenerator::visit(BinaryExpression &binary)
 		visit_isolated(*binary.right);
 		return visit_composite(*binary.left, 0x400000|r_expression_result_id, *binary.type);
 	}
+	else if(composite_access)
+		return visit_isolated(binary);
 
 	if(assignment_source_id)
 		throw internal_error("invalid binary expression in assignment target");
@@ -998,6 +1003,8 @@ void SpirVGenerator::visit(Assignment &assign)
 
 void SpirVGenerator::visit(TernaryExpression &ternary)
 {
+	if(composite_access)
+		return visit_isolated(ternary);
 	if(constant_expression)
 	{
 		ternary.condition->visit(*this);
@@ -1849,6 +1856,8 @@ void SpirVGenerator::visit(Conditional &cond)
 	writer.write_op(content.function_body, OP_SELECTION_MERGE, merge_block_id, 0);  // Selection control (none)
 	writer.write_op(content.function_body, OP_BRANCH_CONDITIONAL, r_expression_result_id, true_label_id, false_label_id);
 
+	std::map<const VariableDeclaration *, Id> saved_load_ids = variable_load_ids;
+
 	writer.write_op_label(true_label_id);
 	cond.body.visit(*this);
 	if(writer.get_current_block())
@@ -1859,6 +1868,7 @@ void SpirVGenerator::visit(Conditional &cond)
 	reachable = true;
 	if(!cond.else_body.body.empty())
 	{
+		swap(saved_load_ids, variable_load_ids);
 		writer.write_op_label(false_label_id);
 		cond.else_body.visit(*this);
 		reachable |= reachable_if_true;
@@ -1873,8 +1883,9 @@ void SpirVGenerator::visit(Iteration &iter)
 	if(iter.init_statement)
 		iter.init_statement->visit(*this);
 
-	for(VariableDeclaration *v: AssignmentCollector().apply(iter))
-		variable_load_ids.erase(v);
+	for(Node *n: AssignmentCollector().apply(iter))
+		if(VariableDeclaration *var = dynamic_cast<VariableDeclaration *>(n))
+			variable_load_ids.erase(var);
 
 	Id header_id = next_id++;
 	Id continue_id = next_id++;