From 904587ac3aae82c2c9c2aba94280021703cb88bd Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Fri, 28 Dec 2012 12:22:54 +0200 Subject: [PATCH] intel: refactor planar format lookup v2 (Eric): refactor both occurences, not just one v3 (Chad): replace 0 by NULL Signed-off-by: Topi Pohjolainen Reviewed-by: Chad Versace Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/intel_screen.c | 31 ++++++++++++++---------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index ce7a51e5512..0738cf62f8f 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -231,6 +231,21 @@ static struct intel_image_format intel_image_formats[] = { { 0, 1, 0, __DRI_IMAGE_FORMAT_ARGB8888, 4 } } } }; +static struct intel_image_format * +intel_image_format_lookup(int fourcc) +{ + struct intel_image_format *f = NULL; + + for (unsigned i = 0; i < ARRAY_SIZE(intel_image_formats); i++) { + if (intel_image_formats[i].fourcc == fourcc) { + f = &intel_image_formats[i]; + break; + } + } + + return f; +} + static __DRIimage * intel_allocate_image(int dri_format, void *loaderPrivate) { @@ -601,12 +616,7 @@ intel_create_image_from_names(__DRIscreen *screen, if (screen == NULL || names == NULL || num_names != 1) return NULL; - for (i = 0; i < ARRAY_SIZE(intel_image_formats); i++) { - if (intel_image_formats[i].fourcc == fourcc) { - f = &intel_image_formats[i]; - } - } - + f = intel_image_format_lookup(fourcc); if (f == NULL) return NULL; @@ -635,19 +645,14 @@ intel_create_image_from_fds(__DRIscreen *screen, void *loaderPrivate) { struct intel_screen *intelScreen = screen->driverPrivate; - struct intel_image_format *f = NULL; + struct intel_image_format *f; __DRIimage *image; int i, index; if (fds == NULL || num_fds != 1) return NULL; - for (i = 0; i < ARRAY_SIZE(intel_image_formats); i++) { - if (intel_image_formats[i].fourcc == fourcc) { - f = &intel_image_formats[i]; - } - } - + f = intel_image_format_lookup(fourcc); if (f == NULL) return NULL; -- 2.30.2