Remove redundant code for getMappedPointer in PixelBuffer
b/29755121
Change-Id: I6cd5bbe11a53bc5e1cd421671d3d9aa89591d886
diff --git a/libs/hwui/PixelBuffer.cpp b/libs/hwui/PixelBuffer.cpp
index 165c7db..2a96b69 100644
--- a/libs/hwui/PixelBuffer.cpp
+++ b/libs/hwui/PixelBuffer.cpp
@@ -37,8 +37,6 @@
uint8_t* map(AccessMode mode = kAccessMode_ReadWrite) override;
- uint8_t* getMappedPointer() const override;
-
void upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) override;
protected:
@@ -64,10 +62,6 @@
mAccessMode = kAccessMode_None;
}
-uint8_t* CpuPixelBuffer::getMappedPointer() const {
- return mAccessMode == kAccessMode_None ? nullptr : mBuffer.get();
-}
-
void CpuPixelBuffer::upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) {
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height,
mFormat, GL_UNSIGNED_BYTE, &mBuffer[offset]);
@@ -84,8 +78,6 @@
uint8_t* map(AccessMode mode = kAccessMode_ReadWrite) override;
- uint8_t* getMappedPointer() const override;
-
void upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) override;
protected:
@@ -142,10 +134,6 @@
}
}
-uint8_t* GpuPixelBuffer::getMappedPointer() const {
- return mMappedPointer;
-}
-
void GpuPixelBuffer::upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) {
// If the buffer is not mapped, unmap() will not bind it
mCaches.pixelBufferState().bind(mBuffer);
diff --git a/libs/hwui/PixelBuffer.h b/libs/hwui/PixelBuffer.h
index bbef36b..9536bc8 100644
--- a/libs/hwui/PixelBuffer.h
+++ b/libs/hwui/PixelBuffer.h
@@ -99,12 +99,6 @@
}
/**
- * Returns the currently mapped pointer. Returns NULL if the buffer
- * is not mapped.
- */
- virtual uint8_t* getMappedPointer() const = 0;
-
- /**
* Upload the specified rectangle of this pixel buffer as a
* GL_TEXTURE_2D texture. Calling this method will trigger
* an unmap() if necessary.
@@ -199,8 +193,7 @@
/**
* Unmaps this buffer, if needed. After the buffer is unmapped,
* the pointer previously returned by map() becomes invalid and
- * should not be used. After calling this method, getMappedPointer()
- * will always return NULL.
+ * should not be used.
*/
virtual void unmap() = 0;