diff options
author | Mathias Agopian <mathias@google.com> | 2010-07-29 23:28:03 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2010-07-29 23:28:03 -0700 |
commit | bb0628d9debc5ddd5b1ca3311d6397bbe668c4ee (patch) | |
tree | 0ec8954a98e2e8e0cc770e25cd284536a386dce2 /opengl/libagl/state.cpp | |
parent | 3a8e497f3b03967eefb0feda6e0b089654d19972 (diff) | |
download | frameworks_native-bb0628d9debc5ddd5b1ca3311d6397bbe668c4ee.tar.gz frameworks_native-bb0628d9debc5ddd5b1ca3311d6397bbe668c4ee.tar.bz2 frameworks_native-bb0628d9debc5ddd5b1ca3311d6397bbe668c4ee.zip |
remove copybit hack from software opengl (libagl)
h/w acceleration is not supported through software gl + copybit anylonger,
instead, h/w opengl must be used. in the system compositor, a new h/w
composition api will be introduced to allow h/w accelerated composition with
overlays and/or 2D blocks.
Change-Id: I04949cb074ba8c4d637319ace23497c16a58d5bf
Diffstat (limited to 'opengl/libagl/state.cpp')
-rw-r--r-- | opengl/libagl/state.cpp | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/opengl/libagl/state.cpp b/opengl/libagl/state.cpp index 27bb5454f..a0f720a0d 100644 --- a/opengl/libagl/state.cpp +++ b/opengl/libagl/state.cpp @@ -28,10 +28,6 @@ #include "BufferObjectManager.h" #include "TextureObjectManager.h" -#ifdef LIBAGL_USE_GRALLOC_COPYBITS -#include <hardware/copybit.h> -#endif // LIBAGL_USE_GRALLOC_COPYBITS - namespace android { // ---------------------------------------------------------------------------- @@ -101,35 +97,6 @@ ogles_context_t *ogles_init(size_t extra) // OpenGL enables dithering by default c->rasterizer.procs.enable(c, GL_DITHER); - c->copybits.blitEngine = NULL; - c->copybits.minScale = 0; - c->copybits.maxScale = 0; - c->copybits.drawSurfaceBuffer = 0; - -#ifdef LIBAGL_USE_GRALLOC_COPYBITS - hw_module_t const* module; - if (hw_get_module(COPYBIT_HARDWARE_MODULE_ID, &module) == 0) { - struct copybit_device_t* copyBits; - if (copybit_open(module, ©Bits) == 0) { - c->copybits.blitEngine = copyBits; - { - int minLim = copyBits->get(copyBits, - COPYBIT_MINIFICATION_LIMIT); - if (minLim != -EINVAL && minLim > 0) { - c->copybits.minScale = (1 << 16) / minLim; - } - } - { - int magLim = copyBits->get(copyBits, - COPYBIT_MAGNIFICATION_LIMIT); - if (magLim != -EINVAL && magLim > 0) { - c->copybits.maxScale = min(32*1024-1, magLim) << 16; - } - } - } - } -#endif // LIBAGL_USE_GRALLOC_COPYBITS - return c; } @@ -144,11 +111,6 @@ void ogles_uninit(ogles_context_t* c) c->bufferObjectManager->decStrong(c); ggl_uninit_context(&(c->rasterizer)); free(c->rasterizer.base); -#ifdef LIBAGL_USE_GRALLOC_COPYBITS - if (c->copybits.blitEngine != NULL) { - copybit_close((struct copybit_device_t*) c->copybits.blitEngine); - } -#endif // LIBAGL_USE_GRALLOC_COPYBITS } void _ogles_error(ogles_context_t* c, GLenum error) |