diff options
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.h')
-rw-r--r-- | src/gallium/drivers/r300/r300_context.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index 5c0f53e9aad..5588e51ada9 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -196,6 +196,10 @@ struct r300_texture_format_state { struct r300_sampler_view { struct pipe_sampler_view base; + /* For resource_copy_region. */ + unsigned width0_override; + unsigned height0_override; + /* Swizzles in the UTIL_FORMAT_SWIZZLE_* representation, * derived from base. */ unsigned char swizzle[4]; @@ -339,7 +343,6 @@ struct r300_texture_desc { unsigned offset_in_bytes[R300_MAX_TEXTURE_LEVELS]; /* Strides for each mip-level. */ - unsigned stride_in_pixels[R300_MAX_TEXTURE_LEVELS]; unsigned stride_in_bytes[R300_MAX_TEXTURE_LEVELS]; /* Size of one zslice or face or 2D image based on the texture target. */ @@ -395,10 +398,6 @@ struct r300_resource /* Texture description (addressing, layout, special features). */ struct r300_texture_desc tex; - /* Registers carrying texture format data. */ - /* Only format-independent bits should be filled in. */ - struct r300_texture_format_state tx_format; - /* This is the level tiling flags were last time set for. * It's used to prevent redundant tiling-flags changes from happening.*/ unsigned surface_level; @@ -680,6 +679,7 @@ void r300_init_resource_functions(struct r300_context* r300); void r300_decompress_zmask(struct r300_context *r300); void r300_decompress_zmask_locked_unsafe(struct r300_context *r300); void r300_decompress_zmask_locked(struct r300_context *r300); +bool r300_is_blit_supported(enum pipe_format format); /* r300_flush.c */ void r300_flush(struct pipe_context *pipe, @@ -718,6 +718,13 @@ void r300_mark_fb_state_dirty(struct r300_context *r300, enum r300_fb_state_change change); void r300_mark_fs_code_dirty(struct r300_context *r300); +struct pipe_sampler_view * +r300_create_sampler_view_custom(struct pipe_context *pipe, + struct pipe_resource *texture, + const struct pipe_sampler_view *templ, + unsigned width0_override, + unsigned height0_override); + /* r300_state_derived.c */ void r300_update_derived_state(struct r300_context* r300); |