Attachment 72666 Details for Bug 58970 – A workaround to make it compile with Clang

[patch] A workaround to make it compile with Clang

0001-i965-Fix-build-error-with-clang.patch (text/plain), 1.99 KB, created by Kenneth Graunke on 2013-01-08 07:44:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kenneth Graunke

Created: 2013-01-08 07:44:26 UTC

Size: 1.99 KB

patch

obsolete

>From f8873f469529fed3409b913e9d0eef7765cace08 Mon Sep 17 00:00:00 2001
>From: Kenneth Graunke <kenneth@whitecape.org>
>Date: Mon, 7 Jan 2013 20:12:51 -0800
>Subject: [PATCH] i965: Fix build error with clang.
>
>---
> src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
>index c9c9028..c4ec1d9 100644
>--- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
>+++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
>@@ -70,7 +70,7 @@ class fs_copy_prop_dataflow
> {
> public:
>    fs_copy_prop_dataflow(void *mem_ctx, cfg_t *cfg,
>-                         exec_list out_acp[][ACP_HASH_SIZE]);
>+                         exec_list *out_acp[ACP_HASH_SIZE]);
> 
>    void setup_kills();
>    void run();
>@@ -86,7 +86,7 @@ public:
> } /* anonymous namespace */
> 
> fs_copy_prop_dataflow::fs_copy_prop_dataflow(void *mem_ctx, cfg_t *cfg,
>-                                             exec_list out_acp[][ACP_HASH_SIZE])
>+                                             exec_list *out_acp[ACP_HASH_SIZE])
>    : mem_ctx(mem_ctx), cfg(cfg)
> {
>    bd = rzalloc_array(mem_ctx, struct block_data, cfg->num_blocks);
>@@ -429,7 +429,9 @@ fs_visitor::opt_copy_propagate()
>    bool progress = false;
>    void *mem_ctx = ralloc_context(this->mem_ctx);
>    cfg_t cfg(this);
>-   exec_list out_acp[cfg.num_blocks][ACP_HASH_SIZE];
>+   exec_list *out_acp[cfg.num_blocks];
>+   for (int i = 0; i < cfg.num_blocks; i++)
>+      out_acp[i] = new exec_list [ACP_HASH_SIZE];
> 
>    /* First, walk through each block doing local copy propagation and getting
>     * the set of copies available at the end of the block.
>@@ -461,6 +463,8 @@ fs_visitor::opt_copy_propagate()
>       progress = opt_copy_propagate_local(mem_ctx, block, in_acp) || progress;
>    }
> 
>+   for (int i = 0; i < cfg.num_blocks; i++)
>+      delete [] out_acp[i];
>    ralloc_free(mem_ctx);
> 
>    if (progress)
>-- 
>1.8.1
>

Actions: View | Splinter Review

Attachments on bug 58970: 72666

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.