diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-12 11:58:14 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-12 11:58:14 -0700 |
| commit | c77a20a9d6ab56e79276215d8d1492a9893c9b59 (patch) | |
| tree | 0c75cf08ccf4f9a5bf115f461764ad241a0c0988 /opengl | |
| parent | cd406480fa569ced379232d85efc4742c1bcc8c0 (diff) | |
| parent | 96fb6fb6a647004a6a11ba9ec3847047b9b4062b (diff) | |
| download | frameworks_native-c77a20a9d6ab56e79276215d8d1492a9893c9b59.zip frameworks_native-c77a20a9d6ab56e79276215d8d1492a9893c9b59.tar.gz frameworks_native-c77a20a9d6ab56e79276215d8d1492a9893c9b59.tar.bz2 | |
merge from open-source master
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
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; } |