Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 672635d8 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

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
parents 076667f9 967441ef

include/private/opengles/gl_context.h

+3 −1
Original line number Diff line number Diff line
@@ -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 {