X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=609cdb1968ac896627045cf8de82c61dd9284d15;hb=6997ed1c07c382c0f66c57c080934ad53e1d3713;hp=91182a65725f3cae26a509ed588492ba08cfb881;hpb=e8369afbde298a3011a341cd2d4dfed76ecd8d3b;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 91182a65..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);
@@ -1028,11 +1035,13 @@ void SpirVGenerator::visit(TernaryExpression &ternary)
 	writer.write_op_label(true_label_id);
 	ternary.true_expr->visit(*this);
 	Id true_result_id = r_expression_result_id;
+	true_label_id = writer.get_current_block();
 	writer.write_op(content.function_body, OP_BRANCH, merge_block_id);
 
 	writer.write_op_label(false_label_id);
 	ternary.false_expr->visit(*this);
 	Id false_result_id = r_expression_result_id;
+	false_label_id = writer.get_current_block();
 
 	writer.write_op_label(merge_block_id);
 	r_expression_result_id = begin_expression(OP_PHI, get_id(*ternary.type), 4);
@@ -1815,11 +1824,12 @@ void SpirVGenerator::visit(FunctionDeclaration &func)
 		variable_load_ids[func.parameters[i].get()] = param_id;
 	}
 
+	reachable = true;
 	writer.begin_function_body(next_id++);
 	SetForScope<FunctionDeclaration *> set_func(current_function, &func);
 	func.body.visit(*this);
 
-	if(writer.has_current_block())
+	if(writer.get_current_block())
 	{
 		if(!reachable)
 			writer.write_op(content.function_body, OP_UNREACHABLE);
@@ -1846,9 +1856,11 @@ 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.has_current_block())
+	if(writer.get_current_block())
 		writer.write_op(content.function_body, OP_BRANCH, merge_block_id);
 
 	bool reachable_if_true = reachable;
@@ -1856,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;
@@ -1870,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++;