diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-01-12 18:14:28 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-01-12 18:14:28 +0000 |
| commit | 8195f674278e8d785bf57489847b1d05d3c2f7d5 (patch) | |
| tree | a1dedada5e2f0c83b9bcdf206e751d14ac67b712 /gpu/src/GrGpu.cpp | |
| parent | ac20fb9955e9323f6d4e87013a41355abf9e0893 (diff) | |
rename DrawState to DrState -- MS decided to #define DrawState, complicating
our (compiler) lives :(
git-svn-id: http://skia.googlecode.com/svn/trunk@689 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrGpu.cpp')
| -rw-r--r-- | gpu/src/GrGpu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/src/GrGpu.cpp b/gpu/src/GrGpu.cpp index c6340bdc0b..f9ee217426 100644 --- a/gpu/src/GrGpu.cpp +++ b/gpu/src/GrGpu.cpp @@ -112,7 +112,7 @@ bool GrGpu::canDisableBlend() const { static const int MAX_QUADS = 512; // max possible: (1 << 14) - 1; -GR_STATIC_ASSERT(4 * MAX_QUADS <= UINT16_MAX); +GR_STATIC_ASSERT(4 * MAX_QUADS <= 65535); static inline void fillIndices(uint16_t* indices, int quadCount) { for (int i = 0; i < quadCount; ++i) { |