| Index: src/gpu/gl/GrGLCaps.cpp
|
| ===================================================================
|
| --- src/gpu/gl/GrGLCaps.cpp (revision 8365)
|
| +++ src/gpu/gl/GrGLCaps.cpp (working copy)
|
| @@ -45,7 +45,7 @@
|
| fIsCoreProfile = false;
|
| }
|
|
|
| -GrGLCaps::GrGLCaps(const GrGLCaps& caps) : GrDrawTarget::Caps() {
|
| +GrGLCaps::GrGLCaps(const GrGLCaps& caps) : GrDrawTargetCaps() {
|
| *this = caps;
|
| }
|
|
|
| @@ -205,14 +205,13 @@
|
| this->initStencilFormats(ctxInfo);
|
|
|
| /**************************************************************************
|
| - * GrDrawTarget::Caps fields
|
| + * GrDrawTargetCaps fields
|
| **************************************************************************/
|
| GrGLint maxTextureUnits;
|
| // check FS and fixed-function texture unit limits
|
| // we only use textures in the fragment stage currently.
|
| // checks are > to make sure we have a spare unit.
|
| GR_GL_GetIntegerv(gli, GR_GL_MAX_TEXTURE_IMAGE_UNITS, &maxTextureUnits);
|
| - GrAssert(maxTextureUnits > GrDrawState::kNumStages);
|
|
|
| GrGLint numFormats;
|
| GR_GL_GetIntegerv(gli, GR_GL_NUM_COMPRESSED_TEXTURE_FORMATS, &numFormats);
|
|
|