aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-12-06 14:46:34 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-12-06 14:46:34 +0000
commit5bc34f04fe70cdde702ac3bff1fea0ccb275d4a5 (patch)
treeb6fc46ffc37f860f0d5c67fedcea55977acfa7fb /include/gpu
parent0be5eb75331050bd095072e6d9a2528af2c6c630 (diff)
Remove fConfig/fFormat union in GrTextureDesc
Review URL: http://codereview.appspot.com/5448116/ git-svn-id: http://skia.googlecode.com/svn/trunk@2806 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu')
-rw-r--r--include/gpu/GrTypes.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h
index e961fac805..0bcab7d8a3 100644
--- a/include/gpu/GrTypes.h
+++ b/include/gpu/GrTypes.h
@@ -490,12 +490,7 @@ struct GrTextureDesc {
* Format of source data of the texture. Not guaraunteed to be the same as
* internal format used by 3D API.
*/
- // This union exists because WebKit uses the deprecated name fFormat. Once
- // WebKit has been changed fFormat will be dropped.
- union {
- GrPixelConfig fFormat;
- GrPixelConfig fConfig;
- };
+ GrPixelConfig fConfig;
};
/**