ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
98 lines
2.8 KiB
C
98 lines
2.8 KiB
C
|
|
/*
|
|
* Copyright 2010 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
|
|
|
|
#ifndef GrGpuVertex_DEFINED
|
|
#define GrGpuVertex_DEFINED
|
|
|
|
#include "GrGLConfig.h"
|
|
#include "GrPoint.h"
|
|
|
|
#if GR_TEXT_SCALAR_IS_USHORT
|
|
typedef uint16_t GrTextScalar;
|
|
#define GrIntToTextScalar(x) ((uint16_t)x)
|
|
#define GrFixedToTextScalar(x) (x)
|
|
#elif GR_TEXT_SCALAR_IS_FIXED
|
|
typedef GrFixed GrTextScalar;
|
|
#define GrIntToTextScalar(x) GrIntToFixed(x)
|
|
#define GrFixedToTextScalar(x) (x)
|
|
#elif GR_TEXT_SCALAR_IS_FLOAT
|
|
typedef float GrTextScalar;
|
|
#define GrIntToTextScalar(x) ((GrTextScalar)x)
|
|
#define GrFixedToTextScalar(x) GrFixedToFloat(x)
|
|
#else
|
|
#error "Text scalar type not defined"
|
|
#endif
|
|
|
|
// text has its own vertex class, since it may want to be in fixed point (given)
|
|
// that it starts with all integers) even when the default vertices are floats
|
|
struct GrGpuTextVertex {
|
|
GrTextScalar fX;
|
|
GrTextScalar fY;
|
|
|
|
void set(GrTextScalar x, GrTextScalar y) {
|
|
fX = x;
|
|
fY = y;
|
|
}
|
|
|
|
void setI(int x, int y) {
|
|
fX = GrIntToTextScalar(x);
|
|
fY = GrIntToTextScalar(y);
|
|
}
|
|
|
|
void setX(GrFixed x, GrFixed y) {
|
|
fX = GrFixedToTextScalar(x);
|
|
fY = GrFixedToTextScalar(y);
|
|
}
|
|
|
|
// rect fan is counter-clockwise
|
|
|
|
void setRectFan(GrTextScalar l, GrTextScalar t, GrTextScalar r,
|
|
GrTextScalar b) {
|
|
GrGpuTextVertex* v = this;
|
|
v[0].set(l, t);
|
|
v[1].set(l, b);
|
|
v[2].set(r, b);
|
|
v[3].set(r, t);
|
|
}
|
|
|
|
void setIRectFan(int l, int t, int r, int b) {
|
|
this->setRectFan(GrIntToTextScalar(l), GrIntToTextScalar(t),
|
|
GrIntToTextScalar(r), GrIntToTextScalar(b));
|
|
}
|
|
|
|
void setIRectFan(int l, int t, int r, int b, size_t stride) {
|
|
GrAssert(stride > sizeof(GrGpuTextVertex));
|
|
char* v = (char*)this;
|
|
((GrGpuTextVertex*)(v + 0*stride))->setI(l, t);
|
|
((GrGpuTextVertex*)(v + 1*stride))->setI(l, b);
|
|
((GrGpuTextVertex*)(v + 2*stride))->setI(r, b);
|
|
((GrGpuTextVertex*)(v + 3*stride))->setI(r, t);
|
|
}
|
|
|
|
// counter-clockwise fan
|
|
void setXRectFan(GrFixed l, GrFixed t, GrFixed r, GrFixed b) {
|
|
this->setRectFan(GrFixedToTextScalar(l), GrFixedToTextScalar(t),
|
|
GrFixedToTextScalar(r), GrFixedToTextScalar(b));
|
|
}
|
|
|
|
void setXRectFan(GrFixed l, GrFixed t, GrFixed r, GrFixed b, size_t stride) {
|
|
GrAssert(stride > sizeof(GrGpuTextVertex));
|
|
char* v = (char*)this;
|
|
((GrGpuTextVertex*)(v + 0*stride))->setX(l, t);
|
|
((GrGpuTextVertex*)(v + 1*stride))->setX(l, b);
|
|
((GrGpuTextVertex*)(v + 2*stride))->setX(r, b);
|
|
((GrGpuTextVertex*)(v + 3*stride))->setX(r, t);
|
|
}
|
|
|
|
};
|
|
|
|
#endif
|
|
|