X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsoftpipe%2Fsp_state_sampler.c;h=c10fd918fd8fdeb6fe98e085327e8ffd30581c91;hb=f676c700cc3faa26ab90a36b7af15cbc282db069;hp=79d9516ad9cf949fd0841cb6b71e5f7d40b5e762;hpb=ca12aefdacd22fb42e3f1d3852db4c12de886554;p=mesa.git diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c index 79d9516ad9c..c10fd918fd8 100644 --- a/src/gallium/drivers/softpipe/sp_state_sampler.c +++ b/src/gallium/drivers/softpipe/sp_state_sampler.c @@ -1,6 +1,6 @@ /************************************************************************** * - * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * Copyright 2007 VMware, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -18,7 +18,7 @@ * 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 TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * 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. @@ -31,8 +31,8 @@ #include "util/u_memory.h" #include "util/u_inlines.h" +#include "util/u_format.h" -#include "draw/draw_context.h" #include "draw/draw_context.h" #include "sp_context.h" @@ -40,135 +40,53 @@ #include "sp_texture.h" #include "sp_tex_sample.h" #include "sp_tex_tile_cache.h" +#include "sp_screen.h" +#include "state_tracker/sw_winsys.h" -struct sp_sampler { - struct pipe_sampler_state base; - struct sp_sampler_varient *varients; - struct sp_sampler_varient *current; -}; - -static struct sp_sampler *sp_sampler( struct pipe_sampler_state *sampler ) -{ - return (struct sp_sampler *)sampler; -} - - -void * -softpipe_create_sampler_state(struct pipe_context *pipe, - const struct pipe_sampler_state *sampler) -{ - struct sp_sampler *sp_sampler = CALLOC_STRUCT(sp_sampler); - - sp_sampler->base = *sampler; - sp_sampler->varients = NULL; - - return (void *)sp_sampler; -} - - -void +/** + * Bind a range [start, start+num-1] of samplers for a shader stage. + */ +static void softpipe_bind_sampler_states(struct pipe_context *pipe, - unsigned num, void **sampler) -{ - struct softpipe_context *softpipe = softpipe_context(pipe); - unsigned i; - - assert(num <= PIPE_MAX_SAMPLERS); - - /* Check for no-op */ - if (num == softpipe->num_samplers && - !memcmp(softpipe->sampler, sampler, num * sizeof(void *))) - return; - - draw_flush(softpipe->draw); - - for (i = 0; i < num; ++i) - softpipe->sampler[i] = sampler[i]; - for (i = num; i < PIPE_MAX_SAMPLERS; ++i) - softpipe->sampler[i] = NULL; - - softpipe->num_samplers = num; - - softpipe->dirty |= SP_NEW_SAMPLER; -} - - -void -softpipe_bind_vertex_sampler_states(struct pipe_context *pipe, - unsigned num_samplers, - void **samplers) + enum pipe_shader_type shader, + unsigned start, + unsigned num, + void **samplers) { struct softpipe_context *softpipe = softpipe_context(pipe); unsigned i; - assert(num_samplers <= PIPE_MAX_VERTEX_SAMPLERS); - - /* Check for no-op */ - if (num_samplers == softpipe->num_vertex_samplers && - !memcmp(softpipe->vertex_samplers, samplers, num_samplers * sizeof(void *))) - return; + assert(shader < PIPE_SHADER_TYPES); + assert(start + num <= ARRAY_SIZE(softpipe->samplers[shader])); draw_flush(softpipe->draw); - for (i = 0; i < num_samplers; ++i) - softpipe->vertex_samplers[i] = samplers[i]; - for (i = num_samplers; i < PIPE_MAX_VERTEX_SAMPLERS; ++i) - softpipe->vertex_samplers[i] = NULL; - - softpipe->num_vertex_samplers = num_samplers; - - softpipe->dirty |= SP_NEW_SAMPLER; -} - -void -softpipe_bind_geometry_sampler_states(struct pipe_context *pipe, - unsigned num_samplers, - void **samplers) -{ - struct softpipe_context *softpipe = softpipe_context(pipe); - unsigned i; - - assert(num_samplers <= PIPE_MAX_GEOMETRY_SAMPLERS); - - /* Check for no-op */ - if (num_samplers == softpipe->num_geometry_samplers && - !memcmp(softpipe->geometry_samplers, samplers, num_samplers * sizeof(void *))) - return; - - draw_flush(softpipe->draw); - - for (i = 0; i < num_samplers; ++i) - softpipe->geometry_samplers[i] = samplers[i]; - for (i = num_samplers; i < PIPE_MAX_GEOMETRY_SAMPLERS; ++i) - softpipe->geometry_samplers[i] = NULL; - - softpipe->num_geometry_samplers = num_samplers; - - softpipe->dirty |= SP_NEW_SAMPLER; -} + /* set the new samplers */ + for (i = 0; i < num; i++) { + softpipe->samplers[shader][start + i] = samplers[i]; + } + /* find highest non-null samplers[] entry */ + { + unsigned j = MAX2(softpipe->num_samplers[shader], start + num); + while (j > 0 && softpipe->samplers[shader][j - 1] == NULL) + j--; + softpipe->num_samplers[shader] = j; + } -struct pipe_sampler_view * -softpipe_create_sampler_view(struct pipe_context *pipe, - struct pipe_resource *resource, - const struct pipe_sampler_view *templ) -{ - struct pipe_sampler_view *view = CALLOC_STRUCT(pipe_sampler_view); - - if (view) { - *view = *templ; - view->reference.count = 1; - view->texture = NULL; - pipe_resource_reference(&view->texture, resource); - view->context = pipe; + if (shader == PIPE_SHADER_VERTEX || shader == PIPE_SHADER_GEOMETRY) { + draw_set_samplers(softpipe->draw, + shader, + softpipe->samplers[shader], + softpipe->num_samplers[shader]); } - return view; + softpipe->dirty |= SP_NEW_SAMPLER; } -void +static void softpipe_sampler_view_destroy(struct pipe_context *pipe, struct pipe_sampler_view *view) { @@ -179,238 +97,233 @@ softpipe_sampler_view_destroy(struct pipe_context *pipe, void softpipe_set_sampler_views(struct pipe_context *pipe, + enum pipe_shader_type shader, + unsigned start, unsigned num, struct pipe_sampler_view **views) { struct softpipe_context *softpipe = softpipe_context(pipe); uint i; - assert(num <= PIPE_MAX_SAMPLERS); - - /* Check for no-op */ - if (num == softpipe->num_sampler_views && - !memcmp(softpipe->sampler_views, views, num * sizeof(struct pipe_sampler_view *))) - return; + assert(shader < PIPE_SHADER_TYPES); + assert(start + num <= ARRAY_SIZE(softpipe->sampler_views[shader])); draw_flush(softpipe->draw); - for (i = 0; i < PIPE_MAX_SAMPLERS; i++) { - struct pipe_sampler_view *view = i < num ? views[i] : NULL; + /* set the new sampler views */ + for (i = 0; i < num; i++) { + struct sp_sampler_view *sp_sviewsrc; + struct sp_sampler_view *sp_sviewdst = + &softpipe->tgsi.sampler[shader]->sp_sview[start + i]; + struct pipe_sampler_view **pview = &softpipe->sampler_views[shader][start + i]; + pipe_sampler_view_reference(pview, views[i]); + sp_tex_tile_cache_set_sampler_view(softpipe->tex_cache[shader][start + i], + views[i]); + /* + * We don't really have variants, however some bits are different per shader, + * so just copy? + */ + sp_sviewsrc = (struct sp_sampler_view *)*pview; + if (sp_sviewsrc) { + memcpy(sp_sviewdst, sp_sviewsrc, sizeof(*sp_sviewsrc)); + sp_sviewdst->compute_lambda = softpipe_get_lambda_func(&sp_sviewdst->base, shader); + sp_sviewdst->cache = softpipe->tex_cache[shader][start + i]; + } + else { + memset(sp_sviewdst, 0, sizeof(*sp_sviewsrc)); + } + } - pipe_sampler_view_reference(&softpipe->sampler_views[i], view); - sp_tex_tile_cache_set_sampler_view(softpipe->tex_cache[i], view); + + /* find highest non-null sampler_views[] entry */ + { + unsigned j = MAX2(softpipe->num_sampler_views[shader], start + num); + while (j > 0 && softpipe->sampler_views[shader][j - 1] == NULL) + j--; + softpipe->num_sampler_views[shader] = j; } - softpipe->num_sampler_views = num; + if (shader == PIPE_SHADER_VERTEX || shader == PIPE_SHADER_GEOMETRY) { + draw_set_sampler_views(softpipe->draw, + shader, + softpipe->sampler_views[shader], + softpipe->num_sampler_views[shader]); + } softpipe->dirty |= SP_NEW_TEXTURE; } -void -softpipe_set_vertex_sampler_views(struct pipe_context *pipe, - unsigned num, - struct pipe_sampler_view **views) +static void +softpipe_delete_sampler_state(struct pipe_context *pipe, + void *sampler) { - struct softpipe_context *softpipe = softpipe_context(pipe); - uint i; - - assert(num <= PIPE_MAX_VERTEX_SAMPLERS); - - /* Check for no-op */ - if (num == softpipe->num_vertex_sampler_views && - !memcmp(softpipe->vertex_sampler_views, views, num * sizeof(struct pipe_sampler_view *))) { - return; - } - - draw_flush(softpipe->draw); - - for (i = 0; i < PIPE_MAX_VERTEX_SAMPLERS; i++) { - struct pipe_sampler_view *view = i < num ? views[i] : NULL; - - pipe_sampler_view_reference(&softpipe->vertex_sampler_views[i], view); - sp_tex_tile_cache_set_sampler_view(softpipe->vertex_tex_cache[i], view); - } - - softpipe->num_vertex_sampler_views = num; - - softpipe->dirty |= SP_NEW_TEXTURE; + FREE( sampler ); } -void -softpipe_set_geometry_sampler_views(struct pipe_context *pipe, - unsigned num, - struct pipe_sampler_view **views) + +static void +prepare_shader_sampling( + struct softpipe_context *sp, + unsigned num, + struct pipe_sampler_view **views, + enum pipe_shader_type shader_type, + struct pipe_resource *mapped_tex[PIPE_MAX_SHADER_SAMPLER_VIEWS]) { - struct softpipe_context *softpipe = softpipe_context(pipe); - uint i; - assert(num <= PIPE_MAX_GEOMETRY_SAMPLERS); + unsigned i; + uint32_t row_stride[PIPE_MAX_TEXTURE_LEVELS]; + uint32_t img_stride[PIPE_MAX_TEXTURE_LEVELS]; + uint32_t mip_offsets[PIPE_MAX_TEXTURE_LEVELS]; + const void *addr; - /* Check for no-op */ - if (num == softpipe->num_geometry_sampler_views && - !memcmp(softpipe->geometry_sampler_views, views, num * sizeof(struct pipe_sampler_view *))) { + assert(num <= PIPE_MAX_SHADER_SAMPLER_VIEWS); + if (!num) return; - } - - draw_flush(softpipe->draw); - for (i = 0; i < PIPE_MAX_GEOMETRY_SAMPLERS; i++) { + for (i = 0; i < PIPE_MAX_SHADER_SAMPLER_VIEWS; i++) { struct pipe_sampler_view *view = i < num ? views[i] : NULL; - pipe_sampler_view_reference(&softpipe->geometry_sampler_views[i], view); - sp_tex_tile_cache_set_sampler_view(softpipe->geometry_tex_cache[i], view); + if (view) { + struct pipe_resource *tex = view->texture; + struct softpipe_resource *sp_tex = softpipe_resource(tex); + unsigned width0 = tex->width0; + unsigned num_layers = tex->depth0; + unsigned first_level = 0; + unsigned last_level = 0; + + /* We're referencing the texture's internal data, so save a + * reference to it. + */ + pipe_resource_reference(&mapped_tex[i], tex); + + if (!sp_tex->dt) { + /* regular texture - setup array of mipmap level offsets */ + MAYBE_UNUSED struct pipe_resource *res = view->texture; + int j; + + if (view->target != PIPE_BUFFER) { + first_level = view->u.tex.first_level; + last_level = view->u.tex.last_level; + assert(first_level <= last_level); + assert(last_level <= res->last_level); + addr = sp_tex->data; + + for (j = first_level; j <= last_level; j++) { + mip_offsets[j] = sp_tex->level_offset[j]; + row_stride[j] = sp_tex->stride[j]; + img_stride[j] = sp_tex->img_stride[j]; + } + if (tex->target == PIPE_TEXTURE_1D_ARRAY || + tex->target == PIPE_TEXTURE_2D_ARRAY || + tex->target == PIPE_TEXTURE_CUBE || + tex->target == PIPE_TEXTURE_CUBE_ARRAY) { + num_layers = view->u.tex.last_layer - view->u.tex.first_layer + 1; + for (j = first_level; j <= last_level; j++) { + mip_offsets[j] += view->u.tex.first_layer * + sp_tex->img_stride[j]; + } + if (view->target == PIPE_TEXTURE_CUBE || + view->target == PIPE_TEXTURE_CUBE_ARRAY) { + assert(num_layers % 6 == 0); + } + assert(view->u.tex.first_layer <= view->u.tex.last_layer); + assert(view->u.tex.last_layer < res->array_size); + } + } + else { + unsigned view_blocksize = util_format_get_blocksize(view->format); + addr = sp_tex->data; + /* probably don't really need to fill that out */ + mip_offsets[0] = 0; + row_stride[0] = 0; + img_stride[0] = 0; + + /* everything specified in number of elements here. */ + width0 = view->u.buf.size / view_blocksize; + addr = (uint8_t *)addr + view->u.buf.offset; + assert(view->u.buf.offset + view->u.buf.size <= res->width0); + } + } + else { + /* display target texture/surface */ + /* + * XXX: Where should this be unmapped? + */ + struct softpipe_screen *screen = softpipe_screen(tex->screen); + struct sw_winsys *winsys = screen->winsys; + addr = winsys->displaytarget_map(winsys, sp_tex->dt, + PIPE_TRANSFER_READ); + row_stride[0] = sp_tex->stride[0]; + img_stride[0] = sp_tex->img_stride[0]; + mip_offsets[0] = 0; + assert(addr); + } + draw_set_mapped_texture(sp->draw, + shader_type, + i, + width0, tex->height0, num_layers, + first_level, last_level, + addr, + row_stride, img_stride, mip_offsets); + } } - - softpipe->num_geometry_sampler_views = num; - - softpipe->dirty |= SP_NEW_TEXTURE; } /** - * Find/create an sp_sampler_varient object for sampling the given texture, - * sampler and tex unit. - * - * Note that the tex unit is significant. We can't re-use a sampler - * varient for multiple texture units because the sampler varient contains - * the texture object pointer. If the texture object pointer were stored - * somewhere outside the sampler varient, we could re-use samplers for - * multiple texture units. + * Called during state validation when SP_NEW_TEXTURE is set. */ -static struct sp_sampler_varient * -get_sampler_varient( unsigned unit, - struct sp_sampler *sampler, - struct pipe_resource *resource, - unsigned processor ) +void +softpipe_prepare_vertex_sampling(struct softpipe_context *sp, + unsigned num, + struct pipe_sampler_view **views) { - struct softpipe_resource *sp_texture = softpipe_resource(resource); - struct sp_sampler_varient *v = NULL; - union sp_sampler_key key; - - /* if this fails, widen the key.unit field and update this assertion */ - assert(PIPE_MAX_SAMPLERS <= 16); - - key.bits.target = sp_texture->base.target; - key.bits.is_pot = sp_texture->pot; - key.bits.processor = processor; - key.bits.unit = unit; - key.bits.pad = 0; - - if (sampler->current && - key.value == sampler->current->key.value) { - v = sampler->current; - } - - if (v == NULL) { - for (v = sampler->varients; v; v = v->next) - if (v->key.value == key.value) - break; - - if (v == NULL) { - v = sp_create_sampler_varient( &sampler->base, key ); - v->next = sampler->varients; - sampler->varients = v; - } - } - - sampler->current = v; - return v; + prepare_shader_sampling(sp, num, views, PIPE_SHADER_VERTEX, + sp->mapped_vs_tex); } - - - void -softpipe_reset_sampler_varients(struct softpipe_context *softpipe) +softpipe_cleanup_vertex_sampling(struct softpipe_context *ctx) { - int i; - - /* It's a bit hard to build these samplers ahead of time -- don't - * really know which samplers are going to be used for vertex and - * fragment programs. - */ - for (i = 0; i <= softpipe->vs->max_sampler; i++) { - if (softpipe->vertex_samplers[i]) { - struct pipe_resource *texture = NULL; - - if (softpipe->vertex_sampler_views[i]) { - texture = softpipe->vertex_sampler_views[i]->texture; - } - - softpipe->tgsi.vert_samplers_list[i] = - get_sampler_varient( i, - sp_sampler(softpipe->vertex_samplers[i]), - texture, - TGSI_PROCESSOR_VERTEX ); - - sp_sampler_varient_bind_texture( softpipe->tgsi.vert_samplers_list[i], - softpipe->vertex_tex_cache[i], - texture ); - } - } - - if (softpipe->gs) { - for (i = 0; i <= softpipe->gs->max_sampler; i++) { - if (softpipe->geometry_samplers[i]) { - struct pipe_resource *texture = NULL; - - if (softpipe->geometry_sampler_views[i]) { - texture = softpipe->geometry_sampler_views[i]->texture; - } - - softpipe->tgsi.geom_samplers_list[i] = - get_sampler_varient( - i, - sp_sampler(softpipe->geometry_samplers[i]), - texture, - TGSI_PROCESSOR_GEOMETRY ); - - sp_sampler_varient_bind_texture( - softpipe->tgsi.geom_samplers_list[i], - softpipe->geometry_tex_cache[i], - texture ); - } - } + unsigned i; + for (i = 0; i < ARRAY_SIZE(ctx->mapped_vs_tex); i++) { + pipe_resource_reference(&ctx->mapped_vs_tex[i], NULL); } +} - for (i = 0; i <= softpipe->fs->info.file_max[TGSI_FILE_SAMPLER]; i++) { - if (softpipe->sampler[i]) { - struct pipe_resource *texture = NULL; - - if (softpipe->sampler_views[i]) { - texture = softpipe->sampler_views[i]->texture; - } - softpipe->tgsi.frag_samplers_list[i] = - get_sampler_varient( i, - sp_sampler(softpipe->sampler[i]), - texture, - TGSI_PROCESSOR_FRAGMENT ); +/** + * Called during state validation when SP_NEW_TEXTURE is set. + */ +void +softpipe_prepare_geometry_sampling(struct softpipe_context *sp, + unsigned num, + struct pipe_sampler_view **views) +{ + prepare_shader_sampling(sp, num, views, PIPE_SHADER_GEOMETRY, + sp->mapped_gs_tex); +} - sp_sampler_varient_bind_texture( softpipe->tgsi.frag_samplers_list[i], - softpipe->tex_cache[i], - texture ); - } +void +softpipe_cleanup_geometry_sampling(struct softpipe_context *ctx) +{ + unsigned i; + for (i = 0; i < ARRAY_SIZE(ctx->mapped_gs_tex); i++) { + pipe_resource_reference(&ctx->mapped_gs_tex[i], NULL); } } - void -softpipe_delete_sampler_state(struct pipe_context *pipe, - void *sampler) +softpipe_init_sampler_funcs(struct pipe_context *pipe) { - struct sp_sampler *sp_sampler = (struct sp_sampler *)sampler; - struct sp_sampler_varient *v, *tmp; - - for (v = sp_sampler->varients; v; v = tmp) { - tmp = v->next; - sp_sampler_varient_destroy(v); - } + pipe->create_sampler_state = softpipe_create_sampler_state; + pipe->bind_sampler_states = softpipe_bind_sampler_states; + pipe->delete_sampler_state = softpipe_delete_sampler_state; - FREE( sampler ); + pipe->create_sampler_view = softpipe_create_sampler_view; + pipe->set_sampler_views = softpipe_set_sampler_views; + pipe->sampler_view_destroy = softpipe_sampler_view_destroy; } - -