diff options
Diffstat (limited to 'opengl/libagl/texture.cpp')
| -rw-r--r-- | opengl/libagl/texture.cpp | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index 9407bd5..eb96895 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -26,10 +26,6 @@ #include <private/ui/android_natives_priv.h> #include <ETC1/etc1.h> -#ifdef LIBAGL_USE_GRALLOC_COPYBITS -#include "copybit.h" -#endif // LIBAGL_USE_GRALLOC_COPYBITS - namespace android { // ---------------------------------------------------------------------------- @@ -763,17 +759,10 @@ static void drawTexxOESImp(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h static void drawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h, ogles_context_t* c) { -#ifdef LIBAGL_USE_GRALLOC_COPYBITS - if (drawTexiOESWithCopybit(gglFixedToIntRound(x), - gglFixedToIntRound(y), gglFixedToIntRound(z), - gglFixedToIntRound(w), gglFixedToIntRound(h), c)) { - return; - } -#else // quickly reject empty rects if ((w|h) <= 0) return; -#endif + drawTexxOESImp(x, y, z, w, h, c); } @@ -785,11 +774,6 @@ static void drawTexiOES(GLint x, GLint y, GLint z, GLint w, GLint h, ogles_conte // which is a lot faster. if (ggl_likely(c->rasterizer.state.enabled_tmu == 1)) { -#ifdef LIBAGL_USE_GRALLOC_COPYBITS - if (drawTexiOESWithCopybit(x, y, z, w, h, c)) { - return; - } -#endif const int tmu = 0; texture_unit_t& u(c->textures.tmu[tmu]); EGLTextureObject* textureObject = u.texture; @@ -797,9 +781,7 @@ static void drawTexiOES(GLint x, GLint y, GLint z, GLint w, GLint h, ogles_conte const GLint Hcr = textureObject->crop_rect[3]; if ((w == Wcr) && (h == -Hcr)) { -#ifndef LIBAGL_USE_GRALLOC_COPYBITS if ((w|h) <= 0) return; // quickly reject empty rects -#endif if (u.dirty) { c->rasterizer.procs.activeTexture(c, tmu); @@ -1515,7 +1497,7 @@ void glReadPixels( ogles_error(c, GL_INVALID_VALUE); return; } - if (x<0 || x<0) { + if (x<0 || y<0) { ogles_error(c, GL_INVALID_VALUE); return; } @@ -1646,13 +1628,6 @@ void glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image) // bind it to the texture unit sp<EGLTextureObject> tex = getAndBindActiveTextureObject(c); tex->setImage(native_buffer); - -#ifdef LIBAGL_USE_GRALLOC_COPYBITS - tex->try_copybit = false; - if (c->copybits.blitEngine != NULL) { - tex->try_copybit = true; - } -#endif // LIBAGL_USE_GRALLOC_COPYBITS } void glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) |