diff options
author | Roland Scheidegger <sroland@vmware.com> | 2010-04-09 17:48:18 +0200 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2010-04-09 17:48:18 +0200 |
commit | 8f3f9d5e1e9c0de98a3dfb19e81250d2c32ee4e9 (patch) | |
tree | 5bf6b906e772b5569262046b61e0273908a59189 /src/gallium | |
parent | 41f00a32ee5be91512c048bacb89ede0e04bc08d (diff) |
gallium: another fix after merge
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/state_trackers/dri/drm/dri2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/dri/drm/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c index e98b6dcda5..c6655847e9 100644 --- a/src/gallium/state_trackers/dri/drm/dri2.c +++ b/src/gallium/state_trackers/dri/drm/dri2.c @@ -390,12 +390,12 @@ dri2_create_image_from_name(__DRIcontext *context, { struct dri_screen *screen = dri_screen(context->driScreenPriv); __DRIimage *img; - struct pipe_texture templ; + struct pipe_resource templ; struct winsys_handle whandle; unsigned tex_usage; enum pipe_format pf; - tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET | PIPE_TEXTURE_USAGE_SAMPLER; + tex_usage = PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW; switch (format) { case __DRI_IMAGE_FORMAT_RGB565: @@ -419,7 +419,7 @@ dri2_create_image_from_name(__DRIcontext *context, return NULL; memset(&templ, 0, sizeof(templ)); - templ.tex_usage = tex_usage; + templ.bind = tex_usage; templ.format = pf; templ.target = PIPE_TEXTURE_2D; templ.last_level = 0; @@ -431,7 +431,7 @@ dri2_create_image_from_name(__DRIcontext *context, whandle.handle = name; whandle.stride = pitch * util_format_get_blocksize(pf); - img->texture = screen->pipe_screen->texture_from_handle(screen->pipe_screen, + img->texture = screen->pipe_screen->resource_from_handle(screen->pipe_screen, &templ, &whandle); if (!img->texture) { FREE(img); |