Move some program building utils from GL to GLSL

Move some program building utils from GL to GLSL

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1535603006

Committed: https://skia.googlesource.com/skia/+/fa8963252e122c5288c8e92b5ecc25a8fea21c3b

[egdaniel, 2015-12-17 22:12:41]

Description was changed from

==========
Move some program building utils from GL to GLSL

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

to

==========
Move some program building utils from GL to GLSL

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[egdaniel, 2016-01-13 17:01:57]

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

[egdaniel, 2016-01-13 17:01:58]

PTAL. More changes may happen in this area soon, but others have been touching
this code so just want to get some initial changes in to help with rebase fun.

https://codereview.chromium.org/1535603006/diff/20001/include/gpu/GrTypesPriv.h
File include/gpu/GrTypesPriv.h (right):

https://codereview.chromium.org/1535603006/diff/20001/include/gpu/GrTypesPriv...
include/gpu/GrTypesPriv.h:112: static inline size_t GrSLTypeSize(GrSLType type)
{
Function needed for future use

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/GrGLProgram.cpp
File src/gpu/gl/GrGLProgram.cpp (left):

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/GrGLProgram....
src/gpu/gl/GrGLProgram.cpp:71: SkASSERT(textureBindings->count() ==
ip->fSamplersIdx);
This assert is the one casualty of this move, but Josh and I agreed after much
discussion this was the best way to go

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
File src/gpu/gl/builders/GrGLProgramBuilder.h (left):

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
src/gpu/gl/builders/GrGLProgramBuilder.h:29: template <class Proc>
Glad to kill this whole crazy setup

[bsalomon, 2016-01-13 17:49:19]

lgtm w/ comments inline

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
File src/gpu/gl/builders/GrGLProgramBuilder.cpp (right):

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
src/gpu/gl/builders/GrGLProgramBuilder.cpp:67: const GrGLSLCaps*
GrGLProgramBuilder::glslCaps() const {
\n

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
src/gpu/gl/builders/GrGLProgramBuilder.cpp:82:
GrGLSLTextureSampler::TextureSamplerArray* outSamplers) {
rm two spaces?

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
File src/gpu/gl/builders/GrGLProgramBuilder.h (right):

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
src/gpu/gl/builders/GrGLProgramBuilder.h:24: * Please note - no diamond problems
because of virtual inheritance.  Also, both base classes
Can you remove/modify this comment? I don't think it applies anymore.

[joshualitt, 2016-01-13 17:58:24]

nit

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
File src/gpu/gl/builders/GrGLProgramBuilder.h (right):

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
src/gpu/gl/builders/GrGLProgramBuilder.h:44: 
\n

[egdaniel, 2016-01-13 19:59:49]

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
File src/gpu/gl/builders/GrGLProgramBuilder.cpp (right):

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
src/gpu/gl/builders/GrGLProgramBuilder.cpp:67: const GrGLSLCaps*
GrGLProgramBuilder::glslCaps() const {
On 2016/01/13 17:49:19, bsalomon wrote:
> \n

Done.

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
src/gpu/gl/builders/GrGLProgramBuilder.cpp:82:
GrGLSLTextureSampler::TextureSamplerArray* outSamplers) {
On 2016/01/13 17:49:19, bsalomon wrote:
> rm two spaces?

Done.

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
File src/gpu/gl/builders/GrGLProgramBuilder.h (right):

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
src/gpu/gl/builders/GrGLProgramBuilder.h:24: * Please note - no diamond problems
because of virtual inheritance.  Also, both base classes
On 2016/01/13 17:49:19, bsalomon wrote:
> Can you remove/modify this comment? I don't think it applies anymore.

Done.

https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
src/gpu/gl/builders/GrGLProgramBuilder.h:44: 
On 2016/01/13 17:58:24, joshualitt wrote:
> \n

Done.

[joshualitt, 2016-01-13 20:01:35]

On 2016/01/13 19:59:49, egdaniel wrote:
>
https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
> File src/gpu/gl/builders/GrGLProgramBuilder.cpp (right):
> 
>
https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
> src/gpu/gl/builders/GrGLProgramBuilder.cpp:67: const GrGLSLCaps*
> GrGLProgramBuilder::glslCaps() const {
> On 2016/01/13 17:49:19, bsalomon wrote:
> > \n
> 
> Done.
> 
>
https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
> src/gpu/gl/builders/GrGLProgramBuilder.cpp:82:
> GrGLSLTextureSampler::TextureSamplerArray* outSamplers) {
> On 2016/01/13 17:49:19, bsalomon wrote:
> > rm two spaces?
> 
> Done.
> 
>
https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
> File src/gpu/gl/builders/GrGLProgramBuilder.h (right):
> 
>
https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
> src/gpu/gl/builders/GrGLProgramBuilder.h:24: * Please note - no diamond
problems
> because of virtual inheritance.  Also, both base classes
> On 2016/01/13 17:49:19, bsalomon wrote:
> > Can you remove/modify this comment? I don't think it applies anymore.
> 
> Done.
> 
>
https://codereview.chromium.org/1535603006/diff/20001/src/gpu/gl/builders/GrG...
> src/gpu/gl/builders/GrGLProgramBuilder.h:44: 
> On 2016/01/13 17:58:24, joshualitt wrote:
> > \n
> 
> Done.

lgtm

[egdaniel, 2016-01-13 20:02:11]

The CQ bit was checked by egdaniel@google.com

[egdaniel, 2016-01-13 20:02:12]

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/1535603006/#ps40001
(title: "update")

[commit-bot: I haz the power, 2016-01-13 20:02:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1535603006/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1535603006/40001

[commit-bot: I haz the power, 2016-01-13 20:03:25]

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

[commit-bot: I haz the power, 2016-01-13 20:03:26]

Try jobs failed on following builders:
  Build-Ubuntu-Clang-x86_64-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-Clang-x...)
  Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)
  Build-Ubuntu-GCC-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[egdaniel, 2016-01-13 20:06:44]

The CQ bit was checked by egdaniel@google.com

[egdaniel, 2016-01-13 20:06:44]

The patchset sent to the CQ was uploaded after l-g-t-m from
joshualitt@google.com, bsalomon@google.com
Link to the patchset: https://codereview.chromium.org/1535603006/#ps60001
(title: "fix build")

[commit-bot: I haz the power, 2016-01-13 20:06:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1535603006/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1535603006/60001

[commit-bot: I haz the power, 2016-01-13 20:19:32]

Description was changed from

==========
Move some program building utils from GL to GLSL

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Move some program building utils from GL to GLSL

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/fa8963252e122c5288c8e92b5ecc25a8fea21c3b
==========

[commit-bot: I haz the power, 2016-01-13 20:19:33]

Committed patchset #4 (id:60001) as
https://skia.googlesource.com/skia/+/fa8963252e122c5288c8e92b5ecc25a8fea21c3b