Merge change 24048 into eclair
* changes:
fix [2098939] Smooth gradients show banding on Sholes
diff --git a/docs/html/sdk/1.6_r1/index.jd b/docs/html/sdk/1.6_r1/index.jd
index 11d369b..419649e 100644
--- a/docs/html/sdk/1.6_r1/index.jd
+++ b/docs/html/sdk/1.6_r1/index.jd
@@ -5,21 +5,21 @@
sdk.date=September 2009
sdk.win_download=android-sdk-windows-1.6_r1.zip
-sdk.win_bytes=
-sdk.win_checksum=
+sdk.win_bytes=251325064
+sdk.win_checksum=efd6fccd5a6ff6b57585b49393d221d9
sdk.mac_download=android-sdk-mac_x86-1.6_r1.zip
-sdk.mac_bytes=
-sdk.mac_checksum=
+sdk.mac_bytes=238229779
+sdk.mac_checksum=2be1a1ae5d33272be841c97e8a3a3b1c
sdk.linux_download=android-sdk-linux_x86-1.6_r1.tgz
-sdk.linux_bytes=
-sdk.linux_checksum=
+sdk.linux_bytes=229032773
+sdk.linux_checksum=02ff0d0e38d4f464108a5a7f7567b207
adt.zip_download=ADT-0.9.3.zip
adt.zip_version=0.9.3
-adt.zip_bytes=
-adt.zip_checksum=
+adt.zip_bytes=3252487
+adt.zip_checksum=c296488ac35772667c0f49e822156979
@jd:body
diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp
index 0adce75..6cf64a4 100644
--- a/libs/rs/rsProgramFragment.cpp
+++ b/libs/rs/rsProgramFragment.cpp
@@ -56,6 +56,11 @@
glEnable(GL_TEXTURE_2D);
if (rsc->checkVersion1_1()) {
+ if (mPointSpriteEnable) {
+ glEnable(GL_POINT_SPRITE_OES);
+ } else {
+ glDisable(GL_POINT_SPRITE_OES);
+ }
glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, mPointSpriteEnable);
}
glBindTexture(GL_TEXTURE_2D, mTextures[ct]->getTextureID());
diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp
index 5b19f17..d10076b 100644
--- a/libs/rs/rsScriptC_Lib.cpp
+++ b/libs/rs/rsScriptC_Lib.cpp
@@ -800,6 +800,12 @@
glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, s);
}
+static void SC_pointAttenuation(float a, float b, float c)
+{
+ GLfloat params[] = { a, b, c };
+ glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, params);
+}
+
static void SC_hsbToRgb(float h, float s, float b, float* rgb)
{
float red = 0.0f;
@@ -1185,6 +1191,8 @@
"void", "(float, float, float, float)" },
{ "shininess", (void *)&SC_shininess,
"void", "(float)" },
+ { "pointAttenuation", (void *)&SC_pointAttenuation,
+ "void", "(float, float, float)" },
{ "uploadToTexture", (void *)&SC_uploadToTexture,
"void", "(int, int)" },