commit c921843d85b4e79857103cdb614f76f123efa7f5
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 25 19:05:12 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 25 19:05:12 2011 +0000
tree f4cc6f4a3187f3a26a6064afa6437a57070ec417
parent 759b0363dad5c36d5366fd167b9224a46b565f53

fixes for some warnings:
- #if of something that was not defined
- explicit constructor call for baseclass in copy-constructor of subclass

http://code.google.com/p/skia/issues/detail?id=112



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

gpu/src/GrGLUtil.cpp

diff --git a/gpu/src/GrGLUtil.cpp b/gpu/src/GrGLUtil.cpp
index c1ed0f4..360e84e 100644
--- a/gpu/src/GrGLUtil.cpp
+++ b/gpu/src/GrGLUtil.cpp
@@ -104,7 +104,7 @@
 

     bool fboFound = false;

 #if GR_SUPPORT_GLDESKTOP

-    #if GL_VERSION_3_0

+    #if defined(GL_VERSION_3_0) && GL_VERSION_3_0

     if (!fboFound && major >= 3) { // all of ARB_fbo is in 3.x

         exts->GenFramebuffers                   = glGenFramebuffers;

         exts->BindFramebuffer                   = glBindFramebuffer;

gpu/src/GrGpuGL.cpp

diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp
index f0c7cff..ae27189 100644
--- a/gpu/src/GrGpuGL.cpp
+++ b/gpu/src/GrGpuGL.cpp
@@ -1166,12 +1166,6 @@
     GR_GL(DrawArrays(gPrimitiveType2GLMode[type], 0, vertexCount));
 }
 
-#if !defined(SK_GL_HAS_COLOR4UB)
-static inline GrFixed byte2fixed(unsigned value) {
-    return (value + (value >> 7)) << 8;
-}
-#endif
-
 void GrGpuGL::resolveTextureRenderTarget(GrGLTexture* texture) {
     GrGLRenderTarget* rt = (GrGLRenderTarget*) texture->asRenderTarget();
 

gpu/src/GrGpuGL.h

diff --git a/gpu/src/GrGpuGL.h b/gpu/src/GrGpuGL.h
index dbc5de3..0ba405d 100644
--- a/gpu/src/GrGpuGL.h
+++ b/gpu/src/GrGpuGL.h
@@ -177,10 +177,6 @@
     #define GrGL_RestoreResetRowLength()
 #endif
 
-#if SK_TextGLType != GL_FIXED
-    #define SK_GL_HAS_COLOR4UB
-#endif
-
 /*
  *  Some drivers want the var-int arg to be zero-initialized on input.
  */

gpu/src/GrGpuGLShaders.cpp

diff --git a/gpu/src/GrGpuGLShaders.cpp b/gpu/src/GrGpuGLShaders.cpp
index c7baf1f..053479f 100644
--- a/gpu/src/GrGpuGLShaders.cpp
+++ b/gpu/src/GrGpuGLShaders.cpp
@@ -192,11 +192,7 @@
     "void main() {\n"
     // On Brian's PC laptop with Intel Gfx texture2DProj seems to be broken
     // but it works everywhere else tested.
-#if GR_GLSL_2DPROJ_BROKEN
-    "   gl_FragColor = vColor * texture2D(sTexture, vTexture.xy / vTexture.z);\n"
-#else
     "   gl_FragColor = vColor * texture2DProj(sTexture, vTexture);\n"
-#endif
 
     "}\n",
 

gpu/src/GrPath.cpp

diff --git a/gpu/src/GrPath.cpp b/gpu/src/GrPath.cpp
index 7b117eb..554b3b9 100644
--- a/gpu/src/GrPath.cpp
+++ b/gpu/src/GrPath.cpp
@@ -2,7 +2,7 @@
 
 GrPath::GrPath() {}
 
-GrPath::GrPath(const GrPath& src) {
+GrPath::GrPath(const GrPath& src) : INHERITED() {
 }
 
 GrPath::GrPath(GrPathIter& iter) {