diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-12 12:13:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 12:13:18 -0700 |
| commit | e4582835f0732a24dd14324e895d373d598d7fe0 (patch) | |
| tree | 12283462dbf86ce6f21d9a4d5e7757639be0e371 /opengl | |
| parent | 8d5b2c4f2f0184c432b9879eb0af6c32381d4c08 (diff) | |
| parent | c77a20a9d6ab56e79276215d8d1492a9893c9b59 (diff) | |
| download | frameworks_native-e4582835f0732a24dd14324e895d373d598d7fe0.zip frameworks_native-e4582835f0732a24dd14324e895d373d598d7fe0.tar.gz frameworks_native-e4582835f0732a24dd14324e895d373d598d7fe0.tar.bz2 | |
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.
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/Android.mk | 4 | ||||
| -rw-r--r-- | opengl/libagl/texture.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 6cb146c..8abd649 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -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 diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index 9407bd5..d67612e 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -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; } |