Increase number of stages from 1 to 2
Move GrTextContext from stage 0 to stage 1 so it doesn't conflict with GrPaint (allow textured text)
Switch to dynamically generated shaders
git-svn-id: http://skia.googlecode.com/svn/trunk@721 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/include/GrDrawTarget.h b/gpu/include/GrDrawTarget.h
index ec84cda..862559e 100644
--- a/gpu/include/GrDrawTarget.h
+++ b/gpu/include/GrDrawTarget.h
@@ -50,7 +50,7 @@
// Currently there is just one stage but this will be changed soon.
enum {
- kNumStages = 1,
+ kNumStages = 2,
kMaxTexCoords = kNumStages
};
diff --git a/gpu/include/GrTextContext.h b/gpu/include/GrTextContext.h
index d813c09..727358e 100644
--- a/gpu/include/GrTextContext.h
+++ b/gpu/include/GrTextContext.h
@@ -38,7 +38,8 @@
void flush(); // optional; automatically called by destructor
private:
- const GrPaint& fPaint;
+ GrPaint fPaint;
+ GrVertexLayout fVertexLayout;
GrContext* fContext;
GrDrawTarget* fDrawTarget;