Index: src/gpu/gl/SkNullGLContext.cpp |
diff --git a/src/gpu/gl/SkNullGLContext.cpp b/src/gpu/gl/SkNullGLContext.cpp |
index e7270c32c47c6283f5d45e4f2be40bb520a0abda..e2a80ce2b37e72ca6f2c68c85f9a00090c6477b0 100644 |
--- a/src/gpu/gl/SkNullGLContext.cpp |
+++ b/src/gpu/gl/SkNullGLContext.cpp |
@@ -122,8 +122,6 @@ |
BufferManager fBufferManager; |
GrGLuint fCurrArrayBuffer; |
GrGLuint fCurrElementArrayBuffer; |
- GrGLuint fCurrPixelPackBuffer; |
- GrGLuint fCurrPixelUnpackBuffer; |
GrGLuint fCurrProgramID; |
GrGLuint fCurrShaderID; |
@@ -131,8 +129,6 @@ |
ContextState() |
: fCurrArrayBuffer(0) |
, fCurrElementArrayBuffer(0) |
- , fCurrPixelPackBuffer(0) |
- , fCurrPixelUnpackBuffer(0) |
, fCurrProgramID(0) |
, fCurrShaderID(0) {} |
@@ -175,12 +171,6 @@ |
break; |
case GR_GL_ELEMENT_ARRAY_BUFFER: |
id = state->fCurrElementArrayBuffer; |
- break; |
- case GR_GL_PIXEL_PACK_BUFFER: |
- id = state->fCurrPixelPackBuffer; |
- break; |
- case GR_GL_PIXEL_UNPACK_BUFFER: |
- id = state->fCurrPixelUnpackBuffer; |
break; |
default: |
SkFAIL("Unexpected target to nullGLBufferData"); |
@@ -225,12 +215,6 @@ |
case GR_GL_ELEMENT_ARRAY_BUFFER: |
state->fCurrElementArrayBuffer = buffer; |
break; |
- case GR_GL_PIXEL_PACK_BUFFER: |
- state->fCurrPixelPackBuffer = buffer; |
- break; |
- case GR_GL_PIXEL_UNPACK_BUFFER: |
- state->fCurrPixelUnpackBuffer = buffer; |
- break; |
} |
} |
@@ -243,12 +227,6 @@ |
} |
if (ids[i] == state->fCurrElementArrayBuffer) { |
state->fCurrElementArrayBuffer = 0; |
- } |
- if (ids[i] == state->fCurrPixelPackBuffer) { |
- state->fCurrPixelPackBuffer = 0; |
- } |
- if (ids[i] == state->fCurrPixelUnpackBuffer) { |
- state->fCurrPixelUnpackBuffer = 0; |
} |
BufferObj* buffer = state->fBufferManager.lookUp(ids[i]); |
@@ -267,12 +245,6 @@ |
case GR_GL_ELEMENT_ARRAY_BUFFER: |
id = state->fCurrElementArrayBuffer; |
break; |
- case GR_GL_PIXEL_PACK_BUFFER: |
- id = state->fCurrPixelPackBuffer; |
- break; |
- case GR_GL_PIXEL_UNPACK_BUFFER: |
- id = state->fCurrPixelUnpackBuffer; |
- break; |
} |
if (id > 0) { |
@@ -295,12 +267,6 @@ |
case GR_GL_ELEMENT_ARRAY_BUFFER: |
id = state->fCurrElementArrayBuffer; |
break; |
- case GR_GL_PIXEL_PACK_BUFFER: |
- id = state->fCurrPixelPackBuffer; |
- break; |
- case GR_GL_PIXEL_UNPACK_BUFFER: |
- id = state->fCurrPixelUnpackBuffer; |
- break; |
} |
if (id > 0) { |
@@ -328,12 +294,6 @@ |
break; |
case GR_GL_ELEMENT_ARRAY_BUFFER: |
id = state->fCurrElementArrayBuffer; |
- break; |
- case GR_GL_PIXEL_PACK_BUFFER: |
- id = state->fCurrPixelPackBuffer; |
- break; |
- case GR_GL_PIXEL_UNPACK_BUFFER: |
- id = state->fCurrPixelUnpackBuffer; |
break; |
} |
if (id > 0) { |
@@ -359,12 +319,6 @@ |
break; |
case GR_GL_ELEMENT_ARRAY_BUFFER: |
id = state->fCurrElementArrayBuffer; |
- break; |
- case GR_GL_PIXEL_PACK_BUFFER: |
- id = state->fCurrPixelPackBuffer; |
- break; |
- case GR_GL_PIXEL_UNPACK_BUFFER: |
- id = state->fCurrPixelUnpackBuffer; |
break; |
} |
if (id > 0) { |