diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-18 01:40:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 01:40:52 +0000 |
commit | 0b4202bebe6d38322bd6ed35e73b256cbc3df0cb (patch) | |
tree | 7085e840cf6a8d34b14bf64ab8f946ba75b5e01d | |
parent | 5cf4e53a1d7329506105ce3232590f1598abbece (diff) | |
parent | dcccfbae1537fb21a281861672f510184a6f9e14 (diff) | |
download | device_generic_goldfish-opengl-android11-gsi.tar.gz device_generic_goldfish-opengl-android11-gsi.tar.bz2 device_generic_goldfish-opengl-android11-gsi.zip |
Snap for 6601700 from a260d5b0d4f0c90230e0450ad0c45e15eda5d0a7 to rvc-release am: dcccfbae15android11-gsi
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/11903221
Change-Id: I79f8c4e3f0dd0d555233252eaf3b6d9236ee6753
-rwxr-xr-x | system/GLESv2_enc/GL2Encoder.cpp | 17 | ||||
-rw-r--r-- | system/GLESv2_enc/GL2Encoder.h | 8 |
2 files changed, 25 insertions, 0 deletions
diff --git a/system/GLESv2_enc/GL2Encoder.cpp b/system/GLESv2_enc/GL2Encoder.cpp index 1f0b7a01..bafd1b6a 100755 --- a/system/GLESv2_enc/GL2Encoder.cpp +++ b/system/GLESv2_enc/GL2Encoder.cpp @@ -372,6 +372,9 @@ GL2Encoder::GL2Encoder(IOStream *stream, ChecksumCalculator *protocol) OVERRIDE_CUSTOM(glReadnPixelsEXT); OVERRIDE_CUSTOM(glGetnUniformfvEXT); OVERRIDE_CUSTOM(glGetnUniformivEXT); + + OVERRIDE(glInvalidateFramebuffer); + OVERRIDE(glInvalidateSubFramebuffer); } GL2Encoder::~GL2Encoder() @@ -5441,3 +5444,17 @@ void GL2Encoder::s_glGetnUniformivEXT(void *self, GLuint program, GLint location location)), GL_INVALID_OPERATION); s_glGetUniformiv(self, program, location, params); } + +void GL2Encoder::s_glInvalidateFramebuffer(void* self, GLenum target, GLsizei numAttachments, const GLenum *attachments) { + GL2Encoder *ctx = (GL2Encoder*)self; + SET_ERROR_IF(numAttachments < 0, GL_INVALID_VALUE); + ctx->m_glInvalidateFramebuffer_enc(ctx, target, numAttachments, attachments); +} + +void GL2Encoder::s_glInvalidateSubFramebuffer(void* self, GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height) { + GL2Encoder *ctx = (GL2Encoder*)self; + SET_ERROR_IF(numAttachments < 0, GL_INVALID_VALUE); + SET_ERROR_IF(width < 0, GL_INVALID_VALUE); + SET_ERROR_IF(height < 0, GL_INVALID_VALUE); + ctx->m_glInvalidateSubFramebuffer_enc(ctx, target, numAttachments, attachments, x, y, width, height); +} diff --git a/system/GLESv2_enc/GL2Encoder.h b/system/GLESv2_enc/GL2Encoder.h index b85bc0da..0ceb9deb 100644 --- a/system/GLESv2_enc/GL2Encoder.h +++ b/system/GLESv2_enc/GL2Encoder.h @@ -761,6 +761,14 @@ private: GLsizei bufSize, GLfloat* params); static void s_glGetnUniformivEXT(void *self, GLuint program, GLint location, GLsizei bufSize, GLint* params); + + // Invalidate framebuffer + static void s_glInvalidateFramebuffer(void* self, GLenum target, GLsizei numAttachments, const GLenum *attachments); + static void s_glInvalidateSubFramebuffer(void* self, GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height); + + glInvalidateFramebuffer_client_proc_t m_glInvalidateFramebuffer_enc; + glInvalidateSubFramebuffer_client_proc_t m_glInvalidateSubFramebuffer_enc;; + public: glEGLImageTargetTexture2DOES_client_proc_t m_glEGLImageTargetTexture2DOES_enc; |