提交: ff41eed2db72b18e5ef8972379228f3bdcf34fca - packages-wallpapers-Basic (git)

packages/wallpapers/Basic

Commit MetaInfo

• 修訂: ff41eed2db72b18e5ef8972379228f3bdcf34fca (tree)
• 時間: 2009-08-25 05:55:57
• 作者: Romain Guy <romainguy@andr...>
• Commiter: Romain Guy

Log Message

Fix GC issues with native objects.

Change-Id: I670457555e60927f16ae383bebc6840c5d850db1

Change Summary

• modified: src/com/android/wallpaper/galaxy/GalaxyRS.java
• modified: src/com/android/wallpaper/grass/GrassRS.java

差異

--- a/src/com/android/wallpaper/galaxy/GalaxyRS.java
+++ b/src/com/android/wallpaper/galaxy/GalaxyRS.java
@@ -87,6 +87,12 @@ class GalaxyRS {
     private ProgramStore mPfsLights;
     @SuppressWarnings({"FieldCanBeLocal"})
     private ProgramVertex mPvBackground;
+    @SuppressWarnings({"FieldCanBeLocal"})
+    private Sampler mSampler;
+    @SuppressWarnings({"FieldCanBeLocal"})
+    private Sampler mLightSampler;
+    @SuppressWarnings({"FieldCanBeLocal"})
+    private ProgramVertex.MatrixAllocation mPvOrthoAlloc;
 
     @SuppressWarnings({"FieldCanBeLocal"})
     private Allocation[] mTextures;
@@ -272,8 +278,7 @@ class GalaxyRS {
 
         final int count = textures.length;
         for (int i = 0; i < count; i++) {
-            final Allocation texture = textures[i];
-            texture.uploadToTexture(0);
+            textures[i].uploadToTexture(0);
         }
     }
 
@@ -297,28 +302,28 @@ class GalaxyRS {
         sampleBuilder.setMag(LINEAR);
         sampleBuilder.setWrapS(WRAP);
         sampleBuilder.setWrapT(WRAP);
-        Sampler sampler = sampleBuilder.create();
+        mSampler = sampleBuilder.create();
 
         ProgramFragment.Builder builder = new ProgramFragment.Builder(mRS, null, null);
         builder.setTexEnable(true, 0);
         builder.setTexEnvMode(REPLACE, 0);
         mPfBackground = builder.create();
         mPfBackground.setName("PFBackground");
-        mPfBackground.bindSampler(sampler, 0);
+        mPfBackground.bindSampler(mSampler, 0);
 
         sampleBuilder = new Sampler.Builder(mRS);
         sampleBuilder.setMin(NEAREST);
         sampleBuilder.setMag(NEAREST);
         sampleBuilder.setWrapS(WRAP);
         sampleBuilder.setWrapT(WRAP);
-        Sampler lightSampler = sampleBuilder.create();
+        mLightSampler = sampleBuilder.create();
 
         builder = new ProgramFragment.Builder(mRS, null, null);
         builder.setTexEnable(true, 0);
         builder.setTexEnvMode(MODULATE, 0);
         mPfLighting = builder.create();
         mPfLighting.setName("PFLighting");
-        mPfLighting.bindSampler(lightSampler, 0);
+        mPfLighting.bindSampler(mLightSampler, 0);
     }
 
     private void createProgramFragmentStore() {
@@ -338,13 +343,13 @@ class GalaxyRS {
     }
 
     private void createProgramVertex() {
-        ProgramVertex.MatrixAllocation pvOrthoAlloc = new ProgramVertex.MatrixAllocation(mRS);
+        mPvOrthoAlloc = new ProgramVertex.MatrixAllocation(mRS);
         //mPvOrthoAlloc.setupProjectionNormalized(mWidth, mHeight);
-        pvOrthoAlloc.setupOrthoWindow(mWidth, mHeight);        
+        mPvOrthoAlloc.setupOrthoWindow(mWidth, mHeight);        
 
         ProgramVertex.Builder builder = new ProgramVertex.Builder(mRS, null, null);
         mPvBackground = builder.create();
-        mPvBackground.bindAllocation(pvOrthoAlloc);
+        mPvBackground.bindAllocation(mPvOrthoAlloc);
         mPvBackground.setName("PVBackground");
     }
 }
\ No newline at end of file

--- a/src/com/android/wallpaper/grass/GrassRS.java
+++ b/src/com/android/wallpaper/grass/GrassRS.java
@@ -80,6 +80,10 @@ class GrassRS {
     private ProgramStore mPfsBackground;
     @SuppressWarnings({ "FieldCanBeLocal" })
     private ProgramVertex mPvBackground;
+    @SuppressWarnings({"FieldCanBeLocal"})
+    private Sampler mSampler;
+    @SuppressWarnings({"FieldCanBeLocal"})
+    private ProgramVertex.MatrixAllocation mPvOrthoAlloc;
 
     @SuppressWarnings({ "FieldCanBeLocal" })
     private Allocation[] mTextures;
@@ -89,10 +93,11 @@ class GrassRS {
 
     private Allocation mBlades;
     private Allocation mBladesBuffer;
+    @SuppressWarnings({"FieldCanBeLocal"})
+    private SimpleMesh mBladesMesh;
 
     private int mTriangles;
     private final float[] mFloatData5 = new float[5];
-    private SimpleMesh mBladesMesh;
 
     public GrassRS(int width, int height) {
         mWidth = width;
@@ -288,14 +293,14 @@ class GrassRS {
         samplerBuilder.setMag(LINEAR);
         samplerBuilder.setWrapS(WRAP);
         samplerBuilder.setWrapT(WRAP);
-        Sampler sampler = samplerBuilder.create();
+        mSampler = samplerBuilder.create();
 
         ProgramFragment.Builder builder = new ProgramFragment.Builder(mRS, null, null);
         builder.setTexEnable(true, 0);
         builder.setTexEnvMode(REPLACE, 0);
         mPfBackground = builder.create();
         mPfBackground.setName("PFBackground");
-        mPfBackground.bindSampler(sampler, 0);
+        mPfBackground.bindSampler(mSampler, 0);
     }
 
     private void createProgramFragmentStore() {
@@ -309,13 +314,13 @@ class GrassRS {
     }
 
     private void createProgramVertex() {
-        ProgramVertex.MatrixAllocation pvOrthoAlloc = new ProgramVertex.MatrixAllocation(mRS);
-        pvOrthoAlloc.setupOrthoWindow(mWidth, mHeight);
+        mPvOrthoAlloc = new ProgramVertex.MatrixAllocation(mRS);
+        mPvOrthoAlloc.setupOrthoWindow(mWidth, mHeight);
 
         ProgramVertex.Builder pvb = new ProgramVertex.Builder(mRS, null, null);
         pvb.setTextureMatrixEnable(true);
         mPvBackground = pvb.create();
-        mPvBackground.bindAllocation(pvOrthoAlloc);
+        mPvBackground.bindAllocation(mPvOrthoAlloc);
         mPvBackground.setName("PVBackground");
     }
 }