summaryrefslogtreecommitdiff
path: root/libs/rs/rsSimpleMesh.h
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2010-02-12 11:27:01 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-02-12 11:27:01 -0800
commit79b646ffe51c532f00b69dc4967ee51ca28986cf (patch)
tree64dc779a8ee4d21f322499bbefa11e5972741be3 /libs/rs/rsSimpleMesh.h
parent1e90ab542d675616e9370ab7e5add99d7af12587 (diff)
parent0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8 (diff)
am 0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Merge commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8' into eclair-plus-aosp * commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8': DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Diffstat (limited to 'libs/rs/rsSimpleMesh.h')
-rw-r--r--libs/rs/rsSimpleMesh.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/rs/rsSimpleMesh.h b/libs/rs/rsSimpleMesh.h
index 1e5c908a0c50..6defbdaadea2 100644
--- a/libs/rs/rsSimpleMesh.h
+++ b/libs/rs/rsSimpleMesh.h
@@ -45,9 +45,9 @@ public:
uint32_t mGLPrimitive;
- void render() const;
- void renderRange(uint32_t start, uint32_t len) const;
- void uploadAll();
+ void render(Context *) const;
+ void renderRange(Context *, uint32_t start, uint32_t len) const;
+ void uploadAll(Context *);
protected: