Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1b97129 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 0815235f: am a019df87: Merge "Fix Android\'s... 

am 0815235f: am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo

Merge commit '0815235ffceb9e079185c1a3c78e2793157523f9' into kraken

* commit '0815235ffceb9e079185c1a3c78e2793157523f9':
  Fix Android's glEGLImageTargetRenderbufferOES() wrapper
parents de851829 70ffeb98

opengl/libs/GLES2/gl2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -114,6 +114,6 @@ void glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) 
{

    GLeglImageOES implImage = 

        (GLeglImageOES)egl_get_image_for_current_context((EGLImageKHR)image);

    __glEGLImageTargetRenderbufferStorageOES(target, image);

    __glEGLImageTargetRenderbufferStorageOES(target, implImage);

}

opengl/libs/GLES_CM/gl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -185,6 +185,6 @@ void glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) 
{

    GLeglImageOES implImage = 

        (GLeglImageOES)egl_get_image_for_current_context((EGLImageKHR)image);

    __glEGLImageTargetRenderbufferStorageOES(target, image);

    __glEGLImageTargetRenderbufferStorageOES(target, implImage);

}