summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-11-03 09:33:22 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-03 09:33:22 -0800
commit1d04f867d459c5bdc09546b700dd1d9164ac6143 (patch)
tree47c7ee731b6e06704a8cde5b9448d99fab16b170
parenta44730b8dc95cd7bba4c7ddcb059c6d6594e178c (diff)
parent967441ef270cf9dda4c859770764dcb2146f2435 (diff)
downloadframeworks_av-1d04f867d459c5bdc09546b700dd1d9164ac6143.zip
frameworks_av-1d04f867d459c5bdc09546b700dd1d9164ac6143.tar.gz
frameworks_av-1d04f867d459c5bdc09546b700dd1d9164ac6143.tar.bz2
am 8637759a: Merge change I36d0184e into eclair
Merge commit '8637759a1d34a4adda292579d5f8790587659235' into eclair-plus-aosp * commit '8637759a1d34a4adda292579d5f8790587659235': fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
-rw-r--r--include/private/opengles/gl_context.h4
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 {