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

Commit 5e1c4648 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "remove last traces of copybit"

parents c01fd148 75c1535e

include/private/opengles/gl_context.h

+0 −16
Original line number Original line Diff line number Diff line
@@ -31,8 +31,6 @@ 
#include <GLES/gl.h>

#include <GLES/gl.h>

#include <GLES/glext.h>

#include <GLES/glext.h>





struct android_native_buffer_t;



namespace android {

namespace android {
@@ -603,13 +601,6 @@ struct prims_t { 
    void (*renderTriangle)(GL, vertex_t*, vertex_t*, vertex_t*);

    void (*renderTriangle)(GL, vertex_t*, vertex_t*, vertex_t*);

};

};





struct copybits_context_t {

    // A handle to the blit engine, if it exists, else NULL.

    int32_t                 minScale;

    int32_t                 maxScale;

    android_native_buffer_t* drawSurfaceBuffer;

};



struct ogles_context_t {

struct ogles_context_t {

    context_t               rasterizer;

    context_t               rasterizer;

    array_machine_t         arrays         __attribute__((aligned(32)));

    array_machine_t         arrays         __attribute__((aligned(32)));
@@ -634,13 +625,6 @@ struct ogles_context_t { 
    EGLSurfaceManager*      surfaceManager;

    EGLSurfaceManager*      surfaceManager;

    EGLBufferObjectManager* bufferObjectManager;

    EGLBufferObjectManager* bufferObjectManager;





    // copybits is only used if LIBAGL_USE_GRALLOC_COPYBITS is

    // defined, but it is always present because ogles_context_t is a public

    // struct that is used by clients of libagl. We want the size and offsets

    // to stay the same, whether or not LIBAGL_USE_GRALLOC_COPYBITS is defined.



    copybits_context_t      copybits;



    GLenum                  error;

    GLenum                  error;





    static inline ogles_context_t* get() {

    static inline ogles_context_t* get() {

opengl/libagl/egl.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -440,7 +440,6 @@ void egl_window_surface_v2_t::copyBlt( 
        android_native_buffer_t* src, void const* src_vaddr,

        android_native_buffer_t* src, void const* src_vaddr,

        const Region& clip)

        const Region& clip)

{

{

    // FIXME: use copybit if possible

    // NOTE: dst and src must be the same format

    // NOTE: dst and src must be the same format

    

    

    Region::const_iterator cur = clip.begin();

    Region::const_iterator cur = clip.begin();

opengl/libagl2/src/egl.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -432,7 +432,6 @@ void egl_window_surface_v2_t::copyBlt( 
        android_native_buffer_t* src, void const* src_vaddr,

        android_native_buffer_t* src, void const* src_vaddr,

        const Region& clip)

        const Region& clip)

{

{

    // FIXME: use copybit if possible

    // NOTE: dst and src must be the same format

    // NOTE: dst and src must be the same format





    Region::const_iterator cur = clip.begin();

    Region::const_iterator cur = clip.begin();