commit 0534ab8ce9ec3ce8dbeb59e3f1bc28603a03b25a
author Dianne Hackborn <hackbod@android.com> Tue May 11 12:07:32 2010 -0700
committer Android Code Review <code-review@android.com> Tue May 11 12:07:32 2010 -0700
tree a0475ae9547094b61667e82e974670748b6a5603
parent 4840145dddb179ed4d67600986ca9f7010d65504
parent 3658de5fdd3d2f71dc4b6c298261472348bb3ce0

Merge "Corrected repeat count for key repeat in input device."

opengl/libagl/Android.mk

diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk
index 9837845..518be8b 100644
--- a/opengl/libagl/Android.mk
+++ b/opengl/libagl/Android.mk
@@ -37,6 +37,10 @@
 	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>
     LOCAL_C_INCLUDES += bionic/libc/private

opengl/libagl/texture.cpp

diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp
index 13d078e..89a19b6 100644
--- a/opengl/libagl/texture.cpp
+++ b/opengl/libagl/texture.cpp
@@ -1467,7 +1467,7 @@
         ogles_error(c, GL_INVALID_VALUE);
         return;
     }
-    if (x<0 || x<0) {
+    if (x<0 || y<0) {
         ogles_error(c, GL_INVALID_VALUE);
         return;
     }