diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-30 18:03:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-30 18:03:17 -0700 |
| commit | d7beac601a153c4543813d3100f160cdb8d8ed4c (patch) | |
| tree | 81e3f34c8345b60f834f7ae515dab583345d0835 /opengl/libagl/egl.cpp | |
| parent | 86486c255fcfe8ea748072dab1a565131d3d4371 (diff) | |
| parent | 3efd03a3c2c26ee2bcdf6d7798c870300d2eb326 (diff) | |
| download | frameworks_native-d7beac601a153c4543813d3100f160cdb8d8ed4c.zip frameworks_native-d7beac601a153c4543813d3100f160cdb8d8ed4c.tar.gz frameworks_native-d7beac601a153c4543813d3100f160cdb8d8ed4c.tar.bz2 | |
am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp
* commit '4d7fc3651bd93d588d2b8580010414b59bc67729':
remove copybit hack from software opengl (libagl)
Diffstat (limited to 'opengl/libagl/egl.cpp')
| -rw-r--r-- | opengl/libagl/egl.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 32e6c9f..8b476c0 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -628,23 +628,6 @@ EGLClientBuffer egl_window_surface_v2_t::getRenderBuffer() const return buffer; } -#ifdef LIBAGL_USE_GRALLOC_COPYBITS - -static bool supportedCopybitsDestinationFormat(int format) { - // Hardware supported - switch (format) { - case HAL_PIXEL_FORMAT_RGB_565: - case HAL_PIXEL_FORMAT_RGBA_8888: - case HAL_PIXEL_FORMAT_RGBX_8888: - case HAL_PIXEL_FORMAT_RGBA_4444: - case HAL_PIXEL_FORMAT_RGBA_5551: - case HAL_PIXEL_FORMAT_BGRA_8888: - return true; - } - return false; -} -#endif - EGLBoolean egl_window_surface_v2_t::bindDrawSurface(ogles_context_t* gl) { GGLSurface buffer; @@ -658,18 +641,6 @@ EGLBoolean egl_window_surface_v2_t::bindDrawSurface(ogles_context_t* gl) if (depth.data != gl->rasterizer.state.buffers.depth.data) gl->rasterizer.procs.depthBuffer(gl, &depth); -#ifdef LIBAGL_USE_GRALLOC_COPYBITS - gl->copybits.drawSurfaceBuffer = 0; - if (gl->copybits.blitEngine != NULL) { - if (supportedCopybitsDestinationFormat(buffer.format)) { - buffer_handle_t handle = this->buffer->handle; - if (handle != NULL) { - gl->copybits.drawSurfaceBuffer = this->buffer; - } - } - } -#endif // LIBAGL_USE_GRALLOC_COPYBITS - return EGL_TRUE; } EGLBoolean egl_window_surface_v2_t::bindReadSurface(ogles_context_t* gl) |