Merge branch 'softpipe-opt'

[mesa.git] / src / gallium / drivers / llvmpipe / sp2lp.sh

diff --git a/src/gallium/drivers/llvmpipe/sp2lp.sh b/src/gallium/drivers/llvmpipe/sp2lp.sh
index 28adb98ebb190b01538c50d3d59eaf90f0982585..c45a81ce3cf3f1ad2e8fe47e0b1e842d888471e4 100755 (executable)
--- 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