Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff966d5f authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I5235cf3f into eclair

* changes:
  Fix but processing raster state pragma. rename stateFragmentStore to stateStore
parents 0368334d 5235cf3f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ class BaseObj {
            mRS = null;
            mID = 0;
            mDestroyed = true;
            Log.v(RenderScript.LOG_TAG,
                  getClass() + " auto finalizing object without having released the RS reference.");
            //Log.v(RenderScript.LOG_TAG, getClass() +
            // " auto finalizing object without having released the RS reference.");
        }
        super.finalize();
    }
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
#pragma stateVertex(orthoWindow)
#pragma stateRaster(flat)
#pragma stateFragment(PgmFragBackground)
#pragma stateFragmentStore(MyBlend)
#pragma stateStore(MyBlend)


int main(void* con, int ft, int launchID) {
+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
#pragma version(1)
#pragma stateVertex(PVBackground)
#pragma stateFragment(PFBackground)
#pragma stateFragmentStore(PSBackground)
#pragma stateStore(PSBackground)

#define STATE_TRIANGLE_OFFSET_COUNT 0
#define STATE_LAST_FOCUS 1
@@ -33,7 +33,7 @@ int main(int index)
    drawSimpleMesh(NAMED_mesh);

    // Start of images.
    bindProgramFragmentStore(NAMED_PSImages);
    bindProgramStore(NAMED_PSImages);
    bindProgramFragment(NAMED_PFImages);
    bindProgramVertex(NAMED_PVImages);

+0 −3
Original line number Diff line number Diff line
// Fountain test script
#pragma version(1)
#pragma stateVertex(default)
#pragma stateFragment(default)
#pragma stateFragmentStore(default)

int newPart = 0;

+3 −3
Original line number Diff line number Diff line
#pragma version(1)
#pragma stateVertex(PV)
#pragma stateFragment(PF)
#pragma stateFragmentStore(PFS)
#pragma stateStore(PFS)

// Scratch buffer layout
#define SCRATCH_FADE 0
@@ -105,7 +105,7 @@ int main(void* con, int ft, int launchID)
    if ((zoom < 1.1f) && (zoom > 0.9f)) {
        bindProgramVertex(NAMED_PVOrtho);
        bindProgramFragment(NAMED_PFText);
        bindProgramFragmentStore(NAMED_PFSText);
        bindProgramStore(NAMED_PFSText);

        rot = drawRot * scale;
        index = 0;
@@ -144,7 +144,7 @@ int main(void* con, int ft, int launchID)

        bindProgramVertex(NAMED_PV);
        bindProgramFragment(NAMED_PF);
        bindProgramFragmentStore(NAMED_PFS);
        bindProgramStore(NAMED_PFS);
    }

    // Draw the selected icon
Loading