diff options
| author | Lingfeng Yang <lfy@google.com> | 2017-07-05 20:59:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-07-05 20:59:32 +0000 |
| commit | 810e655643cc1abec990416e8d3168f1c52baedf (patch) | |
| tree | cf097ab18e64ef4e302e18ea2fd0a9f7fb857965 | |
| parent | 84d6e065fec95d7162503aa8cce5f1f7b34a15f3 (diff) | |
| parent | 9059d4ec21c146733cc9a945e513d574ff62383a (diff) | |
| download | qemu-emu-2.3-release.tar.gz | |
Merge "Assume GL_OES_texture_npot" into emu-2.3-releaseemu-2.3-release
| -rw-r--r-- | android/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/android/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp b/android/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp index 4f8588c5b6..57c4bc4653 100644 --- a/android/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp +++ b/android/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp @@ -1152,19 +1152,7 @@ GL_APICALL void GL_APIENTRY glGenBuffers(GLsizei n, GLuint* buffers){ GL_APICALL void GL_APIENTRY glGenerateMipmap(GLenum target){ GET_CTX_V2(); SET_ERROR_IF(!GLESv2Validate::textureTarget(ctx, target), GL_INVALID_ENUM); - if (ctx->shareGroup().get()) { - TextureData *texData = getTextureTargetData(target); - if (texData) { - unsigned int width = texData->width; - unsigned int height = texData->height; - if (ctx->getMajorVersion() < 3) { - // set error code if either the width or height is not a power of two. - SET_ERROR_IF(width == 0 || height == 0 || - (width & (width - 1)) != 0 || (height & (height - 1)) != 0, - GL_INVALID_OPERATION); - } - } - } + // Assuming we advertised GL_OES_texture_npot ctx->dispatcher().glGenerateMipmapEXT(target); } |