From bede0267a355b66ea42c8a449d0a40dd38cd53e2 Mon Sep 17 00:00:00 2001 From: Lingfeng Yang Date: Thu, 7 Apr 2016 15:23:28 -0700 Subject: Stop aggressive validation in glVertexAttribPointer This breaks Antutu 3D benchmark. Change-Id: I72ef2fe25f841b851bcc947b707019d94c88a8e1 --- opengl/system/GLESv2_enc/GL2Encoder.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/opengl/system/GLESv2_enc/GL2Encoder.cpp b/opengl/system/GLESv2_enc/GL2Encoder.cpp index cb1329f..efd2d42 100755 --- a/opengl/system/GLESv2_enc/GL2Encoder.cpp +++ b/opengl/system/GLESv2_enc/GL2Encoder.cpp @@ -236,15 +236,6 @@ void GL2Encoder::s_glVertexAttribPointer(void *self, GLuint indx, GLint size, GL { GL2Encoder *ctx = (GL2Encoder *)self; assert(ctx->m_state != NULL); - SET_ERROR_IF(!(stride >= 0), GL_INVALID_VALUE); - SET_ERROR_IF(!(size > 0 && size < 5), GL_INVALID_VALUE); - SET_ERROR_IF(!(type == GL_BYTE || type == GL_UNSIGNED_BYTE || - type == GL_SHORT || type == GL_UNSIGNED_SHORT || - type == GL_FIXED || type == GL_FLOAT), GL_INVALID_ENUM); - - GLint maxIndx; - ctx->glGetIntegerv(self, GL_MAX_VERTEX_ATTRIBS, &maxIndx); - SET_ERROR_IF(!(indx < maxIndx), GL_INVALID_VALUE); ctx->m_state->setState(indx, size, type, normalized, stride, ptr); } -- cgit v1.2.3 From d81ee62349fc40c82200803077b7a9550d44fe19 Mon Sep 17 00:00:00 2001 From: bohu Date: Thu, 7 Apr 2016 15:51:14 -0700 Subject: Emulator: Fix camera crash Because the camera runs a thread without giving it a name. bug: 28074344 Change-Id: I85fd0d0786e82305d6615e7f50b7394785e96df7 --- camera/EmulatedCameraDevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/EmulatedCameraDevice.h b/camera/EmulatedCameraDevice.h index ee9f7dd..fff11fa 100755 --- a/camera/EmulatedCameraDevice.h +++ b/camera/EmulatedCameraDevice.h @@ -396,7 +396,7 @@ protected: inline status_t startThread(bool one_burst) { mOneBurst = one_burst; - return run(NULL, ANDROID_PRIORITY_URGENT_DISPLAY, 0); + return run("Camera_startThread", ANDROID_PRIORITY_URGENT_DISPLAY, 0); } /* Overriden base class method. -- cgit v1.2.3