projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/7.8'
[mesa.git]
/
src
/
gallium
/
drivers
/
softpipe
/
sp_flush.c
diff --git
a/src/gallium/drivers/softpipe/sp_flush.c
b/src/gallium/drivers/softpipe/sp_flush.c
index e38b767cf2c03fed2b9177f1dbb5f69e803f9042..508fe8f764d06aabb1b4e8102a3128041d85a4f6 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_flush.c
+++ b/
src/gallium/drivers/softpipe/sp_flush.c
@@
-34,11
+34,9
@@
#include "draw/draw_context.h"
#include "sp_flush.h"
#include "sp_context.h"
#include "draw/draw_context.h"
#include "sp_flush.h"
#include "sp_context.h"
-#include "sp_surface.h"
#include "sp_state.h"
#include "sp_tile_cache.h"
#include "sp_tex_tile_cache.h"
#include "sp_state.h"
#include "sp_tile_cache.h"
#include "sp_tex_tile_cache.h"
-#include "sp_winsys.h"
void
void
@@
-52,9
+50,12
@@
softpipe_flush( struct pipe_context *pipe,
draw_flush(softpipe->draw);
if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
draw_flush(softpipe->draw);
if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
- for (i = 0; i < softpipe->num_
texture
s; i++) {
+ for (i = 0; i < softpipe->num_
sampler_view
s; i++) {
sp_flush_tex_tile_cache(softpipe->tex_cache[i]);
}
sp_flush_tex_tile_cache(softpipe->tex_cache[i]);
}
+ for (i = 0; i < softpipe->num_vertex_sampler_views; i++) {
+ sp_flush_tex_tile_cache(softpipe->vertex_tex_cache[i]);
+ }
}
if (flags & PIPE_FLUSH_SWAPBUFFERS) {
}
if (flags & PIPE_FLUSH_SWAPBUFFERS) {
@@
-92,9
+93,9
@@
softpipe_flush( struct pipe_context *pipe,
static unsigned frame_no = 1;
static char filename[256];
util_snprintf(filename, sizeof(filename), "cbuf_%u.bmp", frame_no);
static unsigned frame_no = 1;
static char filename[256];
util_snprintf(filename, sizeof(filename), "cbuf_%u.bmp", frame_no);
- debug_dump_surface_bmp(filename, softpipe->framebuffer.cbufs[0]);
+ debug_dump_surface_bmp(
softpipe,
filename, softpipe->framebuffer.cbufs[0]);
util_snprintf(filename, sizeof(filename), "zsbuf_%u.bmp", frame_no);
util_snprintf(filename, sizeof(filename), "zsbuf_%u.bmp", frame_no);
- debug_dump_surface_bmp(filename, softpipe->framebuffer.zsbuf);
+ debug_dump_surface_bmp(
softpipe,
filename, softpipe->framebuffer.zsbuf);
++frame_no;
}
#endif
++frame_no;
}
#endif