st/mesa: rename pbo_upload to pbo

At the same time, rename members that are upload-specific to say so.

Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 47d33013cbc..39ea501d93d 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -236,15 +236,15 @@ struct st_context
    /* For gl(Compressed)Tex(Sub)Image */
    struct {
       struct pipe_rasterizer_state raster;
-      struct pipe_blend_state blend;
+      struct pipe_blend_state upload_blend;
       void *vs;
       void *gs;
-      void *fs;
-      bool enabled;
+      void *upload_fs;
+      bool upload_enabled;
       bool rgba_only;
-      bool upload_layers;
+      bool layers;
       bool use_gs;
-   } pbo_upload;
+   } pbo;
 
    /** for drawing with st_util_vertex */
    struct pipe_vertex_element util_velems[3];