Create EGL image targets from client objects.

Bug 24517776

Change-Id: I90c724e8c882c8686391d5cfb7a6e1977edbaf21

diff --git a/system/GLESv1/gl.cpp b/system/GLESv1/gl.cpp
index 1e51e52..77db3fc 100644 (file)
--- a/system/GLESv1/gl.cpp
+++ b/system/GLESv1/gl.cpp
@@ -76,13 +76,12 @@ void glEGLImageTargetTexture2DOES(void * self, GLenum target, GLeglImageOES img)
         rcEnc->rcBindTexture(rcEnc,
                 ((cb_handle_t *)(native_buffer->handle))->hostHandle);
         ctx->restore2DTextureTarget();
-
-        return;
     }
     else if (image->target == EGL_GL_TEXTURE_2D_KHR) {
-        // TODO
-
-        return;
+        GET_CONTEXT;
+        ctx->override2DTextureTarget(target);
+        ctx->m_glEGLImageTargetTexture2DOES_enc(self, target, (GLeglImageOES)image->host_egl_image);
+        ctx->restore2DTextureTarget();
     }
 }
 
@@ -140,6 +139,7 @@ const GLubyte *my_glGetString (void *self, GLenum name)
 void init()
 {
     GET_CONTEXT;
+    ctx->m_glEGLImageTargetTexture2DOES_enc = ctx->glEGLImageTargetTexture2DOES;
     ctx->glEGLImageTargetTexture2DOES = &glEGLImageTargetTexture2DOES;
     ctx->glEGLImageTargetRenderbufferStorageOES = &glEGLImageTargetRenderbufferStorageOES;
     ctx->glGetString = &my_glGetString;

diff --git a/system/GLESv1_enc/GLEncoder.h b/system/GLESv1_enc/GLEncoder.h
index 3c794f2..6db318f 100644 (file)
--- a/system/GLESv1_enc/GLEncoder.h
+++ b/system/GLESv1_enc/GLEncoder.h
@@ -145,5 +145,9 @@ private:
     static void s_glTexParameterx(void* self, GLenum target, GLenum pname, GLfixed param);
     static void s_glTexParameteriv(void* self, GLenum target, GLenum pname, const GLint* params);
     static void s_glTexParameterxv(void* self, GLenum target, GLenum pname, const GLfixed* params);
+
+public:
+    glEGLImageTargetTexture2DOES_client_proc_t m_glEGLImageTargetTexture2DOES_enc;
+
 };
 #endif

diff --git a/system/GLESv2/gl2.cpp b/system/GLESv2/gl2.cpp
index 836c824..29a662b 100644 (file)
--- a/system/GLESv2/gl2.cpp
+++ b/system/GLESv2/gl2.cpp
@@ -76,13 +76,12 @@ void glEGLImageTargetTexture2DOES(void * self, GLenum target, GLeglImageOES img)
         ctx->override2DTextureTarget(target);
         rcEnc->rcBindTexture(rcEnc, ((cb_handle_t *)(native_buffer->handle))->hostHandle);
         ctx->restore2DTextureTarget();
-
-        return;
     }
     else if (image->target == EGL_GL_TEXTURE_2D_KHR) {
-        // TODO
-
-        return;
+        GET_CONTEXT;
+        ctx->override2DTextureTarget(target);
+        ctx->m_glEGLImageTargetTexture2DOES_enc(self, target, (GLeglImageOES)image->host_egl_image);
+        ctx->restore2DTextureTarget();
     }
 }
 
@@ -138,6 +137,7 @@ const GLubyte *my_glGetString (void *self, GLenum name)
 void init()
 {
     GET_CONTEXT;
+    ctx->m_glEGLImageTargetTexture2DOES_enc = ctx->glEGLImageTargetTexture2DOES;
     ctx->glEGLImageTargetTexture2DOES = &glEGLImageTargetTexture2DOES;
     ctx->glEGLImageTargetRenderbufferStorageOES = &glEGLImageTargetRenderbufferStorageOES;
     ctx->glGetString = &my_glGetString;

diff --git a/system/GLESv2_enc/GL2Encoder.h b/system/GLESv2_enc/GL2Encoder.h
index 21e7932..94aca3b 100644 (file)
--- a/system/GLESv2_enc/GL2Encoder.h
+++ b/system/GLESv2_enc/GL2Encoder.h
@@ -235,5 +235,8 @@ private:
             GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type,
             const GLvoid* pixels);
 
+public:
+    glEGLImageTargetTexture2DOES_client_proc_t m_glEGLImageTargetTexture2DOES_enc;
+
 };
 #endif