commit 132473e137c39ee107be9bc10b30f46e5161e299
author David Turner <digit@android.com> Tue May 03 13:44:52 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 03 13:44:52 2011 -0700
tree a02bf7476e589505ee772baf7d0371c7518b635d
parent ea083bd4bf0a731299f402f22dc555788108a723
parent 3c87fcdc42d76391591cfe428499a30da3a517c1

am 3c87fcdc: am cb8efdf0: Merge "emulator opengl: missing constant in glUtilsParamSize"

* commit '3c87fcdc42d76391591cfe428499a30da3a517c1':
  emulator opengl: missing constant in glUtilsParamSize

tools/emulator/opengl/shared/OpenglCodecCommon/glUtils.cpp

diff --git a/tools/emulator/opengl/shared/OpenglCodecCommon/glUtils.cpp b/tools/emulator/opengl/shared/OpenglCodecCommon/glUtils.cpp
index 206b5f5..4623bf8 100644
--- a/tools/emulator/opengl/shared/OpenglCodecCommon/glUtils.cpp
+++ b/tools/emulator/opengl/shared/OpenglCodecCommon/glUtils.cpp
@@ -243,6 +243,7 @@
     case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS:
     case GL_MAX_FRAGMENT_UNIFORM_VECTORS:
     case GL_MAX_RENDERBUFFER_SIZE:
+    case GL_MAX_TEXTURE_IMAGE_UNITS:
         s = 1;
         break;
     case GL_ALIASED_LINE_WIDTH_RANGE: