Merge "Tweaks for forward compatibility"

/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#ifndef ANDROID_GUI_CONSUMER_H

#define ANDROID_GUI_CONSUMER_H

#include <gui/BufferQueue.h>

#include <gui/ConsumerBase.h>

#include <gui/ISurfaceTexture.h>

namespace android {

class GLConsumer : public ConsumerBase {

public:

    GLConsumer(GLuint, bool = false, GLenum = 0, bool = false, const sp<BufferQueue>& = 0) :

        ConsumerBase(0) {}

    void incStrong(const void*) const {}

    void decStrong(const void*) const {}

    status_t updateTexImage() { return 0; }

    void abandon() {}

    sp<ISurfaceTexture> getBufferQueue() const { return 0; }

    GLenum getCurrentTextureTarget() const { return 0; }

    status_t setSynchronousMode(bool) { return 0; }

    void getTransformMatrix(float[16]) {}

    int64_t getTimestamp() {}

    void setFrameAvailableListener(const wp<FrameAvailableListener>&) {}

    sp<GraphicBuffer> getCurrentBuffer() const { return 0; }

};

}; // namespace android

#endif // ANDROID_GUI_CONSUMER_H

    explicit Surface(const sp<ISurfaceTexture>& st);

    Surface (sp<BufferQueue>&) {}

    static status_t writeToParcel(const sp<Surface>& control, Parcel* parcel);

    static sp<Surface> readFromParcel(const Parcel& data);

    // the lock/unlock APIs must be used from the same thread

    status_t    lock(SurfaceInfo* info, Region* dirty = NULL);

    int lock(ANativeWindow_Buffer*, ARect*) { return 0; }

    status_t    unlockAndPost();

    sp<IBinder> asBinder() const;

/*

 * Copyright 2012, The Android Open Source Project

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR

 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

#ifndef ANDROID_LINEARALLOCATOR_H

#define ANDROID_LINEARALLOCATOR_H

#include <stddef.h>

namespace android {

class LinearAllocator {

public:

    void* alloc(size_t size) { return 0; }

    void rewindIfLastAlloc(void* ptr, size_t allocSize) {}

    void dumpMemoryStats(const char* prefix = "") {}

};

}; // namespace android

#endif // ANDROID_LINEARALLOCATOR_H