Mesa (master): st/dri: Fix crash in st/dri from dri format commit

[Jakob Bornecrantz]

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

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Thu Feb 23 18:17:37 2012 +0100

st/dri: Fix crash in st/dri from dri format commit

Introduced with 8de5c355fa2bf0f30df2c7cf39aee01e793284bf, it would probably just crash.

Signed-off-by: Jakob Bornecrantz <jakob at vmware.com>
Reviewed-by: Jesse Barnes <jbarnes at virtousgeek.org>

---

 src/gallium/state_trackers/dri/drm/dri2.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/dri/drm/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c
index cc8023d..d0be710 100644
--- a/src/gallium/state_trackers/dri/drm/dri2.c
+++ b/src/gallium/state_trackers/dri/drm/dri2.c
@@ -440,8 +440,6 @@ dri2_create_image_from_name(__DRIscreen *_screen,
 
    tex_usage = PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW;
 
-   img->dri_format = format;
-
    switch (format) {
    case __DRI_IMAGE_FORMAT_RGB565:
       pf = PIPE_FORMAT_B5G6R5_UNORM;
@@ -489,6 +487,7 @@ dri2_create_image_from_name(__DRIscreen *_screen,
 
    img->level = 0;
    img->layer = 0;
+   img->dri_format = format;
    img->loader_private = loaderPrivate;
 
    return img;