cc: clang-format shader.cc

cc: clang-format shader.cc

Previously this file could not be formatted because of all the shader
code in magic macros to make it less irritating to edit.  It turns out
"clang-format off" and "clang-format on" in comments make it possible to
selectively apply formatting, so do this for all the shaders.

R=danakj@chromium.org
BUG=none

Committed: https://crrev.com/535c75f4da3d754d0716305405a70418b99502de
Cr-Commit-Position: refs/heads/master@{#299996}

[enne (OOO), 2014-10-16 18:44:05]

PTAL

Patch 1 has the real changes.  Patch 2 is just me running format on the whole
thing.

[danakj, 2014-10-16 19:25:11]

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc
File cc/output/shader.cc (right):

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:364: // clang-format on
why is this at column 0 :(

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:377: // clang-format on
and this? :(

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:433: );  // NOLINT(whitespace/parens)
where's the on here?

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:469: return VERTEX_SHADER(
off here?

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:1015: return FRAGMENT_SHADER(
could we turn format on inside the shader code somehow? like just turn it on
here and put a {} around the shader code? so it's just off for the macro?

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:1073: uniform sampler2D s_texture;
<_<

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:1134: vec4 texColor = texture2D(s_texture, v_texCoord);
<_<

[enne (OOO), 2014-10-16 19:39:30]

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc
File cc/output/shader.cc (right):

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:433: );  // NOLINT(whitespace/parens)
On 2014/10/16 19:25:10, danakj wrote:
> where's the on here?

Done.

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:469: return VERTEX_SHADER(
On 2014/10/16 19:25:10, danakj wrote:
> off here?

Done.

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:1015: return FRAGMENT_SHADER(
On 2014/10/16 19:25:11, danakj wrote:
> could we turn format on inside the shader code somehow? like just turn it on
> here and put a {} around the shader code? so it's just off for the macro?

Done.  The only weirdness (other than the growing header/footer for each shader)
is that the shader get indented four spaces, but I think that's acceptable.

https://codereview.chromium.org/658153003/diff/20001/cc/output/shader.cc#newc...
cc/output/shader.cc:1073: uniform sampler2D s_texture;
On 2014/10/16 19:25:11, danakj wrote:
> <_<

I blame emacs.

[danakj, 2014-10-16 20:59:18]

LGTM

[enne (OOO), 2014-10-16 21:03:18]

The CQ bit was checked by enne@chromium.org

[commit-bot: I haz the power, 2014-10-16 21:05:13]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/658153003/100001

[commit-bot: I haz the power, 2014-10-16 22:46:49]

Committed patchset #6 (id:100001)

[commit-bot: I haz the power, 2014-10-16 22:47:44]

Patchset 6 (id:??) landed as
https://crrev.com/535c75f4da3d754d0716305405a70418b99502de
Cr-Commit-Position: refs/heads/master@{#299996}