diff options
| author | Jason Ekstrand <[email protected]> | 2015-12-10 16:58:24 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-10 18:29:36 -0800 |
| commit | d5c9955d3eaa7311e2b2350b6964bae516c7b7b2 (patch) | |
| tree | 401e4378dd9909f9010f076d026a77e515170be5 /src/glsl/hir_field_selection.cpp | |
| parent | 8beea9d45b5879ea3dbd9c0e48f0c0eb2451f380 (diff) | |
| parent | 78b81be627734ea7fa50ea246c07b0d4a3a1638a (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
This pulls in nir_intrinsic_load/store changes and the switch of all
uniforms in i965 to bytes. This accounts for the Vulkan changes.
Diffstat (limited to 'src/glsl/hir_field_selection.cpp')
| -rw-r--r-- | src/glsl/hir_field_selection.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/glsl/hir_field_selection.cpp b/src/glsl/hir_field_selection.cpp index 337095b95b8..92bb4139194 100644 --- a/src/glsl/hir_field_selection.cpp +++ b/src/glsl/hir_field_selection.cpp @@ -57,8 +57,7 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr, expr->primary_expression.identifier); } } else if (op->type->is_vector() || - (state->ARB_shading_language_420pack_enable && - op->type->is_scalar())) { + (state->has_420pack() && op->type->is_scalar())) { ir_swizzle *swiz = ir_swizzle::create(op, expr->primary_expression.identifier, op->type->vector_elements); |