Merge GrGLSLProgramDesc into GrProgramDesc

Merge GrGLSLProgramDesc into GrProgramDesc

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/5d8f69f2d492a15189e4b976ccca3fa092876419

[egdaniel, 2016-09-06 20:38:19]

egdaniel@google.com changed reviewers:
+ bsalomon@google.com

[egdaniel, 2016-09-06 20:38:20]

This just does the merging of the two ProgramDesc files together. Also moves the
finalize out of the Build step. Figured I'll do the vulkan changes in a follow
up CL.

[egdaniel, 2016-09-06 20:38:29]

The CQ bit was checked by egdaniel@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-09-06 20:38:33]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-06 20:41:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-06 20:41:04]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN-Trybot on master.client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on
master.client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[egdaniel, 2016-09-06 20:42:01]

The CQ bit was checked by egdaniel@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-09-06 20:42:04]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-06 20:44:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-06 20:44:54]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN-Trybot on
master.client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU...)

[egdaniel, 2016-09-06 20:47:44]

The CQ bit was checked by egdaniel@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-09-06 20:47:53]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-06 21:17:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-06 21:17:59]

Dry run: This issue passed the CQ dry run.

[bsalomon, 2016-09-07 13:41:15]

lgtm, comment comments

https://codereview.chromium.org/2318523006/diff/60001/src/gpu/GrProgramDesc.h
File src/gpu/GrProgramDesc.h (right):

https://codereview.chromium.org/2318523006/diff/60001/src/gpu/GrProgramDesc.h...
src/gpu/GrProgramDesc.h:27: * Builds a program descriptor
Note that finalize must be called after Build()?

https://codereview.chromium.org/2318523006/diff/60001/src/gpu/GrProgramDesc.h...
src/gpu/GrProgramDesc.h:143: // 4. A Backend specific payload.  Room is
preallocated for this
Update this to say part 4 is the per-processor keys?

[egdaniel, 2016-09-07 13:53:38]

https://codereview.chromium.org/2318523006/diff/60001/src/gpu/GrProgramDesc.h
File src/gpu/GrProgramDesc.h (right):

https://codereview.chromium.org/2318523006/diff/60001/src/gpu/GrProgramDesc.h...
src/gpu/GrProgramDesc.h:27: * Builds a program descriptor
On 2016/09/07 13:41:15, bsalomon wrote:
> Note that finalize must be called after Build()?

Done.

https://codereview.chromium.org/2318523006/diff/60001/src/gpu/GrProgramDesc.h...
src/gpu/GrProgramDesc.h:143: // 4. A Backend specific payload.  Room is
preallocated for this
On 2016/09/07 13:41:15, bsalomon wrote:
> Update this to say part 4 is the per-processor keys?

Done.

[egdaniel, 2016-09-07 13:53:44]

The CQ bit was checked by egdaniel@google.com

[egdaniel, 2016-09-07 13:53:44]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com
Link to the patchset: https://codereview.chromium.org/2318523006/#ps80001
(title: "update comments")

[commit-bot: I haz the power, 2016-09-07 13:53:52]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-07 14:24:13]

Description was changed from

==========
Merge GrGLSLProgramDesc into GrProgramDesc

BUG=skia:
==========

to

==========
Merge GrGLSLProgramDesc into GrProgramDesc

BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/5d8f69f2d492a15189e4b976ccca3fa092876419
==========

[commit-bot: I haz the power, 2016-09-07 14:24:14]

Committed patchset #5 (id:80001) as
https://skia.googlesource.com/skia/+/5d8f69f2d492a15189e4b976ccca3fa092876419