From: Brian Paul <brianp@vmware.com>
Date: Fri, 12 Aug 2016 18:37:02 +0000 (-0600)
Subject: st/mesa: use pipe var instead of st->pipe in st_create_context_priv()
X-Git-Tag: upstream/17.1.0~7352
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df2dcf62008c22a8e2ca6b17936bf27c025e9416;p=platform%2Fupstream%2Fmesa.git

st/mesa: use pipe var instead of st->pipe in st_create_context_priv()

As is done in most other places in the function.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 687ca19..ddc11a4 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -337,11 +337,11 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe,
    /* Create upload manager for vertex data for glBitmap, glDrawPixels,
     * glClear, etc.
     */
-   st->uploader = u_upload_create(st->pipe, 65536, PIPE_BIND_VERTEX_BUFFER,
+   st->uploader = u_upload_create(pipe, 65536, PIPE_BIND_VERTEX_BUFFER,
                                   PIPE_USAGE_STREAM);
 
    if (!screen->get_param(screen, PIPE_CAP_USER_INDEX_BUFFERS)) {
-      st->indexbuf_uploader = u_upload_create(st->pipe, 128 * 1024,
+      st->indexbuf_uploader = u_upload_create(pipe, 128 * 1024,
                                               PIPE_BIND_INDEX_BUFFER,
                                               PIPE_USAGE_STREAM);
    }
@@ -433,8 +433,8 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe,
       screen->get_param(screen, PIPE_CAP_MULTI_DRAW_INDIRECT);
 
    /* GL limits and extensions */
-   st_init_limits(st->pipe->screen, &ctx->Const, &ctx->Extensions);
-   st_init_extensions(st->pipe->screen, &ctx->Const,
+   st_init_limits(pipe->screen, &ctx->Const, &ctx->Extensions);
+   st_init_extensions(pipe->screen, &ctx->Const,
                       &ctx->Extensions, &st->options, ctx->Mesa_DXTn);
 
    if (st_have_perfmon(st)) {