From 5bc34f04fe70cdde702ac3bff1fea0ccb275d4a5 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 6 Dec 2011 14:46:34 +0000 Subject: 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 --- include/gpu/GrTypes.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'include/gpu') 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; }; /** -- cgit v1.2.3