Józef Kucia : wined3d: Use wined3d_texture_get_texture_name() helper in more places.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a727b74264cfe8c78b194b2bb20889e729cc664e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a727b74264cfe8c78b194b2bb2...

Author: Józef Kucia 
Date:   Fri Apr  7 14:45:11 2017 +0200

wined3d: Use wined3d_texture_get_texture_name() helper in more places.

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/context.c | 2 +-
 dlls/wined3d/view.c    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index c74f7c0..7c090d4 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -3553,7 +3553,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context,
         else if (view->resource->type != WINED3D_RTYPE_BUFFER)
         {
             struct wined3d_texture *texture = texture_from_resource(view->resource);
-            texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name;
+            texture_name = wined3d_texture_get_texture_name(texture, context, FALSE);
             level = view->desc.u.texture.level_idx;
         }
         else
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index f37b601..7e8d192 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -153,7 +153,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target
     const struct wined3d_gl_info *gl_info;
     unsigned int layer_idx, layer_count;
     struct wined3d_context *context;
-    struct gl_texture *gl_texture;
+    GLuint texture_name;

view->target = view_target;

@@ -168,7 +168,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target
     }

wined3d_texture_prepare_texture(texture, context, FALSE);
-    gl_texture = wined3d_texture_get_gl_texture(texture, FALSE);
+    texture_name = wined3d_texture_get_texture_name(texture, context, FALSE);

layer_idx = desc->u.texture.layer_idx;
     layer_count = desc->u.texture.layer_count;
@@ -180,7 +180,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target
     }

gl_info->gl_ops.gl.p_glGenTextures(1, &view->name);
-    GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal,
+    GL_EXTCALL(glTextureView(view->name, view->target, texture_name, view_format->glInternal,
             desc->u.texture.level_idx, desc->u.texture.level_count,
             layer_idx, layer_count));
     checkGLcall("Create texture view");