<div dir="ltr">On 20 August 2013 11:58, Kenneth Graunke <span dir="ltr"><<a href="mailto:kenneth@whitecape.org" target="_blank">kenneth@whitecape.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="im">On 08/20/2013 11:30 AM, Paul Berry wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
---<br>
src/mesa/drivers/dri/i965/brw_<u></u>program.h | 8 ++++++++<br>
src/mesa/drivers/dri/i965/brw_<u></u>shader.cpp | 2 +-<br>
src/mesa/drivers/dri/i965/brw_<u></u>shader.h | 7 ++++++-<br>
src/mesa/drivers/dri/i965/brw_<u></u>vec4.h | 12 ++++++++++--<br>
src/mesa/drivers/dri/i965/brw_<u></u>vs.h | 8 ++++++++<br>
5 files changed, 33 insertions(+), 4 deletions(-)<br>
</blockquote>
<br></div>
I like the change to brw_program.h and brw_vs.h. But I'm confused by the changes to brw_shader.h and brw_vec4.h---those are already only used by C++ code, and full of C++ stuff.<br>
<br>
Perhaps you're making them safe to include from C, for some reason?<br></blockquote><div><br></div><div>Yeah, sorry. I got confused at some point while I was rebasing this series and squashed together two unrelated patches. You're right that the changes to brw_shader.h and brw_vec4.h are to make them safe to include from C. They're needed for patch 6 (i965/vec4: Move vec4 data structures and functions to brw_vec4.{cpp,h}). How about if I split those changes out to their own patch, put it just before patch 6, and make the commit message something like this?<br>
<br></div><div>Make brw_{shader,vec4}.h safe to include from C.<br><br></div><div>The patch that follows will move the definition of struct brw_vec4_prog_key from brw_vs.h to brw_vec4.h, making it necessary for brw_vs.h to include brw_vec4.h (because brw_vs.h defines struct brw_vs_prog_key, which contains brw_vec4_prog_key as a member). Since brw_vs.h is included from C source files, that means that brw_vec4.h will need to be safe to include from C. Same for brw_shader.h, since it is included by brw_vec4.h.<br>
</div></div></div></div>