aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-01-13 20:02:47 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-01-13 20:02:47 +0000
commitd728f6ecfab79c08044a837fbcae2996f7b8619a (patch)
tree5e596d8392e25406635347778bb18d53510a1577
parent8531c1cea2a9cf7702ef314ccd0a6cd1dd33c76c (diff)
Remove static from template specilizations (linux build complained)
git-svn-id: http://skia.googlecode.com/svn/trunk@695 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gpu/src/GrDrawTarget.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/gpu/src/GrDrawTarget.cpp b/gpu/src/GrDrawTarget.cpp
index 7ea9ff2ca7..df0f0be23b 100644
--- a/gpu/src/GrDrawTarget.cpp
+++ b/gpu/src/GrDrawTarget.cpp
@@ -25,8 +25,8 @@ static int stage_mask_recur(int stage) {
return GrDrawTarget::StageTexCoordVertexLayoutBit(stage, N) |
stage_mask_recur<N+1>(stage);
}
-template<>
-static int stage_mask_recur<GrDrawTarget::kNumStages>(int) { return 0; }
+template<> // linux build doesn't like static on specializations
+int stage_mask_recur<GrDrawTarget::kNumStages>(int) { return 0; }
// mask of all tex coord indices for one stage
static int stage_tex_coord_mask(int stage) {
@@ -46,8 +46,8 @@ static int tex_coord_mask_recur(int texCoordIdx) {
return GrDrawTarget::StageTexCoordVertexLayoutBit(N, texCoordIdx) |
tex_coord_mask_recur<N+1>(texCoordIdx);
}
-template<>
-static int tex_coord_mask_recur<GrDrawTarget::kMaxTexCoords>(int) { return 0; }
+template<> // linux build doesn't like static on specializations
+int tex_coord_mask_recur<GrDrawTarget::kMaxTexCoords>(int) { return 0; }
// mask of all bits relevant to one texture coordinate index
static int tex_coord_idx_mask(int texCoordIdx) {