OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: replace unreachable code with an assert()

Browse Source 
All interface blocks will have been lowered by this point so just
use an assert. Returning false would have caused all sorts of
problems if they were not lowered yet and there is an assert to
catch this later anyway.

We also update the tests to reflect this change.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri
2016-02-03 09:39:10 +11:00
parent e377037bef
commit c1bbaff1e8
2 changed files with 38 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/compiler/glsl/link_varyings.cpp
View File

@@ -1352,7 +1352,7 @@ private:
namespace linker { namespace linker {
bool void
populate_consumer_input_sets(void *mem_ctx, exec_list *ir, populate_consumer_input_sets(void *mem_ctx, exec_list *ir,
hash_table *consumer_inputs, hash_table *consumer_inputs,
hash_table *consumer_interface_inputs, hash_table *consumer_interface_inputs,
@@ -1366,8 +1366,8 @@ populate_consumer_input_sets(void *mem_ctx, exec_list *ir,
ir_variable *const input_var = node->as_variable(); ir_variable *const input_var = node->as_variable();
if ((input_var != NULL) && (input_var->data.mode == ir_var_shader_in)) { if ((input_var != NULL) && (input_var->data.mode == ir_var_shader_in)) {
if (input_var->type->is_interface()) /* All interface blocks should have been lowered by this point */
return false; assert(!input_var->type->is_interface());
if (input_var->data.explicit_location) { if (input_var->data.explicit_location) {
/* assign_varying_locations only cares about finding the /* assign_varying_locations only cares about finding the
@@ -1401,8 +1401,6 @@ populate_consumer_input_sets(void *mem_ctx, exec_list *ir,
} }
} }
} }
return true;
} }
/** /**
@@ -1626,18 +1624,11 @@ assign_varying_locations(struct gl_context *ctx,
if (producer) if (producer)
canonicalize_shader_io(producer->ir, ir_var_shader_out); canonicalize_shader_io(producer->ir, ir_var_shader_out);
if (consumer if (consumer)
&& !linker::populate_consumer_input_sets(mem_ctx, linker::populate_consumer_input_sets(mem_ctx, consumer->ir,
consumer->ir, consumer_inputs,
consumer_inputs, consumer_interface_inputs,
consumer_interface_inputs, consumer_inputs_with_locations);
consumer_inputs_with_locations)) {
assert(!"populate_consumer_input_sets failed");
hash_table_dtor(tfeedback_candidates);
hash_table_dtor(consumer_inputs);
hash_table_dtor(consumer_interface_inputs);
return false;
}
if (producer) { if (producer) {
foreach_in_list(ir_instruction, node, producer->ir) { foreach_in_list(ir_instruction, node, producer->ir) {

78
src/compiler/glsl/tests/varyings_test.cpp
View File

@@ -156,11 +156,11 @@ TEST_F(link_varyings, single_simple_input)
ir.push_tail(v); ir.push_tail(v);
ASSERT_TRUE(linker::populate_consumer_input_sets(mem_ctx, linker::populate_consumer_input_sets(mem_ctx,
&ir, &ir,
consumer_inputs, consumer_inputs,
consumer_interface_inputs, consumer_interface_inputs,
junk)); junk);
EXPECT_EQ((void *) v, hash_table_find(consumer_inputs, "a")); EXPECT_EQ((void *) v, hash_table_find(consumer_inputs, "a"));
EXPECT_EQ(1u, num_elements(consumer_inputs)); EXPECT_EQ(1u, num_elements(consumer_inputs));
@@ -183,11 +183,11 @@ TEST_F(link_varyings, gl_ClipDistance)
ir.push_tail(clipdistance); ir.push_tail(clipdistance);
ASSERT_TRUE(linker::populate_consumer_input_sets(mem_ctx, linker::populate_consumer_input_sets(mem_ctx,
&ir, &ir,
consumer_inputs, consumer_inputs,
consumer_interface_inputs, consumer_interface_inputs,
junk)); junk);
EXPECT_EQ(clipdistance, junk[VARYING_SLOT_CLIP_DIST0]); EXPECT_EQ(clipdistance, junk[VARYING_SLOT_CLIP_DIST0]);
EXPECT_TRUE(is_empty(consumer_inputs)); EXPECT_TRUE(is_empty(consumer_inputs));
@@ -205,11 +205,11 @@ TEST_F(link_varyings, single_interface_input)
ir.push_tail(v); ir.push_tail(v);
ASSERT_TRUE(linker::populate_consumer_input_sets(mem_ctx, linker::populate_consumer_input_sets(mem_ctx,
&ir, &ir,
consumer_inputs, consumer_inputs,
consumer_interface_inputs, consumer_interface_inputs,
junk)); junk);
char *const full_name = interface_field_name(simple_interface); char *const full_name = interface_field_name(simple_interface);
EXPECT_EQ((void *) v, hash_table_find(consumer_interface_inputs, full_name)); EXPECT_EQ((void *) v, hash_table_find(consumer_interface_inputs, full_name));
@@ -236,11 +236,11 @@ TEST_F(link_varyings, one_interface_and_one_simple_input)
ir.push_tail(iface); ir.push_tail(iface);
ASSERT_TRUE(linker::populate_consumer_input_sets(mem_ctx, linker::populate_consumer_input_sets(mem_ctx,
&ir, &ir,
consumer_inputs, consumer_inputs,
consumer_interface_inputs, consumer_interface_inputs,
junk)); junk);
char *const iface_field_name = interface_field_name(simple_interface); char *const iface_field_name = interface_field_name(simple_interface);
@@ -252,24 +252,6 @@ TEST_F(link_varyings, one_interface_and_one_simple_input)
EXPECT_EQ(1u, num_elements(consumer_inputs)); EXPECT_EQ(1u, num_elements(consumer_inputs));
} }
TEST_F(link_varyings, invalid_interface_input)
{
ir_variable *const v =
new(mem_ctx) ir_variable(simple_interface,
"named_interface",
ir_var_shader_in);
ASSERT_EQ(simple_interface, v->get_interface_type());
ir.push_tail(v);
EXPECT_FALSE(linker::populate_consumer_input_sets(mem_ctx,
&ir,
consumer_inputs,
consumer_interface_inputs,
junk));
}
TEST_F(link_varyings, interface_field_doesnt_match_noninterface) TEST_F(link_varyings, interface_field_doesnt_match_noninterface)
{ {
char *const iface_field_name = interface_field_name(simple_interface); char *const iface_field_name = interface_field_name(simple_interface);
@@ -283,11 +265,11 @@ TEST_F(link_varyings, interface_field_doesnt_match_noninterface)
ir.push_tail(in_v); ir.push_tail(in_v);
ASSERT_TRUE(linker::populate_consumer_input_sets(mem_ctx, linker::populate_consumer_input_sets(mem_ctx,
&ir, &ir,
consumer_inputs, consumer_inputs,
consumer_interface_inputs, consumer_interface_inputs,
junk)); junk);
/* Create an output variable, "v", that is part of an interface block named /* Create an output variable, "v", that is part of an interface block named
* "a". They should not match. * "a". They should not match.
@@ -325,11 +307,11 @@ TEST_F(link_varyings, interface_field_doesnt_match_noninterface_vice_versa)
ir.push_tail(in_v); ir.push_tail(in_v);
ASSERT_TRUE(linker::populate_consumer_input_sets(mem_ctx, linker::populate_consumer_input_sets(mem_ctx,
&ir, &ir,
consumer_inputs, consumer_inputs,
consumer_interface_inputs, consumer_interface_inputs,
junk)); junk);
/* Create an output variable "a.v". They should not match. /* Create an output variable "a.v". They should not match.
*/ */