aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-15 07:16:57 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-15 07:16:57 +0000
commit044679ef8c08e1f01afadf5bc08251fe8597df81 (patch)
treeed941ae2857b61f704c3ac10139241a969902a47 /src
parente9b31faf3008c01e04a9f0e178437eb8823c8077 (diff)
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7746 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrDrawState.cpp10
-rw-r--r--src/gpu/GrDrawState.h10
-rw-r--r--src/gpu/GrDrawTarget.h10
-rw-r--r--src/gpu/gl/mac/SkNativeGLContext_mac.cpp12
4 files changed, 21 insertions, 21 deletions
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index 3ff8a97f55..8c74c4a4bd 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -50,10 +50,10 @@ namespace {
/**
* This function generates a mask that we like to have known at compile
- * time. When the number of stages is bumped or the way bits are defined in
- * GrDrawState.h changes this function should be rerun to generate the new mask.
- * (We attempted to force the compiler to generate the mask using recursive
- * templates but always wound up with static initializers under gcc, even if
+ * time. When the number of stages is bumped or the way bits are defined in
+ * GrDrawState.h changes this function should be rerun to generate the new mask.
+ * (We attempted to force the compiler to generate the mask using recursive
+ * templates but always wound up with static initializers under gcc, even if
* they were just a series of immediate->memory moves.)
*
*/
@@ -97,7 +97,7 @@ size_t GrDrawState::VertexSize(GrVertexLayout vertexLayout) {
*
* Order of vertex components:
* Position
- * Tex Coord
+ * Tex Coord
* Color
* Coverage
*/
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index ad31e0d5fc..05492a73ae 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -113,16 +113,16 @@ public:
/**
* The format of vertices is represented as a bitfield of flags.
* Flags that indicate the layout of vertex data. Vertices always contain
- * positions and may also contain texture coordinates, per-vertex colors,
+ * positions and may also contain texture coordinates, per-vertex colors,
* and per-vertex coverage. Each stage can use any texture coordinates as
- * its input texture coordinates or it may use the positions as texture
+ * its input texture coordinates or it may use the positions as texture
* coordinates.
*
* If no texture coordinates are specified for a stage then the stage is
* disabled.
*
- * The order in memory is always (position, texture coords, color, coverage)
- * with any unused fields omitted.
+ * The order in memory is always (position, texture coords, color, coverage)
+ * with any unused fields omitted.
*/
/**
@@ -229,7 +229,7 @@ public:
/**
* Helper function to compute the size of each vertex and the offsets of
- * texture coordinates and color.
+ * texture coordinates and color.
*
* @param vertexLayout the layout to query
* @param texCoordOffset after return it is the offset of the
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index aad819c92b..a371a9bde2 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -385,22 +385,22 @@ public:
* have changed. They should be reestablished before the next drawIndexed
* or drawNonIndexed. This cannot be called between reserving and releasing
* geometry.
- *
+ *
* A subclass may override this to perform more optimal rect rendering. Its
* draws should be funneled through one of the public GrDrawTarget draw methods
* (e.g. drawNonIndexed, drawIndexedInstances, ...). The base class draws a two
* triangle fan using drawNonIndexed from reserved vertex space.
- *
+ *
* @param rect the rect to draw
* @param matrix optional matrix applied to rect (before viewMatrix)
* @param srcRects specifies rect for explicit texture coordinates.
* if srcRect is non-NULL then that rect will be used
* as the coordinates for the given stage.
* @param srcMatrix optional matrix applied to srcRect. If
- * srcRect is non-NULL and srcMatrix is non-NULL
- * then srcRect will be transformed by srcMatrix.
+ * srcRect is non-NULL and srcMatrix is non-NULL
+ * then srcRect will be transformed by srcMatrix.
* srcMatrix can be NULL when no srcMatrix is desired.
- * @param stage the stage to be given explicit texture coordinates.
+ * @param stage the stage to be given explicit texture coordinates.
* Ignored if srcRect is NULL.
*/
virtual void drawRect(const GrRect& rect,
diff --git a/src/gpu/gl/mac/SkNativeGLContext_mac.cpp b/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
index bcdc7ab9f2..460fad7e26 100644
--- a/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
+++ b/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
@@ -33,7 +33,7 @@ void SkNativeGLContext::destroyGLContext() {
const GrGLInterface* SkNativeGLContext::createGLContext() {
SkASSERT(NULL == fContext);
-
+
CGLPixelFormatAttribute attributes[] = {
#if 0
kCGLPFAOpenGLProfile, kCGLOGLPVersion_3_2_Core,
@@ -42,22 +42,22 @@ const GrGLInterface* SkNativeGLContext::createGLContext() {
};
CGLPixelFormatObj pixFormat;
GLint npix;
-
+
CGLChoosePixelFormat(attributes, &pixFormat, &npix);
-
+
if (NULL == pixFormat) {
SkDebugf("CGLChoosePixelFormat failed.");
return NULL;
}
-
+
CGLCreateContext(pixFormat, NULL, &fContext);
CGLReleasePixelFormat(pixFormat);
-
+
if (NULL == fContext) {
SkDebugf("CGLCreateContext failed.");
return NULL;
}
-
+
CGLSetCurrentContext(fContext);
const GrGLInterface* interface = GrGLCreateNativeInterface();