-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 05/22/2012 08:19 AM, Pauli Nieminen wrote: > On Mon, May 21, 2012 at 11:15:17PM -0700, Chad Versace wrote: >> This moves the piglit_framework_fbo code from piglit-framework.c to >> piglit-framework-fbo.c. >> >> Currently the piglit_framework_fbo code is only implemented for GLX. The >> next commit adds an implementation atop Waffle. The increase in code size >> and #ifdef complexity warrants moving it to its own file. >> >> Signed-off-by: Chad Versace <chad.vers...@linux.intel.com> >> --- >> tests/util/CMakeLists.txt | 1 + >> tests/util/piglit-framework-fbo.c | 183 >> +++++++++++++++++++++++++++++++++++++ >> tests/util/piglit-framework-fbo.h | 29 ++++++ >> tests/util/piglit-framework.c | 130 +------------------------- >> 4 files changed, 216 insertions(+), 127 deletions(-) >> create mode 100644 tests/util/piglit-framework-fbo.c >> create mode 100644 tests/util/piglit-framework-fbo.h > > It may help git to manage rebase conflicts if you first copy stuff to > new file and in 2nd patch refactor the code. But that ofcourse happens > only if git manages to understand that there happened rename (large > enough part of new file is same as old). i suspect that this case > will be missed by git because piglit-framework.c is large file.
You're right. I should have done this change in a rebase-friendly way. I'll resubmit this patch as a mini series. The way Anholt has done changes like this in Mesa is patch 1: Copy file. patch 2: Remove unneeded code in original file. patch 3: Remove unneeded code in new file. patch 4: Refactor new file. - ---- Chad Versace chad.vers...@linux.intel.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJPvAuvAAoJEAIvNt057x8iN30P/00HinDNDXuzuH4yfiVDO7/+ e5+8t2aDIY8agnrXmpj5iSvPrdL9saLTlI7agprClOOEyMjVr6zbnDOuydrpxis2 3FgfCKJJiw4+wQKpNEGLyRDxLcGO5V82NtM/pXFUMNUqIB1nZjxv4Ctd+BwZrZPr EwBmZkD9fys5Nq1o7bqNZctMSE1hh4Hj+mHdBD1XjnA9UvbasSc8ziGBJZKY7KEu d9Pi4tUlouxiWrf1Vu0pLQAEQQFF6ic6j+uE6WaUOG8VpRlBZtuXQHgh4smk2t6Y eX4jbRuYZt+ShHolqg5NQxCXtGN2rNcxNCg3k6Q9xYJ2Ken3MYDHhX0LNDDeERJK aX9YL7uL38Y8tq4N6Cn8PUuWwmGQMIUOO+LAAU6V2UdqGNn4vyFpa6dp1hfjH3dG 1NC2gZRWx03N8U6cAm3f7LUjtQYhk5U/WTBW867YPR5s3YORpKOu9XxwX043ZLSu ZXS5o8kPgEDo+mvDw+3R1mP+1/2xohKsrnt3zcKLIGC5jZ4bVoQpuhiJwjbYPQ4z xG1qTZ/E3y5sG+Juu2Yk/MCI+wTvPm3ZsFAY57cmXkf0P9sYEqVH67OkphLY+wYp ef3EOHeMFJou6eBq53Gvq+ueiOJvfkmpzMEiDsONVYbJgQFmdU2sJtKAECkmFvBk FDAsT7lW7X0hJv7h8+S/ =ku0j -----END PGP SIGNATURE----- _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit