Hello, I'm trying to bring the intel-gpu-tools/assembler and i965 code back in sync. As part of that, I noticed that Damien dropped trailing whitespace, nuked the GL types, and replaced INLINE with inline.
I plan to merge the 'whitespace' branch of ~kwg/mesa in a day or so, unless there are strong objections. I've gotten verbal acks from Eric, Matt, and Paul. For reference, here are the commit subjects. The whitespace ones show no change with git diff -w, but aren't worth spamming the list with. --Ken $ git log --reverse origin/master..kwg/whitespace commit 7a762e24ddd46e798eacd73c094249123b24c5e9 Author: Kenneth Graunke <kenn...@whitecape.org> Date: Mon Nov 25 15:39:03 2013 -0800 i965: Drop trailing whitespace from files shared with intel-gpu-tools. Performed via s/ *$//g. Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> commit 01a61779be306afd4a567fb574be92bf2c5e1ace Author: Kenneth Graunke <kenn...@whitecape.org> Date: Mon Nov 25 15:46:34 2013 -0800 i965: Drop trailing whitespace from the rest of the driver. Performed via: $ for file in *; do sed -i 's/ *//g'; done Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> commit 682127a24026b5275275d523c3284a3172a0f6d7 Author: Kenneth Graunke <kenn...@whitecape.org> Date: Mon Nov 25 15:51:24 2013 -0800 i965: Don't use GL types in files shared with intel-gpu-tools. sed -i -e 's/GLuint/unsigned/g' -e 's/GLint/int/g' \ -e 's/GLfloat/float/g' -e 's/GLubyte/uint8_t/g' \ -e 's/GLshort/int16_t/g' \ brw_eu* brw_disasm.c brw_structs.h Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> commit 87c3940025f78f882e4166310319d07d20640205 Author: Kenneth Graunke <kenn...@whitecape.org> Date: Mon Dec 2 13:39:40 2013 -0800 i965: Replace non-standard INLINE macro with "inline". These are identical: main/compiler.h defines INLINE to "inline". Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev