AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix warnings, including using GrTCast<> to go from &Obj -> uint32_t*

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@732 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2011-01-26 01:44:18 +00:00
parent 3636ed558f
commit 386900790b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gm/shadertext.cpp
View File

@ -12,7 +12,7 @@ static void makebm(SkBitmap* bm, SkBitmap::Config config, int w, int h) {
SkCanvas canvas(*bm);
SkScalar s = w < h ? w : h;
SkPoint pts[] = { 0, 0, s, s };
SkPoint pts[] = { { 0, 0 }, { s, s } };
SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
SkScalar pos[] = { 0, SK_Scalar1/2, SK_Scalar1 };
SkPaint paint;

10
gpu/src/GrGpuGLShaders2.cpp
View File

@ -245,7 +245,7 @@ GrGpuGLShaders2::ProgramCache::HashKey::HashKey(const ProgramDesc& desc) {
// if you change the size of the desc, need to update the hash function
GR_STATIC_ASSERT(12 == sizeof(ProgramDesc));
uint32_t* d = (uint32_t*) &fDesc;
uint32_t* d = GrTCast<uint32_t*>(&fDesc);
fHash = d[0] ^ ror(d[1]) ^ rol(d[2]);
}
@ -298,25 +298,25 @@ static inline void tex_attr_name(int coordIdx, GrStringBuilder* s) {
static inline const char* float_vector_type(int count) {
static const char* FLOAT_VECS[] = {"ERROR", "float", "vec2", "vec3", "vec4"};
GrAssert(count >= 1 && count < GR_ARRAY_COUNT(FLOAT_VECS));
GrAssert(count >= 1 && count < (int)GR_ARRAY_COUNT(FLOAT_VECS));
return FLOAT_VECS[count];
}
static inline const char* vector_homog_coord(int count) {
static const char* HOMOGS[] = {"ERROR", "", ".y", ".z", ".w"};
GrAssert(count >= 1 && count < GR_ARRAY_COUNT(HOMOGS));
GrAssert(count >= 1 && count < (int)GR_ARRAY_COUNT(HOMOGS));
return HOMOGS[count];
}
static inline const char* vector_nonhomog_coords(int count) {
static const char* NONHOMOGS[] = {"ERROR", "", ".x", ".xy", ".xyz"};
GrAssert(count >= 1 && count < GR_ARRAY_COUNT(NONHOMOGS));
GrAssert(count >= 1 && count < (int)GR_ARRAY_COUNT(NONHOMOGS));
return NONHOMOGS[count];
}
static inline const char* vector_all_coords(int count) {
static const char* ALL[] = {"ERROR", "", ".xy", ".xyz", ".xyzw"};
GrAssert(count >= 1 && count < GR_ARRAY_COUNT(ALL));
GrAssert(count >= 1 && count < (int)GR_ARRAY_COUNT(ALL));
return ALL[count];
}