ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "always pass the BufferQueue explicitely to consumers"

Browse Source
This commit is contained in:
Mathias Agopian 2013-07-16 02:17:58 +00:00 committed by Android (Google) Code Review
commit 7f069d79e7
13 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/flatland/GLHelper.cpp
View File

@ -199,8 +199,8 @@ bool GLHelper::getShaderProgram(const char* name, GLuint* outPgm) {
bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h,
sp<GLConsumer>* glConsumer, EGLSurface* surface) {
sp<BufferQueue> bq = new BufferQueue(true, mGraphicBufferAlloc);
sp<GLConsumer> glc = new GLConsumer(name, true,
GL_TEXTURE_EXTERNAL_OES, false, bq);
sp<GLConsumer> glc = new GLConsumer(bq, name,
GL_TEXTURE_EXTERNAL_OES, false);
glc->setDefaultBufferSize(w, h);
glc->setDefaultMaxBufferCount(3);
glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);

4
include/gui/BufferItemConsumer.h
View File

@ -29,6 +29,8 @@
namespace android {
class BufferQueue;
/**
* BufferItemConsumer is a BufferQueue consumer endpoint that allows clients
* access to the whole BufferItem entry from BufferQueue. Multiple buffers may
@ -49,7 +51,7 @@ class BufferItemConsumer: public ConsumerBase
// the consumer usage flags passed to the graphics allocator. The
// bufferCount parameter specifies how many buffers can be locked for user
// access at the same time.
BufferItemConsumer(uint32_t consumerUsage,
BufferItemConsumer(const sp<BufferQueue>& bq, uint32_t consumerUsage,
int bufferCount = BufferQueue::MIN_UNDEQUEUED_BUFFERS,
bool synchronousMode = false);

5
include/gui/CpuConsumer.h
View File

@ -28,6 +28,8 @@
namespace android {
class BufferQueue;
/**
* CpuConsumer is a BufferQueue consumer endpoint that allows direct CPU
* access to the underlying gralloc buffers provided by BufferQueue. Multiple
@ -64,7 +66,8 @@ class CpuConsumer : public ConsumerBase
// Create a new CPU consumer. The maxLockedBuffers parameter specifies
// how many buffers can be locked for user access at the same time.
CpuConsumer(uint32_t maxLockedBuffers, bool synchronousMode = true);
CpuConsumer(const sp<BufferQueue>& bq,
uint32_t maxLockedBuffers, bool synchronousMode = true);
virtual ~CpuConsumer();

6
include/gui/GLConsumer.h
View File

@ -85,9 +85,9 @@ public:
// purely to allow a GLConsumer to be transferred from one consumer
// context to another. If such a transfer is not needed there is no
// requirement that either of these methods be called.
GLConsumer(GLuint tex, bool allowSynchronousMode = true,
GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, bool useFenceSync = true,
const sp<BufferQueue> &bufferQueue = 0);
GLConsumer(const sp<BufferQueue>& bq,
GLuint tex, GLenum texTarget = GL_TEXTURE_EXTERNAL_OES,
bool useFenceSync = true);
// updateTexImage acquires the most recently queued buffer, and sets the
// image contents of the target texture to it.

6
libs/gui/BufferItemConsumer.cpp
View File

@ -29,9 +29,9 @@
namespace android {
BufferItemConsumer::BufferItemConsumer(uint32_t consumerUsage,
int bufferCount, bool synchronousMode) :
ConsumerBase(new BufferQueue(true) )
BufferItemConsumer::BufferItemConsumer(const sp<BufferQueue>& bq,
uint32_t consumerUsage, int bufferCount, bool synchronousMode) :
ConsumerBase(bq)
{
mBufferQueue->setConsumerUsageBits(consumerUsage);
mBufferQueue->setSynchronousMode(synchronousMode);

5
libs/gui/CpuConsumer.cpp
View File

@ -30,8 +30,9 @@
namespace android {
CpuConsumer::CpuConsumer(uint32_t maxLockedBuffers, bool synchronousMode) :
ConsumerBase(new BufferQueue(true) ),
CpuConsumer::CpuConsumer(const sp<BufferQueue>& bq,
uint32_t maxLockedBuffers, bool synchronousMode) :
ConsumerBase(bq),
mMaxLockedBuffers(maxLockedBuffers),
mCurrentLockedBuffers(0)
{

6
libs/gui/GLConsumer.cpp
View File

@ -78,9 +78,9 @@ static float mtxRot90[16] = {
static void mtxMul(float out[16], const float a[16], const float b[16]);
GLConsumer::GLConsumer(GLuint tex, bool allowSynchronousMode,
GLenum texTarget, bool useFenceSync, const sp<BufferQueue> &bufferQueue) :
ConsumerBase(bufferQueue == 0 ? new BufferQueue(allowSynchronousMode) : bufferQueue),
GLConsumer::GLConsumer(const sp<BufferQueue>& bq, GLuint tex,
GLenum texTarget, bool useFenceSync) :
ConsumerBase(bq),
mCurrentTransform(0),
mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE),
mCurrentFence(Fence::NO_FENCE),

3
libs/gui/SurfaceComposerClient.cpp
View File

@ -633,7 +633,8 @@ ScreenshotClient::~ScreenshotClient() {
sp<CpuConsumer> ScreenshotClient::getCpuConsumer() const {
if (mCpuConsumer == NULL) {
mCpuConsumer = new CpuConsumer(1);
sp<BufferQueue> bq = new BufferQueue();
mCpuConsumer = new CpuConsumer(bq, 1);
mCpuConsumer->setName(String8("ScreenshotClient"));
}
return mCpuConsumer;

3
libs/gui/tests/CpuConsumer_test.cpp
View File

@ -66,7 +66,8 @@ protected:
test_info->name(),
params.width, params.height,
params.maxLockedBuffers, params.format);
mCC = new CpuConsumer(params.maxLockedBuffers);
sp<BufferQueue> bq = new BufferQueue();
mCC = new CpuConsumer(bq, params.maxLockedBuffers);
String8 name("CpuConsumer_Under_Test");
mCC->setName(name);
mSTC = new Surface(mCC->getProducerInterface());

6
libs/gui/tests/SurfaceTextureClient_test.cpp
View File

@ -40,7 +40,8 @@ protected:
ALOGV("Begin test: %s.%s", testInfo->test_case_name(),
testInfo->name());
mST = new GLConsumer(123);
sp<BufferQueue> bq = new BufferQueue();
mST = new GLConsumer(bq, 123);
mSTC = new Surface(mST->getBufferQueue());
mANW = mSTC;
@ -715,7 +716,8 @@ protected:
ASSERT_NE(EGL_NO_CONTEXT, mEglContext);
for (int i = 0; i < NUM_SURFACE_TEXTURES; i++) {
sp<GLConsumer> st(new GLConsumer(i));
sp<BufferQueue> bq = new BufferQueue();
sp<GLConsumer> st(new GLConsumer(bq, i));
sp<Surface> stc(new Surface(st->getBufferQueue()));
mEglSurfaces[i] = eglCreateWindowSurface(mEglDisplay, myConfig,
static_cast<ANativeWindow*>(stc.get()), NULL);

6
libs/gui/tests/SurfaceTexture_test.cpp
View File

@ -385,7 +385,8 @@ protected:
virtual void SetUp() {
GLTest::SetUp();
mGlConsumer = new GLConsumer(TEX_ID);
sp<BufferQueue> bq = new BufferQueue();
mGlConsumer = new GLConsumer(bq, TEX_ID);
mSurface = new Surface(mGlConsumer->getBufferQueue());
mANW = mSurface.get();
@ -479,7 +480,8 @@ protected:
virtual void SetUp() {
GLTest::SetUp();
mST = new GLConsumer(TEX_ID);
sp<BufferQueue> bq = new BufferQueue();
mST = new GLConsumer(bq, TEX_ID);
mSTC = new Surface(mST->getBufferQueue());
mANW = mSTC;
mTextureRenderer = new TextureRenderer(TEX_ID, mST);

4
services/surfaceflinger/Layer.cpp
View File

@ -110,8 +110,8 @@ void Layer::onFirstRef()
{
// Creates a custom BufferQueue for SurfaceFlingerConsumer to use
sp<BufferQueue> bq = new SurfaceTextureLayer(mFlinger);
mSurfaceFlingerConsumer = new SurfaceFlingerConsumer(mTextureName, true,
GL_TEXTURE_EXTERNAL_OES, false, bq);
mSurfaceFlingerConsumer = new SurfaceFlingerConsumer(bq, mTextureName,
GL_TEXTURE_EXTERNAL_OES, false);
mSurfaceFlingerConsumer->setConsumerUsageBits(getEffectiveUsage(0));
mSurfaceFlingerConsumer->setFrameAvailableListener(this);

9
services/surfaceflinger/SurfaceFlingerConsumer.h
View File

@ -27,11 +27,10 @@ namespace android {
*/
class SurfaceFlingerConsumer : public GLConsumer {
public:
SurfaceFlingerConsumer(GLuint tex, bool allowSynchronousMode = true,
GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, bool useFenceSync = true,
const sp<BufferQueue> &bufferQueue = 0)
: GLConsumer(tex, allowSynchronousMode, texTarget, useFenceSync,
bufferQueue)
SurfaceFlingerConsumer(const sp<BufferQueue>& bq, GLuint tex,
GLenum texTarget = GL_TEXTURE_EXTERNAL_OES,
bool useFenceSync = true)
: GLConsumer(bq, tex, texTarget, useFenceSync)
{}
class BufferRejecter {