[GPU] Remove AA levels enum, use sample explicit count instead

[bsalomon, 2012-01-30 15:41:49]

(Issue 470 filed regarding sample count and texture cache keys)

http://codereview.appspot.com/5600045/diff/1/include/gpu/GrTypes.h
File include/gpu/GrTypes.h (right):

http://codereview.appspot.com/5600045/diff/1/include/gpu/GrTypes.h#newcode488
include/gpu/GrTypes.h:488: union {
I made the values be ordered flags, width, height, config, samples to match
GrPlatformTextureDesc. Fortunately WebKit doesn't use initializer syntax when
creating this struct.

[TomH, 2012-01-30 16:22:56]

http://codereview.appspot.com/5600045/diff/1/include/gpu/GrTypes.h
File include/gpu/GrTypes.h (right):

http://codereview.appspot.com/5600045/diff/1/include/gpu/GrTypes.h#newcode488
include/gpu/GrTypes.h:488: union {
If this is a necessary constraint, let's add it to the struct header comment.

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrContext.cpp
File src/gpu/GrContext.cpp (right):

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrContext.cpp#newcode443
src/gpu/GrContext.cpp:443: uint32_t p1 = (desc.fSampleCnt << 16) | desc.fFlags;
Neither p0 nor p1 is used? Remove if dead code.

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrContext.cpp#newcode717
src/gpu/GrContext.cpp:717: desc.fSampleCnt = 16;
Is there any symbolic constant or Sk value we can use to get this reliably?

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrGpuGL.cpp
File src/gpu/GrGpuGL.cpp (right):

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrGpuGL.cpp#newcode395
src/gpu/GrGpuGL.cpp:395: fCaps.fFSAASupport = GLCaps::kNone_MSFBO !=
fGLCaps.fMSFBOType;
If MAX_SAMPLES was 32, we used to have Med_GrAALevel == 24 and Low_GrAALevel ==
16; now we're defaulting to hardcoded 16? May match SW, but changes Ganesh
behavior...

http://codereview.appspot.com/5600045/diff/1/src/gpu/SkGpuDevice.cpp
File src/gpu/SkGpuDevice.cpp (right):

http://codereview.appspot.com/5600045/diff/1/src/gpu/SkGpuDevice.cpp#newcode1789
src/gpu/SkGpuDevice.cpp:1789: {0,}
Other initializations don't include trailing comma inside {}

[bsalomon, 2012-01-30 17:29:27]

http://codereview.appspot.com/5600045/diff/1/include/gpu/GrTypes.h
File include/gpu/GrTypes.h (right):

http://codereview.appspot.com/5600045/diff/1/include/gpu/GrTypes.h#newcode488
include/gpu/GrTypes.h:488: union {
On 2012/01/30 16:22:56, TomH wrote:
> If this is a necessary constraint, let's add it to the struct header comment.

It's not necessary, just consistent. This is a public header, I don't know that
a client reading this would find that detail important.

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrContext.cpp
File src/gpu/GrContext.cpp (right):

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrContext.cpp#newcode443
src/gpu/GrContext.cpp:443: uint32_t p1 = (desc.fSampleCnt << 16) | desc.fFlags;
On 2012/01/30 16:22:56, TomH wrote:
> Neither p0 nor p1 is used? Remove if dead code.

Nice catch. This also made me realize it'd be better for gen_texture_key_values
to take a sample count rather than relying on callers to fold it into the key
param.

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrContext.cpp#newcode717
src/gpu/GrContext.cpp:717: desc.fSampleCnt = 16;
On 2012/01/30 16:22:56, TomH wrote:
> Is there any symbolic constant or Sk value we can use to get this reliably?

According to Mike, "no".

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrGpuGL.cpp
File src/gpu/GrGpuGL.cpp (right):

http://codereview.appspot.com/5600045/diff/1/src/gpu/GrGpuGL.cpp#newcode395
src/gpu/GrGpuGL.cpp:395: fCaps.fFSAASupport = GLCaps::kNone_MSFBO !=
fGLCaps.fMSFBOType;
On 2012/01/30 16:22:56, TomH wrote:
> If MAX_SAMPLES was 32, we used to have Med_GrAALevel == 24 and Low_GrAALevel
==
> 16; now we're defaulting to hardcoded 16? May match SW, but changes Ganesh
> behavior...

True, but we were never using MSAA for paths in known clients.

http://codereview.appspot.com/5600045/diff/1/src/gpu/SkGpuDevice.cpp
File src/gpu/SkGpuDevice.cpp (right):

http://codereview.appspot.com/5600045/diff/1/src/gpu/SkGpuDevice.cpp#newcode1789
src/gpu/SkGpuDevice.cpp:1789: {0,}
On 2012/01/30 16:22:56, TomH wrote:
> Other initializations don't include trailing comma inside {}

Done.

[TomH, 2012-01-30 17:30:40]

LGTM

[bsalomon, 2012-01-30 18:52:06]

Closed with r3106.