aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaiyi Li <kaiyili@google.com>2021-05-11 15:51:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-11 15:51:46 +0000
commit532cedb60e3f3f172ddbf5712c722e38101b9572 (patch)
treef773103304d3a35e6d251707a42455b1211fabbd
parentbfc28a2df1fb1aae46e9de8cf9c56d67c40a4082 (diff)
parent93b7f01f83168b14e2abd83407710eb06dc4d627 (diff)
downloadgoldfish-opengl-532cedb60e3f3f172ddbf5712c722e38101b9572.tar.gz
Calling glCheckFramebufferStatus on the guest all the time am: 3d8edd862d am: 93b7f01f83
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1702015 Change-Id: Ic405e6bf8f225f28ed47308cc6c736a3f62631bf
-rwxr-xr-xsystem/GLESv2_enc/GL2Encoder.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/system/GLESv2_enc/GL2Encoder.cpp b/system/GLESv2_enc/GL2Encoder.cpp
index db65fb06..4640e706 100755
--- a/system/GLESv2_enc/GL2Encoder.cpp
+++ b/system/GLESv2_enc/GL2Encoder.cpp
@@ -1463,7 +1463,7 @@ void GL2Encoder::s_glDrawElements(void *self, GLenum mode, GLsizei count, GLenum
if (!has_client_vertex_arrays && !has_indirect_arrays) {
// ALOGW("glDrawElements: no vertex arrays / buffers bound to the command\n");
- GLenum status = ctx->m_glCheckFramebufferStatus_enc(self, GL_FRAMEBUFFER);
+ GLenum status = ctx->glCheckFramebufferStatus(self, GL_FRAMEBUFFER);
SET_ERROR_IF(status != GL_FRAMEBUFFER_COMPLETE, GL_INVALID_FRAMEBUFFER_OPERATION);
}
@@ -1580,7 +1580,7 @@ void GL2Encoder::s_glDrawElementsNullAEMU(void *self, GLenum mode, GLsizei count
if (!has_client_vertex_arrays && !has_indirect_arrays) {
// ALOGW("glDrawElements: no vertex arrays / buffers bound to the command\n");
- GLenum status = ctx->m_glCheckFramebufferStatus_enc(self, GL_FRAMEBUFFER);
+ GLenum status = ctx->glCheckFramebufferStatus(self, GL_FRAMEBUFFER);
SET_ERROR_IF(status != GL_FRAMEBUFFER_COMPLETE, GL_INVALID_FRAMEBUFFER_OPERATION);
}
@@ -4581,7 +4581,7 @@ void GL2Encoder::s_glDrawElementsInstanced(void* self, GLenum mode, GLsizei coun
if (!has_client_vertex_arrays && !has_indirect_arrays) {
// ALOGW("glDrawElements: no vertex arrays / buffers bound to the command\n");
- GLenum status = ctx->m_glCheckFramebufferStatus_enc(self, GL_FRAMEBUFFER);
+ GLenum status = ctx->glCheckFramebufferStatus(self, GL_FRAMEBUFFER);
SET_ERROR_IF(status != GL_FRAMEBUFFER_COMPLETE, GL_INVALID_FRAMEBUFFER_OPERATION);
}
@@ -4674,7 +4674,7 @@ void GL2Encoder::s_glDrawRangeElements(void* self, GLenum mode, GLuint start, GL
if (!has_client_vertex_arrays && !has_indirect_arrays) {
// ALOGW("glDrawElements: no vertex arrays / buffers bound to the command\n");
- GLenum status = ctx->m_glCheckFramebufferStatus_enc(self, GL_FRAMEBUFFER);
+ GLenum status = ctx->glCheckFramebufferStatus(self, GL_FRAMEBUFFER);
SET_ERROR_IF(status != GL_FRAMEBUFFER_COMPLETE, GL_INVALID_FRAMEBUFFER_OPERATION);
}