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' into master
[mesa.git]
/
src
/
gallium
/
drivers
/
trace
/
tr_context.h
diff --git
a/src/gallium/drivers/trace/tr_context.h
b/src/gallium/drivers/trace/tr_context.h
index 852b480765a03deb12402d543af51ff18ab6943c..feec9b6bbf32d605d9a032aa54ae6f75c9d0a33e 100644
(file)
--- a/
src/gallium/drivers/trace/tr_context.h
+++ b/
src/gallium/drivers/trace/tr_context.h
@@
-40,6
+40,8
@@
extern "C" {
#endif
#endif
+struct trace_screen;
+
struct trace_context
{
struct pipe_context base;
struct trace_context
{
struct pipe_context base;
@@
-51,11
+53,11
@@
struct trace_context
struct trace_shader *fs;
struct trace_shader *vs;
struct trace_shader *fs;
struct trace_shader *vs;
- struct trace_
texture *tex
[PIPE_MAX_SAMPLERS];
- unsigned num_
tex
s;
+ struct trace_
sampler_view *sampler_views
[PIPE_MAX_SAMPLERS];
+ unsigned num_
sampler_view
s;
- struct trace_
texture *vert_tex
[PIPE_MAX_VERTEX_SAMPLERS];
- unsigned num_vert_
tex
s;
+ struct trace_
sampler_view *vert_sampler_views
[PIPE_MAX_VERTEX_SAMPLERS];
+ unsigned num_vert_
sampler_view
s;
unsigned nr_cbufs;
struct trace_texture *cbufs[PIPE_MAX_COLOR_BUFS];
unsigned nr_cbufs;
struct trace_texture *cbufs[PIPE_MAX_COLOR_BUFS];
@@
-66,7
+68,7
@@
struct trace_context
struct trace_shader *fs;
struct trace_shader *vs;
struct trace_shader *fs;
struct trace_shader *vs;
- struct trace_
texture *tex
;
+ struct trace_
sampler_view *sampler_view
;
struct trace_texture *surf;
int blocker;
struct trace_texture *surf;
int blocker;
@@
-95,9
+97,8
@@
trace_context(struct pipe_context *pipe)
}
}
-
struct pipe_context *
struct pipe_context *
-trace_context_create(struct
pipe_screen *screen
,
+trace_context_create(struct
trace_screen *tr_scr
,
struct pipe_context *pipe);
void
struct pipe_context *pipe);
void