Mesa (gallium-array-textures): gallium: even more compile fixes after merge

[Roland Scheidegger]

Module: Mesa
Branch: gallium-array-textures
Commit: 912f042e1d439de17b36be9a740358c876fcd144
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=912f042e1d439de17b36be9a740358c876fcd144

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Wed Dec  1 03:01:55 2010 +0100

gallium: even more compile fixes after merge

---

 .../state_trackers/egl/common/egl_g3d_image.c      |    3 +--
 src/gallium/targets/libgl-gdi/libgl_gdi.c          |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/egl/common/egl_g3d_image.c b/src/gallium/state_trackers/egl/common/egl_g3d_image.c
index 4b7c58c..38627a5 100644
--- a/src/gallium/state_trackers/egl/common/egl_g3d_image.c
+++ b/src/gallium/state_trackers/egl/common/egl_g3d_image.c
@@ -287,9 +287,8 @@ egl_g3d_create_drm_image(_EGLDriver *drv, _EGLDisplay *dpy,
 
    /* transfer the ownership to the image */
    gimg->texture = ptex;
-   gimg->face = 0;
    gimg->level = 0;
-   gimg->zslice = 0;
+   gimg->layer = 0;
 
    return &gimg->base;
 }
diff --git a/src/gallium/targets/libgl-gdi/libgl_gdi.c b/src/gallium/targets/libgl-gdi/libgl_gdi.c
index afec846..112904a 100644
--- a/src/gallium/targets/libgl-gdi/libgl_gdi.c
+++ b/src/gallium/targets/libgl-gdi/libgl_gdi.c
@@ -126,7 +126,7 @@ gdi_present(struct pipe_screen *screen,
 #endif
 
    winsys = softpipe_screen(screen)->winsys,
-   dt = softpipe_resource(surface->texture)->dt,
+   dt = softpipe_resource(res)->dt,
    gdi_sw_display(winsys, dt, hDC);
 }