diff options
| author | 2009-03-18 11:33:14 -0700 | |
|---|---|---|
| committer | 2009-03-18 11:33:14 -0700 | |
| commit | 2a73de7b21a89aa2ba4c254d28658b49793425b2 (patch) | |
| tree | ded5bcd581464b4174d81c373044b6d36eee58d2 /opengl/libagl/state.cpp | |
| parent | 42e48026b21a962e5bf40344d738665ecbd9d74d (diff) | |
| parent | ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 (diff) | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
Diffstat (limited to 'opengl/libagl/state.cpp')
| -rw-r--r-- | opengl/libagl/state.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/opengl/libagl/state.cpp b/opengl/libagl/state.cpp index c2f9f12356ba..5cbabea1f8a8 100644 --- a/opengl/libagl/state.cpp +++ b/opengl/libagl/state.cpp @@ -403,12 +403,6 @@ void glGetIntegerv(GLenum pname, GLint *params) case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES: params[0] = GL_UNSIGNED_SHORT_5_6_5; break; - case GL_MAX_ELEMENTS_INDICES: - params[0] = 65536; - break; - case GL_MAX_ELEMENTS_VERTICES: - params[0] = 0x7FFFFFFF; - break; case GL_MAX_LIGHTS: params[0] = OGLES_MAX_LIGHTS; break; |