Attachment 480592 Details for Bug 679924 – Patch to st_mesa_to_tgsi.c that work around the inlining issue of gcc 4.6.0

Patch to st_mesa_to_tgsi.c that work around the inlining issue of gcc 4.6.0

change.patch (text/plain), 1.45 KB, created by Jérôme Glisse on 2011-02-23 22:29:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jérôme Glisse

Created: 2011-02-23 22:29:34 UTC

Size: 1.45 KB

patch

obsolete

>--- st_mesa_to_tgsi.c	2011-02-23 16:14:02.768852478 -0500
>+++ st_mesa_to_tgsi-fix.c	2011-02-23 17:21:10.692763332 -0500
>@@ -53,7 +53,6 @@
>                            (1 << PROGRAM_CONSTANT) |     \
>                            (1 << PROGRAM_UNIFORM))
> 
>-
> struct label {
>    unsigned branch_target;
>    unsigned token;
>@@ -103,6 +102,31 @@
>    boolean error;
> };
> 
>+static struct ureg_src 
>+ureg_swizzle22( struct ureg_src reg, 
>+              int x, int y, int z, int w ) __attribute__((optimize(0)));
>+
>+static struct ureg_src 
>+ureg_swizzle22( struct ureg_src reg, 
>+              int x, int y, int z, int w )
>+{
>+   unsigned swz = ( (reg.SwizzleX << 0) |
>+                    (reg.SwizzleY << 2) |
>+                    (reg.SwizzleZ << 4) |
>+                    (reg.SwizzleW << 6));
>+
>+   assert(reg.File != TGSI_FILE_NULL);
>+   assert(x < 4);
>+   assert(y < 4);
>+   assert(z < 4);
>+   assert(w < 4);
>+
>+   reg.SwizzleX = (swz >> (x*2)) & 0x3;
>+   reg.SwizzleY = (swz >> (y*2)) & 0x3;
>+   reg.SwizzleZ = (swz >> (z*2)) & 0x3;
>+   reg.SwizzleW = (swz >> (w*2)) & 0x3;
>+   return reg;
>+}
> 
> /**
>  * Make note of a branch to a label in the TGSI code.
>@@ -324,7 +348,7 @@
>          src = ureg_src_dimension( src, SrcReg->Index);
>    }
> 
>-   src = ureg_swizzle( src,
>+   src = ureg_swizzle22( src,
>                        GET_SWZ( SrcReg->Swizzle, 0 ) & 0x3,
>                        GET_SWZ( SrcReg->Swizzle, 1 ) & 0x3,
>                        GET_SWZ( SrcReg->Swizzle, 2 ) & 0x3,

Actions: View

Attachments on bug 679924: 480576 | 480577 | 480578 | 480582 | 480592 | 480617 | 480843 | 480866 | 480867 | 480868 | 480870 | 480873