Attachment 133221 Details for Bug 102021 – hacky attempt at fixing it.

[patch] hacky attempt at fixing it.

0001-glsl-fix-opt-vectorize.patch (text/plain), 1.34 KB, created by Dave Airlie on 2017-08-03 07:38:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2017-08-03 07:38:41 UTC

Size: 1.34 KB

patch

obsolete

>From 54065bd3d0ddec26354e0babdb46ba731f3b0d03 Mon Sep 17 00:00:00 2001
>From: Dave Airlie <airlied@gmail.com>
>Date: Thu, 3 Aug 2017 17:37:23 +1000
>Subject: [PATCH] glsl: "fix" opt vectorize.
>
>Attempted fix for bug 102021
>---
> src/compiler/glsl/opt_vectorize.cpp | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/src/compiler/glsl/opt_vectorize.cpp b/src/compiler/glsl/opt_vectorize.cpp
>index 88318cd8a6..72fcc44640 100644
>--- a/src/compiler/glsl/opt_vectorize.cpp
>+++ b/src/compiler/glsl/opt_vectorize.cpp
>@@ -146,8 +146,12 @@ rewrite_swizzle(ir_instruction *ir, void *data)
>    }
>    case ir_type_expression: {
>       ir_expression *expr = (ir_expression *)ir;
>-      expr->type = glsl_type::get_instance(expr->type->base_type,
>-                                           mask->num_components, 1);
>+      const glsl_type *new_type = glsl_type::get_instance(expr->type->base_type,
>+                                                          mask->num_components, 1);
>+      /* don't rewrite non-swizzle types or maybe we need to insert a swizzle? */
>+      if (expr->operands[0]->type != new_type && expr->operands[0]->ir_type != ir_type_swizzle)
>+         break;
>+      expr->type = new_type;
>       for (unsigned i = 0; i < 4; i++) {
>          if (expr->operands[i]) {
>             ir_rvalue *rval = expr->operands[i]->as_rvalue();
>-- 
>2.13.3
>

Actions: View | Splinter Review

Attachments on bug 102021: 133219 | 133221

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.