Create swizzle table inside of glsl caps

Create swizzle table inside of glsl caps

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/4036674952f341dab0695c3b054fefa5bb8cdec1

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

[egdaniel, 2015-11-02 20:28:02]

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

[egdaniel, 2015-11-02 20:28:02]

This is the swizzle table that we talked about last week.

[bsalomon, 2015-11-02 20:44:59]

Should the GL_ARB_texture_swizzle code use your table as well?

https://codereview.chromium.org/1420033005/diff/40001/src/gpu/glsl/GrGLSLCaps.h
File src/gpu/glsl/GrGLSLCaps.h (right):

https://codereview.chromium.org/1420033005/diff/40001/src/gpu/glsl/GrGLSLCaps...
src/gpu/glsl/GrGLSLCaps.h:86: /*
/**

https://codereview.chromium.org/1420033005/diff/40001/src/gpu/glsl/GrGLSLCaps...
src/gpu/glsl/GrGLSLCaps.h:87: * Returns a string which represents how the
mapping from an internal GrPixelConfig to a
incomplete sentence?

[egdaniel, 2015-11-02 22:14:12]

Now updated to use the new map when setting swizzling params for all cases.

https://codereview.chromium.org/1420033005/diff/40001/src/gpu/glsl/GrGLSLCaps.h
File src/gpu/glsl/GrGLSLCaps.h (right):

https://codereview.chromium.org/1420033005/diff/40001/src/gpu/glsl/GrGLSLCaps...
src/gpu/glsl/GrGLSLCaps.h:86: /*
On 2015/11/02 20:44:59, bsalomon wrote:
> /**

Done.

https://codereview.chromium.org/1420033005/diff/40001/src/gpu/glsl/GrGLSLCaps...
src/gpu/glsl/GrGLSLCaps.h:87: * Returns a string which represents how the
mapping from an internal GrPixelConfig to a
On 2015/11/02 20:44:59, bsalomon wrote:
> incomplete sentence?

Done.

[bsalomon, 2015-11-03 14:45:51]

lgtm, minor suggestions inline. It's nice to clean this up a bit.

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/gl/GrGLGpu.cpp
File src/gpu/gl/GrGLGpu.cpp (right):

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/gl/GrGLGpu.cpp...
src/gpu/gl/GrGLGpu.cpp:2415: void GrGLGpu::GetTexParamSwizzle(GrPixelConfig
config,
can this be a static function rather than a member? Not sure why it wasn't
before.

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/gl/builders/Gr...
File src/gpu/gl/builders/GrGLShaderBuilder.cpp (right):

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/gl/builders/Gr...
src/gpu/gl/builders/GrGLShaderBuilder.cpp:15: void map_swizzle(const char*
swizzleMap, const char* swizzle, char* mangledSwizzle) {
let's unnamespace and static these funcs to bring it in line with other code.

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/glsl/GrGLSLCaps.h
File src/gpu/glsl/GrGLSLCaps.h (right):

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/glsl/GrGLSLCap...
src/gpu/glsl/GrGLSLCaps.h:91: const char* getSwizzleMap(GrPixelConfig config)
const { return fConfigSwizzle[config]; }
Maybe change the last sentence to something like "mustSwizzleInShader()
determines whether this swizzle is applied in generated shader code or using
sampler state in the 3D API."?

[egdaniel, 2015-11-03 15:19:57]

The CQ bit was checked by egdaniel@google.com

[egdaniel, 2015-11-03 15:19:57]

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/1420033005/#ps10012
(title: " ")

[commit-bot: I haz the power, 2015-11-03 15:20:10]

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

[commit-bot: I haz the power, 2015-11-03 15:20:58]

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

[commit-bot: I haz the power, 2015-11-03 15:20:59]

Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot on client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Build-Ubuntu-GCC-Arm64-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-Mips-Debug-Android-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Mip...)
  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, 2015-11-03 15:23:37]

The CQ bit was checked by egdaniel@google.com

[egdaniel, 2015-11-03 15:23:37]

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/1420033005/#ps190001
(title: "rebase")

[commit-bot: I haz the power, 2015-11-03 15:23:53]

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

[egdaniel, 2015-11-03 15:23:56]

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/gl/GrGLGpu.cpp
File src/gpu/gl/GrGLGpu.cpp (right):

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/gl/GrGLGpu.cpp...
src/gpu/gl/GrGLGpu.cpp:2415: void GrGLGpu::GetTexParamSwizzle(GrPixelConfig
config,
On 2015/11/03 14:45:51, bsalomon wrote:
> can this be a static function rather than a member? Not sure why it wasn't
> before.

Done.

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/gl/builders/Gr...
File src/gpu/gl/builders/GrGLShaderBuilder.cpp (right):

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/gl/builders/Gr...
src/gpu/gl/builders/GrGLShaderBuilder.cpp:15: void map_swizzle(const char*
swizzleMap, const char* swizzle, char* mangledSwizzle) {
On 2015/11/03 14:45:51, bsalomon wrote:
> let's unnamespace and static these funcs to bring it in line with other code.

Done.

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/glsl/GrGLSLCaps.h
File src/gpu/glsl/GrGLSLCaps.h (right):

https://codereview.chromium.org/1420033005/diff/140001/src/gpu/glsl/GrGLSLCap...
src/gpu/glsl/GrGLSLCaps.h:91: const char* getSwizzleMap(GrPixelConfig config)
const { return fConfigSwizzle[config]; }
On 2015/11/03 14:45:51, bsalomon wrote:
> Maybe change the last sentence to something like "mustSwizzleInShader()
> determines whether this swizzle is applied in generated shader code or using
> sampler state in the 3D API."?

Done.

[commit-bot: I haz the power, 2015-11-03 15:26:06]

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

[commit-bot: I haz the power, 2015-11-03 15:26:06]

Try jobs failed on following builders:
  Build-Win-MSVC-x86_64-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86_6...)

[egdaniel, 2015-11-03 15:58:26]

The CQ bit was checked by egdaniel@google.com

[egdaniel, 2015-11-03 15:58:27]

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/1420033005/#ps210001
(title: "cast to bool")

[commit-bot: I haz the power, 2015-11-03 15:58:42]

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

[commit-bot: I haz the power, 2015-11-03 16:15:31]

Committed patchset #12 (id:210001) as
https://skia.googlesource.com/skia/+/4036674952f341dab0695c3b054fefa5bb8cdec1

[egdaniel, 2015-11-03 18:32:57]

A revert of this CL (patchset #12 id:210001) has been created in
https://codereview.chromium.org/1426653008/ by egdaniel@google.com.

The reason for reverting is: Breaking gm's on nexus7 and s3.

[egdaniel, 2015-11-03 19:43:25]

Description was changed from

==========
Create swizzle table inside of glsl caps

BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/4036674952f341dab0695c3b054fefa5bb8cdec1
==========

to

==========
Create swizzle table inside of glsl caps

BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/4036674952f341dab0695c3b054fefa5bb8cdec1
==========

[egdaniel, 2015-11-03 20:40:56]

The CQ bit was checked by egdaniel@google.com

[egdaniel, 2015-11-03 20:40:56]

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/1420033005/#ps250001
(title: " ")

[commit-bot: I haz the power, 2015-11-03 20:41:04]

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

[commit-bot: I haz the power, 2015-11-04 12:23:56]

Committed patchset #14 (id:250001) as
https://skia.googlesource.com/skia/+/b7e7d5748d74c7482436b33733d7770484bb62e3