diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-08-21 10:27:46 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-08-29 09:21:39 +0100 |
| commit | 1e4376a68fae2156018d2e3423df521c6db70013 (patch) | |
| tree | de0e46d21f2167f028cac546629793e17396023c /src/gallium/drivers/llvmpipe/sp2lp.sh | |
| parent | f10ee9a0a1f75dfbf4f2ed1407b55a2511b61a48 (diff) | |
llvmpipe: Back port recent softpipe-opt improvements from Keith.
Diffstat (limited to 'src/gallium/drivers/llvmpipe/sp2lp.sh')
| -rwxr-xr-x | src/gallium/drivers/llvmpipe/sp2lp.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/gallium/drivers/llvmpipe/sp2lp.sh b/src/gallium/drivers/llvmpipe/sp2lp.sh index 28adb98ebb..c45a81ce3c 100755 --- a/src/gallium/drivers/llvmpipe/sp2lp.sh +++ b/src/gallium/drivers/llvmpipe/sp2lp.sh @@ -2,7 +2,7 @@ # # Port changes from softpipe to llvmpipe. Invoke as # -# sp2lp.sh <commit>..<commit> +# sp2lp.sh <commit> # # Note that this will only affect llvmpipe -- you still need to actually # cherry-pick/merge the softpipe changes themselves if they affect directories @@ -13,7 +13,7 @@ git format-patch \ --relative=src/gallium/drivers/softpipe \ --src-prefix=a/src/gallium/drivers/llvmpipe/ \ --dst-prefix=b/src/gallium/drivers/llvmpipe/ \ - --stdout $@ \ + --stdout "$1^1..$1" \ | sed \ -e 's/\<softpipe\>/llvmpipe/g' \ -e 's/\<sp\>/lp/g' \ @@ -25,4 +25,10 @@ git format-patch \ -e 's/\<sps\>/lps/g' \ -e 's/\<spfs\>/lpfs/g' \ -e 's/\<sptex\>/lptex/g' \ -| git am -3 -k + -e 's/\<setup_\(point\|line\|tri\)\>/llvmpipe_\0/g' \ + -e 's/\<llvmpipe_cached_tile\>/llvmpipe_cached_tex_tile/g' \ + -e 's/_get_cached_tile_tex\>/_get_cached_tex_tile/g' \ + -e 's/\<TILE_SIZE\>/TEX_TILE_SIZE/g' \ + -e 's/\<tile_address\>/tex_tile_address/g' \ + -e 's/\<tile->data\.color\>/tile->color/g' \ +| patch -p1 |