aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/GrGLGpu.h
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2015-11-20 20:24:31 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-20 20:24:31 -0800
commit0315dbcb554fe7f5fa80a81079fd8d2e61fc20e1 (patch)
treee8aca2e2b4437baf79c8a85ddc9bc2ce659ac734 /src/gpu/gl/GrGLGpu.h
parent27a048700778d4cebfc23301d1780649791b0e03 (diff)
Revert of Initial version of external_oes texture support and unit test (patchset #14 id:260001 of https://codereview.chromium.org/1451683002/ )
Reason for revert: Error wrapping external texture in GrTexture on some devices. Original issue's description: > Initial version of external_oes texture support and unit test > > Committed: https://skia.googlesource.com/skia/+/27a048700778d4cebfc23301d1780649791b0e03 TBR=joshualitt@google.com,egdaniel@google.com,robertphillips@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1459323004
Diffstat (limited to 'src/gpu/gl/GrGLGpu.h')
-rw-r--r--src/gpu/gl/GrGLGpu.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
index 637a1cf161..c8da150a0d 100644
--- a/src/gpu/gl/GrGLGpu.h
+++ b/src/gpu/gl/GrGLGpu.h
@@ -322,7 +322,7 @@ private:
SkAutoTUnref<GrGLContext> fGLContext;
- void createCopyPrograms();
+ void createCopyProgram();
// GL program-related state
ProgramCache* fProgramCache;
@@ -497,17 +497,8 @@ private:
GrGLint fTextureUniform;
GrGLint fTexCoordXformUniform;
GrGLint fPosXformUniform;
- } fCopyPrograms[2];
- GrGLuint fCopyProgramArrayBuffer;
-
- static int TextureTargetToCopyProgramIdx(GrGLenum target) {
- if (target == GR_GL_TEXTURE_2D) {
- return 0;
- } else {
- SkASSERT(target == GR_GL_TEXTURE_EXTERNAL);
- return 1;
- }
- }
+ GrGLuint fArrayBuffer;
+ } fCopyProgram;
TriState fMSAAEnabled;