commit f1d88064bc56985f22f00a7ad7cf56f9fdceb80f
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 10 12:43:21 2012 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 10 12:43:21 2012 +0000
tree 32eec411db01516eb1e58e77818101b34551b4cb
parent bf5cad4e9c5808493b35cb9b0000a2d36b7f9b78

Windows build fixes from r3887.



git-svn-id: http://skia.googlecode.com/svn/trunk@3889 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/effects/GrConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
index e4ddd29..d63b023 100644
--- a/src/gpu/effects/GrConvolutionEffect.cpp
+++ b/src/gpu/effects/GrConvolutionEffect.cpp
@@ -58,12 +58,12 @@
 
 }
 
-const char* GrGLConvolutionEffect::name() const SK_OVERRIDE {
+const char* GrGLConvolutionEffect::name() const {
     return fData->name();
 }
 
 void GrGLConvolutionEffect::setupVSUnis(VarArray* vsUnis,
-                                        int stage) SK_OVERRIDE {
+                                        int stage) {
     fImageIncrementVar = &vsUnis->push_back();
     fImageIncrementVar->setType(kVec2f_GrSLType);
     fImageIncrementVar->setTypeModifier(
@@ -76,7 +76,7 @@
 }
 
 void GrGLConvolutionEffect::setupFSUnis(VarArray* fsUnis,
-                                        int stage) SK_OVERRIDE {
+                                        int stage) {
     fKernelVar = &fsUnis->push_back();
     fKernelVar->setType(kFloat_GrSLType);
     fKernelVar->setTypeModifier(
@@ -92,7 +92,7 @@
 }
 
 void GrGLConvolutionEffect::emitVS(GrStringBuilder* code,
-                        const char* vertexCoords) SK_OVERRIDE {
+                        const char* vertexCoords) {
     float scale = (fData->fKernelWidth - 1) * 0.5f;
     code->appendf("\t\t%s -= vec2(%g, %g) * %s;\n",
                   vertexCoords, scale, scale,
@@ -104,7 +104,7 @@
                         const char* outputColor,
                         const char* inputColor,
                         const char* samplerName,
-                        const char* sampleCoords) SK_OVERRIDE {
+                        const char* sampleCoords) {
     const char* texFunc = "texture2D";
     bool complexCoord = false;
 
@@ -134,7 +134,7 @@
 }
 
 void GrGLConvolutionEffect::initUniforms(const GrGLInterface* gl,
-                                         int programID) SK_OVERRIDE {
+                                         int programID) {
     GR_GL_CALL_RET(gl, fKernelLocation,
         GetUniformLocation(programID, fKernelVar->getName().c_str()));
     GR_GL_CALL_RET(gl, fImageIncrementLocation,
@@ -144,7 +144,7 @@
 
 void GrGLConvolutionEffect::setData(const GrGLInterface* gl,
                                     GrCustomStage* data,
-                                    const GrGLTexture* texture) SK_OVERRIDE {
+                                    const GrGLTexture* texture) {
     fData = static_cast<GrConvolutionEffect*>(data);
     GR_GL_CALL(gl, Uniform1fv(fKernelLocation,
                               fData->fKernelWidth,
@@ -195,8 +195,7 @@
 
 }
 
-uint16_t GrConvolutionEffectFactory::stageKey(const GrCustomStage* s)
-    SK_OVERRIDE {
+uint16_t GrConvolutionEffectFactory::stageKey(const GrCustomStage* s) {
     const GrConvolutionEffect* c =
         static_cast<const GrConvolutionEffect*>(s);
     GrAssert(c->width() < 256);
@@ -204,7 +203,7 @@
 }
 
 GrGLProgramStage* GrConvolutionEffectFactory::createGLInstance(
-    GrCustomStage* s) SK_OVERRIDE {
+    GrCustomStage* s) {
     return new GrGLConvolutionEffect(static_cast<GrConvolutionEffect*>(s));
 }
 

src/gpu/gl/GrGpuGLShaders.cpp

diff --git a/src/gpu/gl/GrGpuGLShaders.cpp b/src/gpu/gl/GrGpuGLShaders.cpp
index 9b6600b..48ec623 100644
--- a/src/gpu/gl/GrGpuGLShaders.cpp
+++ b/src/gpu/gl/GrGpuGLShaders.cpp
@@ -302,7 +302,7 @@
             // TODO: is there a more elegant way to express this?
             if (stage.fFetchMode == StageDesc::kConvolution_FetchMode) {
                 int direction = random_int(&random, 2);
-                float kernel[stage.fKernelWidth];
+                float kernel[MAX_KERNEL_WIDTH];
                 for (int i = 0; i < stage.fKernelWidth; i++) {
                     kernel[i] = random.nextF();
                 }