summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramRaster.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/rsProgramRaster.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/rsProgramRaster.h')
-rw-r--r--libs/rs/rsProgramRaster.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/rs/rsProgramRaster.h b/libs/rs/rsProgramRaster.h
index a6d5ba8e5850..c3a9c9077866 100644
--- a/libs/rs/rsProgramRaster.h
+++ b/libs/rs/rsProgramRaster.h
@@ -29,14 +29,13 @@ class ProgramRaster : public Program
{
public:
ProgramRaster(Context *rsc,
- Element *in,
- Element *out,
bool pointSmooth,
bool lineSmooth,
bool pointSprite);
virtual ~ProgramRaster();
virtual void setupGL(const Context *, ProgramRasterState *);
+ virtual void setupGL2(const Context *, ProgramRasterState *);
void setLineWidth(float w);
void setPointSize(float s);