Prefix argument names.

Prefix st_api, st_context, and st_framebuffer argument names by "st".

1 files changed, 22 insertions, 21 deletions

diff --git a/st_api.h b/st_api.h
index b184493..a4b88e1 100644
--- a/st_api.h
+++ b/st_api.h
@@ -164,11 +164,11 @@ struct st_framebuffer
     *
     * @att is either FRONT_LEFT or FRONT_RIGHT.
     */
-   boolean (*flush_front)(struct st_framebuffer *fb,
+   boolean (*flush_front)(struct st_framebuffer *stfb,
                           enum st_framebuffer_attachment att);
 
    /**
-    * The api state tracker asks for the textures it needs.
+    * The state tracker asks for the textures it needs.
     *
     * It should try to only ask for attachments that it currently renders
     * to, thus allowing the winsys to delay the allocation of textures not
@@ -178,7 +178,7 @@ struct st_framebuffer
     * The implementor of this function needs to also ensure
     * thread safty as this call might be done from multiple threads.
     */
-   boolean (*validate)(struct st_framebuffer *fb,
+   boolean (*validate)(struct st_framebuffer *stfb,
                        const enum st_framebuffer_attachment *att,
                        unsigned count,
                        struct pipe_texture **out);
@@ -202,8 +202,8 @@ struct st_context
     * This gives access to the underlying data structure of a state tracker
     * context resource.
     */
-   void *(*lock_resource)(struct st_context *ctx, void *res);
-   void (*unlock_resource)(struct st_context *ctx, void *res);
+   void *(*lock_resource)(struct st_context *stctx, void *res);
+   void (*unlock_resource)(struct st_context *stctx, void *res);
 
    /**
     * Invalidate the current textures that was taken from a framebuffer.
@@ -221,31 +221,32 @@ struct st_context
     *
     * Thus reducing the sync primitive needed to a single atomic flag.
     */
-   void (*notify_invalid_framebuffer)(struct st_context *ctx,
-                                      struct st_framebuffer *fb);
+   void (*notify_invalid_framebuffer)(struct st_context *stctx,
+                                      struct st_framebuffer *stfb);
 
    /**
     * Replace the texture image of a texture object at the specified level.
     *
     * This function is optional.
     */
-   boolean (*teximage)(struct st_context *ctx, enum st_texture_type target,
+   boolean (*teximage)(struct st_context *stctx, enum st_texture_type target,
                        int level, enum pipe_format internal_format,
                        struct pipe_texture *tex, boolean mipmap);
 
    /**
     * Flush all drawing from context to the pipe also flushes the pipe.
     */
-   void (*flush)(struct st_context *ctx,
+   void (*flush)(struct st_context *stctx,
                  unsigned pipe_flush_flags,
                  struct pipe_fence_handle **fence);
 
    /**
     * Used to implement glXCopyContext.
     */
-   void (*copy)(struct st_context *dst, struct st_context *src, unsigned mask);
+   void (*copy)(struct st_context *stctx, struct st_context *stsrc,
+		unsigned mask);
 
-   void (*destroy)(struct st_context *ctx);
+   void (*destroy)(struct st_context *stctx);
 };
 
 /**
@@ -263,7 +264,7 @@ struct st_api
    /**
     * Return true if the visual is supported by the state tracker.
     */
-   boolean (*is_visual_supported)(struct st_api *api,
+   boolean (*is_visual_supported)(struct st_api *stapi,
                                   const struct st_visual *visual);
 
    /**
@@ -273,32 +274,32 @@ struct st_api
     * the pipe_screen can create contexts.
     * XXX: Is visual needed?
     */
-   struct st_context *(*create_context)(struct st_api *api,
+   struct st_context *(*create_context)(struct st_api *stapi,
                                         struct pipe_context *pipe,
                                         const struct st_visual *visual,
-                                        struct st_context *share);
+                                        struct st_context *stshare);
 
    /**
     * Bind the context to this thread with draw and read as drawables.
     */
-   boolean (*make_current)(struct st_api *api,
-                           struct st_context *st,
-                           struct st_framebuffer *draw,
-                           struct st_framebuffer *read);
+   boolean (*make_current)(struct st_api *stapi,
+                           struct st_context *stctx,
+                           struct st_framebuffer *stdraw,
+                           struct st_framebuffer *stread);
 
    /**
     * Get the currently bound context in this thread.
     */
-   struct st_context (*get_current)(struct st_api *api);
+   struct st_context (*get_current)(struct st_api *stapi);
 
    /**
     * Return a API entry point.
     *
     * For GL this is the same as _glapi_get_proc_address.
     */
-   st_proc_t (*get_proc_address)(struct st_api *api, const char *procname);
+   st_proc_t (*get_proc_address)(struct st_api *stapi, const char *procname);
 
-   void (*destroy)(struct st_api *api);
+   void (*destroy)(struct st_api *stapi);
 };
 
 /**