st/mesa: rename var and update st_choose_format() comments

[mesa.git] / src / mesa / state_tracker / st_cb_drawpixels.c

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 955e371398d3696b4d987c295b2a666536d58562..e059002f157d6e6e1f43beb447d1eebdd9e4975c 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -834,7 +834,7 @@ st_DrawPixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       struct pipe_resource *pt
          = make_texture(st, width, height, format, type, unpack, pixels);
       if (pt) {
-         struct pipe_sampler_view *sv = st_sampler_view_from_texture(st->pipe, pt);
+         struct pipe_sampler_view *sv = st_create_texture_sampler_view(st->pipe, pt);
 
          if (sv) {
             draw_textured_quad(ctx, x, y, ctx->Current.RasterPos[2],
@@ -858,7 +858,7 @@ copy_stencil_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
                     GLint dstx, GLint dsty)
 {
    struct st_renderbuffer *rbDraw = st_renderbuffer(ctx->DrawBuffer->_StencilBuffer);
-   struct pipe_context *pipe = ctx->st->pipe;
+   struct pipe_context *pipe = st_context(ctx)->pipe;
    enum pipe_transfer_usage usage;
    struct pipe_transfer *ptDraw;
    ubyte *drawMap;
@@ -1041,7 +1041,7 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
    if (!pt)
       return;
 
-   sv = st_sampler_view_from_texture(st->pipe, pt);
+   sv = st_create_texture_sampler_view(st->pipe, pt);
    if (!sv) {
       pipe_resource_reference(&pt, NULL);
       return;