commit 1fcd51e6b2a210a37b9b9c2cfb82e1be7196e42a
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 05 15:50:27 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 05 15:50:27 2011 +0000
tree a4484338560ed16adffe22f52a2cb2401901208d
parent 62f465940d57139dfd83e2aef67081017a232417

add template macro to "safely" perform casts w/o breaking strict-aliasing
fix aliasing warnings



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

gpu/src/GrGpuGL.cpp

diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp
index de4010f..87d69bc 100644
--- a/gpu/src/GrGpuGL.cpp
+++ b/gpu/src/GrGpuGL.cpp
@@ -533,13 +533,13 @@
 #if GR_COLLECT_STATS
     ++fStats.fTextureCreateCnt;
 #endif
-    
+
     static const GrGLTexture::TexParams DEFAULT_PARAMS = {
         GL_NEAREST,
         GL_CLAMP_TO_EDGE,
         GL_CLAMP_TO_EDGE
     };
-    
+
     GrGLTexture::GLTextureDesc glDesc;
     GLenum internalFormat;
 
@@ -614,17 +614,17 @@
     }
 
     GR_GL(BindTexture(GL_TEXTURE_2D, glDesc.fTextureID));
-    GR_GL(TexParameteri(GL_TEXTURE_2D, 
-                        GL_TEXTURE_MAG_FILTER, 
+    GR_GL(TexParameteri(GL_TEXTURE_2D,
+                        GL_TEXTURE_MAG_FILTER,
                         DEFAULT_PARAMS.fFilter));
-    GR_GL(TexParameteri(GL_TEXTURE_2D, 
-                        GL_TEXTURE_MIN_FILTER, 
+    GR_GL(TexParameteri(GL_TEXTURE_2D,
+                        GL_TEXTURE_MIN_FILTER,
                         DEFAULT_PARAMS.fFilter));
-    GR_GL(TexParameteri(GL_TEXTURE_2D, 
+    GR_GL(TexParameteri(GL_TEXTURE_2D,
                         GL_TEXTURE_WRAP_S,
                         DEFAULT_PARAMS.fWrapS));
-    GR_GL(TexParameteri(GL_TEXTURE_2D, 
-                        GL_TEXTURE_WRAP_T, 
+    GR_GL(TexParameteri(GL_TEXTURE_2D,
+                        GL_TEXTURE_WRAP_T,
                         DEFAULT_PARAMS.fWrapT));
 #if GR_COLLECT_STATS
     ++fStats.fTextureChngCnt;
@@ -1443,28 +1443,28 @@
 
             const GrGLTexture::TexParams& oldTexParams = nextTexture->getTexParams();
             GrGLTexture::TexParams newTexParams;
-            newTexParams.fFilter = fCurrDrawState.fSamplerState.isFilter() ? 
+            newTexParams.fFilter = fCurrDrawState.fSamplerState.isFilter() ?
                                                                 GL_LINEAR :
                                                                 GL_NEAREST;
             newTexParams.fWrapS = GrGLTexture::gWrapMode2GLWrap[fCurrDrawState.fSamplerState.getWrapX()];
             newTexParams.fWrapT = GrGLTexture::gWrapMode2GLWrap[fCurrDrawState.fSamplerState.getWrapY()];
 
             if (newTexParams.fFilter != oldTexParams.fFilter) {
-                GR_GL(TexParameteri(GL_TEXTURE_2D, 
-                                    GL_TEXTURE_MAG_FILTER, 
+                GR_GL(TexParameteri(GL_TEXTURE_2D,
+                                    GL_TEXTURE_MAG_FILTER,
                                     newTexParams.fFilter));
-                GR_GL(TexParameteri(GL_TEXTURE_2D, 
-                                    GL_TEXTURE_MIN_FILTER, 
+                GR_GL(TexParameteri(GL_TEXTURE_2D,
+                                    GL_TEXTURE_MIN_FILTER,
                                     newTexParams.fFilter));
             }
             if (newTexParams.fWrapS != oldTexParams.fWrapS) {
-                GR_GL(TexParameteri(GL_TEXTURE_2D, 
+                GR_GL(TexParameteri(GL_TEXTURE_2D,
                                     GL_TEXTURE_WRAP_S,
                                     newTexParams.fWrapS));
             }
             if (newTexParams.fWrapT != oldTexParams.fWrapT) {
-                GR_GL(TexParameteri(GL_TEXTURE_2D, 
-                                    GL_TEXTURE_WRAP_T, 
+                GR_GL(TexParameteri(GL_TEXTURE_2D,
+                                    GL_TEXTURE_WRAP_T,
                                     newTexParams.fWrapT));
             }
             nextTexture->setTexParams(newTexParams);
@@ -1594,7 +1594,7 @@
     // b) we set more state than just FBO based on the RT
     // So trash the HW state to force an RT flush next time
     if (fCurrDrawState.fRenderTarget == renderTarget) {
-        fCurrDrawState.fRenderTarget = (GrRenderTarget*)&fDefaultRenderTarget;
+        fCurrDrawState.fRenderTarget = fDefaultRenderTarget;
     }
     if (fHWDrawState.fRenderTarget == renderTarget) {
         fHWDrawState.fRenderTarget = NULL;