st/vega: Remove st_inlines.h.

Per b0427bedde80e3189524651a327235bdfddbc613.

diff --git a/src/gallium/state_trackers/vega/api_filters.c b/src/gallium/state_trackers/vega/api_filters.c
index 841df10ab73b36ee4c97c27cce50617e2250f941..384554a574b879798e8712eef27389a9c3419747 100644 (file)
--- a/src/gallium/state_trackers/vega/api_filters.c
+++ b/src/gallium/state_trackers/vega/api_filters.c
@@ -31,7 +31,6 @@
 #include "api.h"
 #include "renderer.h"
 #include "shaders_cache.h"
-#include "st_inlines.h"
 
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"

diff --git a/src/gallium/state_trackers/vega/mask.c b/src/gallium/state_trackers/vega/mask.c
index 670790c02388440423f88fcf59174152c22c144a..e3aec980b53fcf16428892034a4324d632c4a2fd 100644 (file)
--- a/src/gallium/state_trackers/vega/mask.c
+++ b/src/gallium/state_trackers/vega/mask.c
@@ -31,7 +31,6 @@
 #include "shaders_cache.h"
 #include "renderer.h"
 #include "asm_util.h"
-#include "st_inlines.h"
 
 #include "pipe/p_context.h"
 #include "pipe/p_screen.h"

diff --git a/src/gallium/state_trackers/vega/paint.c b/src/gallium/state_trackers/vega/paint.c
index cf9a85d95dbfba3947b3334c77c6a072634edf87..31c17842cf190dcfe04ceb52d9c165bc0deb05e6 100644 (file)
--- a/src/gallium/state_trackers/vega/paint.c
+++ b/src/gallium/state_trackers/vega/paint.c
@@ -28,7 +28,6 @@
 
 #include "matrix.h"
 #include "image.h"
-#include "st_inlines.h"
 
 #include "pipe/p_compiler.h"
 #include "util/u_inlines.h"
@@ -161,7 +160,7 @@ static INLINE struct pipe_resource *create_gradient_texture(struct vg_paint *p)
 
    { /* upload color_data */
       struct pipe_transfer *transfer =
-         st_no_flush_get_transfer(p->base.ctx, tex, 0, 0, 0,
+         pipe_get_transfer(p->base.ctx->pipe, tex, 0, 0, 0,
                                       PIPE_TRANSFER_WRITE, 0, 0, 1024, 1);
       void *map = pipe->transfer_map(pipe, transfer);
       memcpy(map, p->gradient.color_data, sizeof(VGint)*1024);

diff --git a/src/gallium/state_trackers/vega/st_inlines.h b/src/gallium/state_trackers/vega/st_inlines.h
deleted file mode 100644 (file)
index 7eaa67c..0000000
--- a/src/gallium/state_trackers/vega/st_inlines.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/**************************************************************************
- * 
- * Copyright 2009 VMware, Inc.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-/**
- * Functions for checking if buffers/textures are referenced when we need
- * to read/write from/to them.  Flush when needed.
- */
-
-#ifndef ST_INLINES_H
-#define ST_INLINES_H
-
-#include "vg_context.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_screen.h"
-#include "pipe/p_defines.h"
-#include "util/u_inlines.h"
-#include "pipe/p_state.h"
-
-static INLINE struct pipe_transfer *
-st_cond_flush_get_transfer(struct vg_context *st,
-                              struct pipe_resource *pt,
-                              unsigned int face,
-                              unsigned int level,
-                              unsigned int zslice,
-                              enum pipe_transfer_usage usage,
-                              unsigned int x, unsigned int y,
-                              unsigned int w, unsigned int h)
-{
-   struct pipe_context *pipe = st->pipe;
-
-   return pipe_get_transfer(pipe, pt, face, level, zslice, usage,
-                           x, y, w, h);
-}
-
-static INLINE struct pipe_transfer *
-st_no_flush_get_transfer(struct vg_context *st,
-                            struct pipe_resource *pt,
-                            unsigned int face,
-                            unsigned int level,
-                            unsigned int zslice,
-                            enum pipe_transfer_usage usage,
-                            unsigned int x, unsigned int y,
-                            unsigned int w, unsigned int h)
-{
-   struct pipe_context *pipe = st->pipe;
-
-   return pipe_get_transfer(pipe, pt, face, level,
-                           zslice, usage, x, y, w, h);
-}
-
-
-static INLINE void
-st_cond_flush_pipe_buffer_write(struct vg_context *st,
-                               struct pipe_resource *buf,
-                               unsigned int offset,
-                               unsigned int size,
-                               const void * data)
-{
-   struct pipe_context *pipe = st->pipe;
-
-   pipe_buffer_write(pipe, buf, offset, size, data);
-}
-
-static INLINE void
-st_no_flush_pipe_buffer_write(struct vg_context *st,
-                             struct pipe_resource *buf,
-                             unsigned int offset,
-                             unsigned int size,
-                             const void * data)
-{
-   pipe_buffer_write(st->pipe, buf, offset, size, data);
-}
-
-static INLINE void
-st_cond_flush_pipe_buffer_read(struct vg_context *st,
-                              struct pipe_resource *buf,
-                              unsigned int offset,
-                              unsigned int size,
-                              void * data)
-{
-   struct pipe_context *pipe = st->pipe;
-
-   pipe_buffer_read(pipe, buf, offset, size, data);
-}
-
-static INLINE void
-st_no_flush_pipe_buffer_read(struct vg_context *st,
-                            struct pipe_resource *buf,
-                            unsigned int offset,
-                            unsigned int size,
-                            void * data)
-{
-   pipe_buffer_read(st->pipe, buf, offset, size, data);
-}
-
-#endif
-

diff --git a/src/gallium/state_trackers/vega/vg_context.c b/src/gallium/state_trackers/vega/vg_context.c
index 65adadd1fe917310ba143a28b24b893acbd8100b..6ca80e70653567da22c102f0a078451ad78244fe 100644 (file)
--- a/src/gallium/state_trackers/vega/vg_context.c
+++ b/src/gallium/state_trackers/vega/vg_context.c
@@ -31,7 +31,6 @@
 #include "shaders_cache.h"
 #include "shader.h"
 #include "asm_util.h"
-#include "st_inlines.h"
 #include "vg_manager.h"
 #include "api.h"
 #include "mask.h"