Merge GrGpuGLShaders into its parent class, GrGpuGL

[bsalomon, 2012-05-31 14:20:30]

The time has come!

Once upon a time we had a fixed pipe implementation and GrGpuGL was the code
common to it and the shader-based implementation. We no longer have a fixed pipe
implementation and the subclassing does not make sense.

I tried to keep this change minimal. I moved decls from GrGpuGLShaders.h to
GrGpuGL and merged the constructors, destructors, and implementations of
onResetContext().  I also moved some stuff from GrGpuGLShaders constructor to
GrGpuGL::initCaps.

GrGpuGL_program.cpp is mostly just a rename of GrGpuGLShaders.cpp and search and
replace of GrGpuGLShaders with GrGpuGL.

There is more cleanup to be done.

[TomH, 2012-05-31 14:32:43]

LGTM

http://codereview.appspot.com/6245076/diff/4001/gyp/gpu.gyp
File gyp/gpu.gyp (right):

http://codereview.appspot.com/6245076/diff/4001/gyp/gpu.gyp#newcode314
gyp/gpu.gyp:314: '../src/gpu/gl/GrGpuGL.cpp',
This file appears twice?

http://codereview.appspot.com/6245076/diff/4001/src/gpu/gl/GrGpuGL.h
File src/gpu/gl/GrGpuGL.h (right):

http://codereview.appspot.com/6245076/diff/4001/src/gpu/gl/GrGpuGL.h#newcode18
src/gpu/gl/GrGpuGL.h:18: #include "GrGLProgram.h"
We can't forward declare the nested types, can we?

[bsalomon, 2012-05-31 14:36:06]

http://codereview.appspot.com/6245076/diff/4001/gyp/gpu.gyp
File gyp/gpu.gyp (right):

http://codereview.appspot.com/6245076/diff/4001/gyp/gpu.gyp#newcode314
gyp/gpu.gyp:314: '../src/gpu/gl/GrGpuGL.cpp',
On 2012/05/31 14:32:43, TomH wrote:
> This file appears twice?
oops, will fix before check in.

http://codereview.appspot.com/6245076/diff/4001/src/gpu/gl/GrGpuGL.h
File src/gpu/gl/GrGpuGL.h (right):

http://codereview.appspot.com/6245076/diff/4001/src/gpu/gl/GrGpuGL.h#newcode18
src/gpu/gl/GrGpuGL.h:18: #include "GrGLProgram.h"
On 2012/05/31 14:32:43, TomH wrote:
> We can't forward declare the nested types, can we?

Nope

[robertphillips, 2012-05-31 15:03:07]

LGTM

[bsalomon, 2012-05-31 20:53:12]

On 2012/05/31 15:03:07, robertphillips wrote:
> LGTM

Committed r4095.