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 | 672635d84f2d897b5e782448356bba18b5f2dc7c (patch) | |
tree | 5a19592288ae8252e92cdfeac6feda51094795cd /include | |
parent | 076667f9624516f9c65d5d4d7571ef5522237229 (diff) | |
parent | 967441ef270cf9dda4c859770764dcb2146f2435 (diff) | |
download | frameworks_av-672635d84f2d897b5e782448356bba18b5f2dc7c.zip frameworks_av-672635d84f2d897b5e782448356bba18b5f2dc7c.tar.gz frameworks_av-672635d84f2d897b5e782448356bba18b5f2dc7c.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 |
1 files changed, 3 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 { |