Chromium Code Reviews| Index: src/gpu/gl/GrGLGpu.h |
| diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h |
| index c8da150a0da6c1d56636a455255a1196ea3627df..637a1cf16157af0a0b95f7802f181e6525b179fc 100644 |
| --- a/src/gpu/gl/GrGLGpu.h |
| +++ b/src/gpu/gl/GrGLGpu.h |
| @@ -322,7 +322,7 @@ private: |
| SkAutoTUnref<GrGLContext> fGLContext; |
| - void createCopyProgram(); |
| + void createCopyPrograms(); |
| // GL program-related state |
| ProgramCache* fProgramCache; |
| @@ -497,8 +497,17 @@ private: |
| GrGLint fTextureUniform; |
| GrGLint fTexCoordXformUniform; |
| GrGLint fPosXformUniform; |
| - GrGLuint fArrayBuffer; |
| - } fCopyProgram; |
| + } fCopyPrograms[2]; |
|
bsalomon
2015/11/20 19:04:25
Need a separate copy program for external images (
|
| + GrGLuint fCopyProgramArrayBuffer; |
| + |
| + static int TextureTargetToCopyProgramIdx(GrGLenum target) { |
| + if (target == GR_GL_TEXTURE_2D) { |
| + return 0; |
| + } else { |
| + SkASSERT(target == GR_GL_TEXTURE_EXTERNAL); |
| + return 1; |
|
joshualitt
2015/11/20 21:58:39
Enum? No strong preference
bsalomon
2015/11/20 22:43:55
tried typing it, wasn't clearly better.
|
| + } |
| + } |
| TriState fMSAAEnabled; |