projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
drivers
/
softpipe
/
sp_tex_tile_cache.h
diff --git
a/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
b/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
index ac6886a3df1627ca0907025877006d4d134b045c..0794ffa0c5370404a7b48d362faecd7f1a805556 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_tex_tile_cache.h
+++ b/
src/gallium/drivers/softpipe/sp_tex_tile_cache.h
@@
-70,11
+70,11
@@
struct softpipe_tex_cached_tile
struct softpipe_tex_tile_cache
{
struct softpipe_tex_tile_cache
{
- struct pipe_
screen *screen
;
+ struct pipe_
context *pipe
;
struct pipe_transfer *transfer;
void *transfer_map;
struct pipe_transfer *transfer;
void *transfer_map;
- struct pipe_
textur
e *texture; /**< if caching a texture */
+ struct pipe_
resourc
e *texture; /**< if caching a texture */
unsigned timestamp;
struct softpipe_tex_cached_tile entries[NUM_ENTRIES];
unsigned timestamp;
struct softpipe_tex_cached_tile entries[NUM_ENTRIES];
@@
-83,12
+83,18
@@
struct softpipe_tex_tile_cache
void *tex_trans_map;
int tex_face, tex_level, tex_z;
void *tex_trans_map;
int tex_face, tex_level, tex_z;
+ unsigned swizzle_r;
+ unsigned swizzle_g;
+ unsigned swizzle_b;
+ unsigned swizzle_a;
+ unsigned format;
+
struct softpipe_tex_cached_tile *last_tile; /**< most recently retrieved tile */
};
extern struct softpipe_tex_tile_cache *
struct softpipe_tex_cached_tile *last_tile; /**< most recently retrieved tile */
};
extern struct softpipe_tex_tile_cache *
-sp_create_tex_tile_cache( struct pipe_
screen *screen
);
+sp_create_tex_tile_cache( struct pipe_
context *pipe
);
extern void
sp_destroy_tex_tile_cache(struct softpipe_tex_tile_cache *tc);
extern void
sp_destroy_tex_tile_cache(struct softpipe_tex_tile_cache *tc);
@@
-101,8
+107,8
@@
extern void
sp_tex_tile_cache_unmap_transfers(struct softpipe_tex_tile_cache *tc);
extern void
sp_tex_tile_cache_unmap_transfers(struct softpipe_tex_tile_cache *tc);
extern void
-sp_tex_tile_cache_set_
texture
(struct softpipe_tex_tile_cache *tc,
-
struct pipe_texture *texture
);
+sp_tex_tile_cache_set_
sampler_view
(struct softpipe_tex_tile_cache *tc,
+
struct pipe_sampler_view *view
);
void
sp_tex_tile_cache_validate_texture(struct softpipe_tex_tile_cache *tc);
void
sp_tex_tile_cache_validate_texture(struct softpipe_tex_tile_cache *tc);