remove files that moved to frameworks/native

Change-Id: I140d291e520097b1148930f736823650e08488f7

1 files changed, 0 insertions, 359 deletions

diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp
deleted file mode 100644
index c85b4ce..0000000
--- a/opengl/libs/EGL/egl_display.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-/* 
- ** Copyright 2007, 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.
- */
-
-#include <string.h>
-
-#include "egl_cache.h"
-#include "egl_display.h"
-#include "egl_object.h"
-#include "egl_tls.h"
-#include "egl_impl.h"
-#include "Loader.h"
-
-// ----------------------------------------------------------------------------
-namespace android {
-// ----------------------------------------------------------------------------
-
-static char const * const sVendorString     = "Android";
-static char const * const sVersionString    = "1.4 Android META-EGL";
-static char const * const sClientApiString  = "OpenGL ES";
-
-// this is the list of EGL extensions that are exposed to applications
-// some of them are mandatory because used by the ANDROID system.
-//
-// mandatory extensions are required per the CDD and not explicitly
-// checked during EGL initialization. the system *assumes* these extensions
-// are present. the system may not function properly if some mandatory
-// extensions are missing.
-//
-// NOTE: sExtensionString MUST be have a single space as the last character.
-//
-static char const * const sExtensionString  =
-        "EGL_KHR_image "                        // mandatory
-        "EGL_KHR_image_base "                   // mandatory
-        "EGL_KHR_image_pixmap "
-        "EGL_KHR_gl_texture_2D_image "
-        "EGL_KHR_gl_texture_cubemap_image "
-        "EGL_KHR_gl_renderbuffer_image "
-        "EGL_KHR_fence_sync "
-        "EGL_NV_system_time "
-        "EGL_ANDROID_image_native_buffer "      // mandatory
-        ;
-
-// extensions not exposed to applications but used by the ANDROID system
-//      "EGL_ANDROID_recordable "               // mandatory
-//      "EGL_ANDROID_blob_cache "               // strongly recommended
-
-extern void initEglTraceLevel();
-extern void setGLHooksThreadSpecific(gl_hooks_t const *value);
-
-// ----------------------------------------------------------------------------
-
-egl_display_t egl_display_t::sDisplay[NUM_DISPLAYS];
-
-egl_display_t::egl_display_t() :
-    magic('_dpy'), refs(0) {
-}
-
-egl_display_t::~egl_display_t() {
-    magic = 0;
-    egl_cache_t::get()->terminate();
-}
-
-egl_display_t* egl_display_t::get(EGLDisplay dpy) {
-    uintptr_t index = uintptr_t(dpy)-1U;
-    return (index >= NUM_DISPLAYS) ? NULL : &sDisplay[index];
-}
-
-void egl_display_t::addObject(egl_object_t* object) {
-    Mutex::Autolock _l(lock);
-    objects.add(object);
-}
-
-void egl_display_t::removeObject(egl_object_t* object) {
-    Mutex::Autolock _l(lock);
-    objects.remove(object);
-}
-
-bool egl_display_t::getObject(egl_object_t* object) const {
-    Mutex::Autolock _l(lock);
-    if (objects.indexOf(object) >= 0) {
-        if (object->getDisplay() == this) {
-            object->incRef();
-            return true;
-        }
-    }
-    return false;
-}
-
-EGLDisplay egl_display_t::getFromNativeDisplay(EGLNativeDisplayType disp) {
-    if (uintptr_t(disp) >= NUM_DISPLAYS)
-        return NULL;
-
-    return sDisplay[uintptr_t(disp)].getDisplay(disp);
-}
-
-EGLDisplay egl_display_t::getDisplay(EGLNativeDisplayType display) {
-
-    Mutex::Autolock _l(lock);
-
-    // get our driver loader
-    Loader& loader(Loader::getInstance());
-
-    egl_connection_t* const cnx = &gEGLImpl;
-    if (cnx->dso && disp.dpy == EGL_NO_DISPLAY) {
-        EGLDisplay dpy = cnx->egl.eglGetDisplay(display);
-        disp.dpy = dpy;
-        if (dpy == EGL_NO_DISPLAY) {
-            loader.close(cnx->dso);
-            cnx->dso = NULL;
-        }
-    }
-
-    return EGLDisplay(uintptr_t(display) + 1U);
-}
-
-EGLBoolean egl_display_t::initialize(EGLint *major, EGLint *minor) {
-
-    Mutex::Autolock _l(lock);
-
-    if (refs > 0) {
-        if (major != NULL)
-            *major = VERSION_MAJOR;
-        if (minor != NULL)
-            *minor = VERSION_MINOR;
-        refs++;
-        return EGL_TRUE;
-    }
-
-#if EGL_TRACE
-
-    // Called both at early_init time and at this time. (Early_init is pre-zygote, so
-    // the information from that call may be stale.)
-    initEglTraceLevel();
-
-#endif
-
-    setGLHooksThreadSpecific(&gHooksNoContext);
-
-    // initialize each EGL and
-    // build our own extension string first, based on the extension we know
-    // and the extension supported by our client implementation
-
-    egl_connection_t* const cnx = &gEGLImpl;
-    cnx->major = -1;
-    cnx->minor = -1;
-    if (cnx->dso) {
-
-#if defined(ADRENO130)
-#warning "Adreno-130 eglInitialize() workaround"
-        /*
-         * The ADRENO 130 driver returns a different EGLDisplay each time
-         * eglGetDisplay() is called, but also makes the EGLDisplay invalid
-         * after eglTerminate() has been called, so that eglInitialize()
-         * cannot be called again. Therefore, we need to make sure to call
-         * eglGetDisplay() before calling eglInitialize();
-         */
-        if (i == IMPL_HARDWARE) {
-            disp[i].dpy = cnx->egl.eglGetDisplay(EGL_DEFAULT_DISPLAY);
-        }
-#endif
-
-        EGLDisplay idpy = disp.dpy;
-        if (cnx->egl.eglInitialize(idpy, &cnx->major, &cnx->minor)) {
-            //ALOGD("initialized dpy=%p, ver=%d.%d, cnx=%p",
-            //        idpy, cnx->major, cnx->minor, cnx);
-
-            // display is now initialized
-            disp.state = egl_display_t::INITIALIZED;
-
-            // get the query-strings for this display for each implementation
-            disp.queryString.vendor = cnx->egl.eglQueryString(idpy,
-                    EGL_VENDOR);
-            disp.queryString.version = cnx->egl.eglQueryString(idpy,
-                    EGL_VERSION);
-            disp.queryString.extensions = cnx->egl.eglQueryString(idpy,
-                    EGL_EXTENSIONS);
-            disp.queryString.clientApi = cnx->egl.eglQueryString(idpy,
-                    EGL_CLIENT_APIS);
-
-        } else {
-            ALOGW("eglInitialize(%p) failed (%s)", idpy,
-                    egl_tls_t::egl_strerror(cnx->egl.eglGetError()));
-        }
-    }
-
-    // the query strings are per-display
-    mVendorString.setTo(sVendorString);
-    mVersionString.setTo(sVersionString);
-    mClientApiString.setTo(sClientApiString);
-
-    // we only add extensions that exist in the implementation
-    char const* start = sExtensionString;
-    char const* end;
-    do {
-        // find the space separating this extension for the next one
-        end = strchr(start, ' ');
-        if (end) {
-            // length of the extension string
-            const size_t len = end - start;
-            if (len) {
-                // NOTE: we could avoid the copy if we had strnstr.
-                const String8 ext(start, len);
-                // now look for this extension
-                if (disp.queryString.extensions) {
-                    // if we find it, add this extension string to our list
-                    // (and don't forget the space)
-                    const char* match = strstr(disp.queryString.extensions, ext.string());
-                    if (match && (match[len] == ' ' || match[len] == 0)) {
-                        mExtensionString.append(start, len+1);
-                    }
-                }
-            }
-            // process the next extension string, and skip the space.
-            start = end + 1;
-        }
-    } while (end);
-
-    egl_cache_t::get()->initialize(this);
-
-    refs++;
-    if (major != NULL)
-        *major = VERSION_MAJOR;
-    if (minor != NULL)
-        *minor = VERSION_MINOR;
-    return EGL_TRUE;
-}
-
-EGLBoolean egl_display_t::terminate() {
-
-    Mutex::Autolock _l(lock);
-
-    if (refs == 0) {
-        return setError(EGL_NOT_INITIALIZED, EGL_FALSE);
-    }
-
-    // this is specific to Android, display termination is ref-counted.
-    if (refs > 1) {
-        refs--;
-        return EGL_TRUE;
-    }
-
-    EGLBoolean res = EGL_FALSE;
-    egl_connection_t* const cnx = &gEGLImpl;
-    if (cnx->dso && disp.state == egl_display_t::INITIALIZED) {
-        if (cnx->egl.eglTerminate(disp.dpy) == EGL_FALSE) {
-            ALOGW("eglTerminate(%p) failed (%s)", disp.dpy,
-                    egl_tls_t::egl_strerror(cnx->egl.eglGetError()));
-        }
-        // REVISIT: it's unclear what to do if eglTerminate() fails
-        disp.state = egl_display_t::TERMINATED;
-        res = EGL_TRUE;
-    }
-
-    // Mark all objects remaining in the list as terminated, unless
-    // there are no reference to them, it which case, we're free to
-    // delete them.
-    size_t count = objects.size();
-    ALOGW_IF(count, "eglTerminate() called w/ %d objects remaining", count);
-    for (size_t i=0 ; i<count ; i++) {
-        egl_object_t* o = objects.itemAt(i);
-        o->destroy();
-    }
-
-    // this marks all object handles are "terminated"
-    objects.clear();
-
-    refs--;
-    return res;
-}
-
-void egl_display_t::loseCurrent(egl_context_t * cur_c)
-{
-    if (cur_c) {
-        egl_display_t* display = cur_c->getDisplay();
-        if (display) {
-            display->loseCurrentImpl(cur_c);
-        }
-    }
-}
-
-void egl_display_t::loseCurrentImpl(egl_context_t * cur_c)
-{
-    // by construction, these are either 0 or valid (possibly terminated)
-    // it should be impossible for these to be invalid
-    ContextRef _cur_c(cur_c);
-    SurfaceRef _cur_r(cur_c ? get_surface(cur_c->read) : NULL);
-    SurfaceRef _cur_d(cur_c ? get_surface(cur_c->draw) : NULL);
-
-    { // scope for the lock
-        Mutex::Autolock _l(lock);
-        cur_c->onLooseCurrent();
-
-    }
-
-    // This cannot be called with the lock held because it might end-up
-    // calling back into EGL (in particular when a surface is destroyed
-    // it calls ANativeWindow::disconnect
-    _cur_c.release();
-    _cur_r.release();
-    _cur_d.release();
-}
-
-EGLBoolean egl_display_t::makeCurrent(egl_context_t* c, egl_context_t* cur_c,
-        EGLSurface draw, EGLSurface read, EGLContext ctx,
-        EGLSurface impl_draw, EGLSurface impl_read, EGLContext impl_ctx)
-{
-    EGLBoolean result;
-
-    // by construction, these are either 0 or valid (possibly terminated)
-    // it should be impossible for these to be invalid
-    ContextRef _cur_c(cur_c);
-    SurfaceRef _cur_r(cur_c ? get_surface(cur_c->read) : NULL);
-    SurfaceRef _cur_d(cur_c ? get_surface(cur_c->draw) : NULL);
-
-    { // scope for the lock
-        Mutex::Autolock _l(lock);
-        if (c) {
-            result = c->cnx->egl.eglMakeCurrent(
-                    disp.dpy, impl_draw, impl_read, impl_ctx);
-            if (result == EGL_TRUE) {
-                c->onMakeCurrent(draw, read);
-            }
-        } else {
-            result = cur_c->cnx->egl.eglMakeCurrent(
-                    disp.dpy, impl_draw, impl_read, impl_ctx);
-            if (result == EGL_TRUE) {
-                cur_c->onLooseCurrent();
-            }
-        }
-    }
-
-    if (result == EGL_TRUE) {
-        // This cannot be called with the lock held because it might end-up
-        // calling back into EGL (in particular when a surface is destroyed
-        // it calls ANativeWindow::disconnect
-        _cur_c.release();
-        _cur_r.release();
-        _cur_d.release();
-    }
-
-    return result;
-}
-
-// ----------------------------------------------------------------------------
-}; // namespace android
-// ----------------------------------------------------------------------------