diff options
| author | Mathias Agopian <mathias@google.com> | 2009-11-03 09:34:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-03 09:34:40 -0800 |
| commit | 07d38c66692b7d87415667010c0658202b5a7f39 (patch) | |
| tree | e9571801445894dac9baa92d15aa153f18d65973 /include | |
| parent | 6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5 (diff) | |
| parent | 8637759a1d34a4adda292579d5f8790587659235 (diff) | |
| download | frameworks_base-07d38c66692b7d87415667010c0658202b5a7f39.zip frameworks_base-07d38c66692b7d87415667010c0658202b5a7f39.tar.gz frameworks_base-07d38c66692b7d87415667010c0658202b5a7f39.tar.bz2 | |
am 8637759a: Merge change I36d0184e into eclair
Merge commit '8637759a1d34a4adda292579d5f8790587659235' into eclair-mr2
* commit '8637759a1d34a4adda292579d5f8790587659235':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/opengles/gl_context.h | 4 | ||||
| -rw-r--r-- | include/ui/GraphicBuffer.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/private/opengles/gl_context.h b/include/private/opengles/gl_context.h index 67c2dd8..26cde38 100644 --- a/include/private/opengles/gl_context.h +++ b/include/private/opengles/gl_context.h @@ -32,6 +32,8 @@ #include <GLES/gl.h> #include <GLES/glext.h> +struct android_native_buffer_t; + namespace android { const unsigned int OGLES_NUM_COMPRESSED_TEXTURE_FORMATS = 10; @@ -602,7 +604,7 @@ struct copybits_context_t { copybit_device_t* blitEngine; int32_t minScale; int32_t maxScale; - buffer_handle_t drawSurfaceBuffer; + android_native_buffer_t* drawSurfaceBuffer; }; struct ogles_context_t { diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index 2172536..b9c491b 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -93,6 +93,8 @@ public: void setIndex(int index); int getIndex() const; + void setVerticalStride(uint32_t vstride); + uint32_t getVerticalStride() const; protected: GraphicBuffer(const Parcel& reply); |