};
-/** Per-tile layout mode */
-enum lp_texture_layout
-{
- LP_TEX_LAYOUT_NONE = 0, /**< no layout for the tile data yet */
- LP_TEX_LAYOUT_TILED, /**< the tile data is in tiled layout */
- LP_TEX_LAYOUT_LINEAR, /**< the tile data is in linear layout */
- LP_TEX_LAYOUT_BOTH /**< the tile data is in both modes */
-};
-
-
struct pipe_context;
struct pipe_screen;
struct llvmpipe_context;
struct sw_displaytarget;
-/**
- * We keep one or two copies of the texture image data: one in a simple
- * linear layout (for texture sampling) and another in a tiled layout (for
- * render targets). We keep track of whether each image tile is linear
- * or tiled on a per-tile basis.
- */
-
-
/** A 1D/2D/3D image, one mipmap level */
struct llvmpipe_texture_image
{
/**
* llvmpipe subclass of pipe_resource. A texture, drawing surface,
* vertex buffer, const buffer, etc.
- * Textures are stored differently than othere types of objects such as
+ * Textures are stored differently than other types of objects such as
* vertex buffers and const buffers.
- * The former are tiled and have per-tile layout flags.
- * The later are simple malloc'd blocks of memory.
+ * The latter are simple malloc'd blocks of memory.
*/
struct llvmpipe_resource
{
/** Row stride in bytes */
unsigned row_stride[LP_MAX_TEXTURE_LEVELS];
- /** Image stride (for cube maps or 3D textures) in bytes */
+ /** Image stride (for cube maps, array or 3D textures) in bytes */
unsigned img_stride[LP_MAX_TEXTURE_LEVELS];
- unsigned tiles_per_row[LP_MAX_TEXTURE_LEVELS];
- unsigned tiles_per_image[LP_MAX_TEXTURE_LEVELS];
/** Number of 3D slices or cube faces per level */
unsigned num_slices_faces[LP_MAX_TEXTURE_LEVELS];
/** Offset to start of mipmap level, in bytes */
- unsigned tiled_mip_offsets[LP_MAX_TEXTURE_LEVELS];
unsigned linear_mip_offsets[LP_MAX_TEXTURE_LEVELS];
/**
/**
* Malloc'ed data for regular textures, or a mapping to dt above.
*/
- struct llvmpipe_texture_image tiled_img;
struct llvmpipe_texture_image linear_img;
/**
*/
void *data;
- /** array [level][face or slice][tile_y][tile_x] of layout values) */
- enum lp_texture_layout *layout[LP_MAX_TEXTURE_LEVELS];
-
boolean userBuffer; /** Is this a user-space buffer? */
unsigned timestamp;
void llvmpipe_init_screen_resource_funcs(struct pipe_screen *screen);
void llvmpipe_init_context_resource_funcs(struct pipe_context *pipe);
+
+static INLINE boolean
+llvmpipe_resource_is_texture(const struct pipe_resource *resource)
+{
+ switch (resource->target) {
+ case PIPE_BUFFER:
+ return FALSE;
+ case PIPE_TEXTURE_1D:
+ case PIPE_TEXTURE_1D_ARRAY:
+ case PIPE_TEXTURE_2D:
+ case PIPE_TEXTURE_2D_ARRAY:
+ case PIPE_TEXTURE_RECT:
+ case PIPE_TEXTURE_3D:
+ case PIPE_TEXTURE_CUBE:
+ return TRUE;
+ default:
+ assert(0);
+ return FALSE;
+ }
+}
+
+
+static INLINE boolean
+llvmpipe_resource_is_1d(const struct pipe_resource *resource)
+{
+ switch (resource->target) {
+ case PIPE_BUFFER:
+ case PIPE_TEXTURE_1D:
+ case PIPE_TEXTURE_1D_ARRAY:
+ return TRUE;
+ case PIPE_TEXTURE_2D:
+ case PIPE_TEXTURE_2D_ARRAY:
+ case PIPE_TEXTURE_RECT:
+ case PIPE_TEXTURE_3D:
+ case PIPE_TEXTURE_CUBE:
+ return FALSE;
+ default:
+ assert(0);
+ return FALSE;
+ }
+}
+
+
+static INLINE unsigned
+llvmpipe_layer_stride(struct pipe_resource *resource,
+ unsigned level)
+{
+ struct llvmpipe_resource *lpr = llvmpipe_resource(resource);
+ assert(level < LP_MAX_TEXTURE_2D_LEVELS);
+ return lpr->img_stride[level];
+}
+
+
static INLINE unsigned
llvmpipe_resource_stride(struct pipe_resource *resource,
- unsigned level)
+ unsigned level)
{
struct llvmpipe_resource *lpr = llvmpipe_resource(resource);
assert(level < LP_MAX_TEXTURE_2D_LEVELS);
llvmpipe_resource_map(struct pipe_resource *resource,
unsigned level,
unsigned layer,
- enum lp_texture_usage tex_usage,
- enum lp_texture_layout layout);
+ enum lp_texture_usage tex_usage);
void
llvmpipe_resource_unmap(struct pipe_resource *resource,
- unsigned level,
- unsigned layer);
+ unsigned level,
+ unsigned layer);
void *
ubyte *
llvmpipe_get_texture_image_address(struct llvmpipe_resource *lpr,
- unsigned face_slice, unsigned level,
- enum lp_texture_layout layout);
+ unsigned face_slice, unsigned level);
void *
llvmpipe_get_texture_image(struct llvmpipe_resource *resource,
- unsigned face_slice, unsigned level,
- enum lp_texture_usage usage,
- enum lp_texture_layout layout);
+ unsigned face_slice, unsigned level,
+ enum lp_texture_usage usage);
void *
llvmpipe_get_texture_image_all(struct llvmpipe_resource *lpr,
unsigned level,
- enum lp_texture_usage usage,
- enum lp_texture_layout layout);
+ enum lp_texture_usage usage);
ubyte *
llvmpipe_get_texture_tile_linear(struct llvmpipe_resource *lpr,
- unsigned face_slice, unsigned level,
- enum lp_texture_usage usage,
- unsigned x, unsigned y);
-
-ubyte *
-llvmpipe_get_texture_tile(struct llvmpipe_resource *lpr,
- unsigned face_slice, unsigned level,
- enum lp_texture_usage usage,
- unsigned x, unsigned y);
+ unsigned face_slice, unsigned level,
+ enum lp_texture_usage usage,
+ unsigned x, unsigned y);
extern void
llvmpipe_print_resources(void);
-extern void
-llvmpipe_init_screen_texture_funcs(struct pipe_screen *screen);
-
-extern void
-llvmpipe_init_context_texture_funcs(struct pipe_context *pipe);
-
-
#define LP_UNREFERENCED 0
#define LP_REFERENCED_FOR_READ (1 << 0)
#define LP_REFERENCED_FOR_WRITE (1 << 1)
unsigned int
llvmpipe_is_resource_referenced( struct pipe_context *pipe,
struct pipe_resource *presource,
- unsigned level, int layer);
+ unsigned level);
unsigned
llvmpipe_get_format_alignment(enum pipe_format format);