merge in jb-release history after reset to jb-dev
diff --git a/build/tablet-7in-hdpi-1024-dalvik-heap.mk b/build/tablet-7in-hdpi-1024-dalvik-heap.mk
new file mode 100644
index 0000000..115f177
--- /dev/null
+++ b/build/tablet-7in-hdpi-1024-dalvik-heap.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Provides overrides to configure the Dalvik heap for a standard tablet device.
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ dalvik.vm.heapstartsize=8m \
+ dalvik.vm.heapgrowthlimit=64m \
+ dalvik.vm.heapsize=512m
+
\ No newline at end of file
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index f4779e7..25e80d7 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -960,7 +960,6 @@
glDisable(GL_TEXTURE_EXTERNAL_OES);
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
- glDisable(GL_SCISSOR_TEST);
static int toggle = 0;
toggle = 1 - toggle;
@@ -1819,7 +1818,6 @@
// redraw the screen entirely...
glDisable(GL_TEXTURE_EXTERNAL_OES);
glDisable(GL_TEXTURE_2D);
- glDisable(GL_SCISSOR_TEST);
glClearColor(0,0,0,1);
glClear(GL_COLOR_BUFFER_BIT);
glMatrixMode(GL_MODELVIEW);
@@ -1835,7 +1833,6 @@
// back to main framebuffer
glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
- glDisable(GL_SCISSOR_TEST);
glDeleteFramebuffersOES(1, &name);
*textureName = tname;
@@ -2048,7 +2045,6 @@
glDeleteTextures(1, &tname);
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
- glDisable(GL_SCISSOR_TEST);
return NO_ERROR;
}
@@ -2200,7 +2196,6 @@
glDeleteTextures(1, &tname);
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
- glDisable(GL_SCISSOR_TEST);
return NO_ERROR;
}
@@ -2228,7 +2223,6 @@
// always clear the whole screen at the end of the animation
glClearColor(0,0,0,1);
- glDisable(GL_SCISSOR_TEST);
glClear(GL_COLOR_BUFFER_BIT);
hw.flip( Region(hw.bounds()) );
@@ -2366,7 +2360,6 @@
// invert everything, b/c glReadPixel() below will invert the FB
glViewport(0, 0, sw, sh);
- glScissor(0, 0, sw, sh);
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
@@ -2390,10 +2383,6 @@
}
}
- // XXX: this is needed on tegra
- glEnable(GL_SCISSOR_TEST);
- glScissor(0, 0, sw, sh);
-
// check for errors and return screen capture
if (glGetError() != GL_NO_ERROR) {
// error while rendering
@@ -2419,7 +2408,6 @@
result = NO_MEMORY;
}
}
- glDisable(GL_SCISSOR_TEST);
glViewport(0, 0, hw_w, hw_h);
glMatrixMode(GL_PROJECTION);
glPopMatrix();