softpipe: s/tex_cache/fragment_tex_cache/
Just to be more consistant with the vertex and geometry tex cache fields.
This commit is contained in:
@@ -105,7 +105,7 @@ softpipe_destroy( struct pipe_context *pipe )
|
||||
pipe_surface_reference(&softpipe->framebuffer.zsbuf, NULL);
|
||||
|
||||
for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
|
||||
sp_destroy_tex_tile_cache(softpipe->tex_cache[i]);
|
||||
sp_destroy_tex_tile_cache(softpipe->fragment_tex_cache[i]);
|
||||
pipe_sampler_view_reference(&softpipe->sampler_views[i], NULL);
|
||||
}
|
||||
|
||||
@@ -174,8 +174,8 @@ softpipe_is_resource_referenced( struct pipe_context *pipe,
|
||||
|
||||
/* check if any of the tex_cache textures are this texture */
|
||||
for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
|
||||
if (softpipe->tex_cache[i] &&
|
||||
softpipe->tex_cache[i]->texture == texture)
|
||||
if (softpipe->fragment_tex_cache[i] &&
|
||||
softpipe->fragment_tex_cache[i]->texture == texture)
|
||||
return PIPE_REFERENCED_FOR_READ;
|
||||
}
|
||||
for (i = 0; i < PIPE_MAX_VERTEX_SAMPLERS; i++) {
|
||||
@@ -263,7 +263,7 @@ softpipe_create_context( struct pipe_screen *screen,
|
||||
softpipe->zsbuf_cache = sp_create_tile_cache( &softpipe->pipe );
|
||||
|
||||
for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
|
||||
softpipe->tex_cache[i] = sp_create_tex_tile_cache( &softpipe->pipe );
|
||||
softpipe->fragment_tex_cache[i] = sp_create_tex_tile_cache( &softpipe->pipe );
|
||||
for (i = 0; i < PIPE_MAX_VERTEX_SAMPLERS; i++) {
|
||||
softpipe->vertex_tex_cache[i] = sp_create_tex_tile_cache( &softpipe->pipe );
|
||||
}
|
||||
|
@@ -174,7 +174,7 @@ struct softpipe_context {
|
||||
struct softpipe_tile_cache *zsbuf_cache;
|
||||
|
||||
unsigned tex_timestamp;
|
||||
struct softpipe_tex_tile_cache *tex_cache[PIPE_MAX_SAMPLERS];
|
||||
struct softpipe_tex_tile_cache *fragment_tex_cache[PIPE_MAX_SAMPLERS];
|
||||
struct softpipe_tex_tile_cache *vertex_tex_cache[PIPE_MAX_VERTEX_SAMPLERS];
|
||||
struct softpipe_tex_tile_cache *geometry_tex_cache[PIPE_MAX_GEOMETRY_SAMPLERS];
|
||||
|
||||
|
@@ -52,7 +52,7 @@ softpipe_flush( struct pipe_context *pipe,
|
||||
|
||||
if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
|
||||
for (i = 0; i < softpipe->num_sampler_views; i++) {
|
||||
sp_flush_tex_tile_cache(softpipe->tex_cache[i]);
|
||||
sp_flush_tex_tile_cache(softpipe->fragment_tex_cache[i]);
|
||||
}
|
||||
for (i = 0; i < softpipe->num_vertex_sampler_views; i++) {
|
||||
sp_flush_tex_tile_cache(softpipe->vertex_tex_cache[i]);
|
||||
|
@@ -200,7 +200,7 @@ update_tgsi_samplers( struct softpipe_context *softpipe )
|
||||
softpipe_reset_sampler_variants( softpipe );
|
||||
|
||||
for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
|
||||
struct softpipe_tex_tile_cache *tc = softpipe->tex_cache[i];
|
||||
struct softpipe_tex_tile_cache *tc = softpipe->fragment_tex_cache[i];
|
||||
if (tc->texture) {
|
||||
struct softpipe_resource *spt = softpipe_resource(tc->texture);
|
||||
if (spt->timestamp != tc->timestamp) {
|
||||
|
@@ -201,7 +201,7 @@ softpipe_set_sampler_views(struct pipe_context *pipe,
|
||||
struct pipe_sampler_view *view = i < num ? views[i] : NULL;
|
||||
|
||||
pipe_sampler_view_reference(&softpipe->sampler_views[i], view);
|
||||
sp_tex_tile_cache_set_sampler_view(softpipe->tex_cache[i], view);
|
||||
sp_tex_tile_cache_set_sampler_view(softpipe->fragment_tex_cache[i], view);
|
||||
}
|
||||
|
||||
softpipe->num_sampler_views = num;
|
||||
@@ -403,7 +403,7 @@ softpipe_reset_sampler_variants(struct softpipe_context *softpipe)
|
||||
TGSI_PROCESSOR_FRAGMENT );
|
||||
|
||||
sp_sampler_variant_bind_texture( softpipe->tgsi.frag_samplers_list[i],
|
||||
softpipe->tex_cache[i],
|
||||
softpipe->fragment_tex_cache[i],
|
||||
texture );
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user