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

Commit e4582835 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am fb234bbe: merge from open-source master 

Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken

* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
  Notify user regarding invalid number during MO call.
  Build software AGL library with correct get_tls() macro for ARMv7 based platforms
  Fix glReadPixels() to verify that both x and y are non-negative.
parents 8d5b2c4f c77a20a9

opengl/libagl/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ ifeq ($(TARGET_ARCH),arm) 
	LOCAL_CFLAGS += -fstrict-aliasing

endif



ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

    LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif



ifneq ($(TARGET_SIMULATOR),true)

    # we need to access the private Bionic header <bionic_tls.h>

    # on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER

opengl/libagl/texture.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1515,7 +1515,7 @@ void glReadPixels( 
        ogles_error(c, GL_INVALID_VALUE);

        return;

    }

    if (x<0 || x<0) {

    if (x<0 || y<0) {

        ogles_error(c, GL_INVALID_VALUE);

        return;

    }