diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-05 15:21:11 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-05 15:21:11 -0800 |
| commit | 9401516113152ea2a571dc1103a2fa7ce68d4ee8 (patch) | |
| tree | 2472a42bd85a3d3b9697be9235c029099c3d575d /src/mesa/program/ir_to_mesa.cpp | |
| parent | 741744f691d6ef63e9f9a4c03136f969f2ffb0bf (diff) | |
| parent | 5b51b2e00013af70072106e9d34905326fc357fc (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/mesa/program/ir_to_mesa.cpp')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 3c51d18ed62..0f17ed136da 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2293,6 +2293,10 @@ add_uniform_to_shader::visit_field(const glsl_type *type, const char *name, (void) row_major; + /* atomics don't get real storage */ + if (type->contains_atomic()) + return; + if (type->is_vector() || type->is_scalar()) { size = type->vector_elements; if (type->is_double()) |