Mesa (master): egl_dri2: Put the _eglError call in the case switch case

Kristian Høgsberg krh at kemper.freedesktop.org
Wed Jan 11 18:05:27 UTC 2012


Module: Mesa
Branch: master
Commit: 513d1feee46d05b71094c60ee09fa263867f25b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=513d1feee46d05b71094c60ee09fa263867f25b7

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Wed Jan 11 12:36:37 2012 -0500

egl_dri2: Put the _eglError call in the case switch case

Log an error in case we get an unknown format, not in case for XRGB32.
I botched the edit of Roberts patch.

---

 src/egl/drivers/dri2/egl_dri2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index a7ebf59..5fff7e1 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1099,11 +1099,11 @@ dri2_create_image_wayland_wl_buffer(_EGLDisplay *disp, _EGLContext *ctx,
       format = __DRI_IMAGE_FORMAT_ARGB8888;
       break;
    case WL_DRM_FORMAT_XRGB32:
-      _eglError(EGL_BAD_PARAMETER,
-		"dri2_create_image_khr: unsupported wl_buffer format");
       format = __DRI_IMAGE_FORMAT_XRGB8888;
       break;
    default:
+      _eglError(EGL_BAD_PARAMETER,
+		"dri2_create_image_khr: unsupported wl_buffer format");
       return NULL;
    }
 




More information about the mesa-commit mailing list