summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/trace
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2013-09-12 15:18:16 -0600
committerBrian Paul <brianp@vmware.com>2013-10-03 14:05:28 -0600
commitdd4816e3fd949ae8b431b370288ee1aa2dd0bf0c (patch)
treef65ae164400e285d00e8816b9a599c38a5076149 /src/gallium/drivers/trace
parent5807105ad784e9527385b923c23a188a4563bda8 (diff)
downloadexternal_mesa3d-dd4816e3fd949ae8b431b370288ee1aa2dd0bf0c.zip
external_mesa3d-dd4816e3fd949ae8b431b370288ee1aa2dd0bf0c.tar.gz
external_mesa3d-dd4816e3fd949ae8b431b370288ee1aa2dd0bf0c.tar.bz2
trace: remove old bind_*_sampler_states() functions
Diffstat (limited to 'src/gallium/drivers/trace')
-rw-r--r--src/gallium/drivers/trace/tr_context.c82
1 files changed, 7 insertions, 75 deletions
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index 787028a..1b34986 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -302,86 +302,21 @@ trace_context_bind_sampler_states(struct pipe_context *_pipe,
/* remove this when we have pipe->bind_sampler_states(..., start, ...) */
assert(start == 0);
- if (pipe->bind_sampler_states) {
- trace_dump_call_begin("pipe_context", "bind_sampler_states");
+ trace_dump_call_begin("pipe_context", "bind_sampler_states");
- trace_dump_arg(ptr, pipe);
- trace_dump_arg(uint, shader);
- trace_dump_arg(uint, start);
- trace_dump_arg(uint, num_states);
- trace_dump_arg_array(ptr, states, num_states);
-
- pipe->bind_sampler_states(pipe, shader, start, num_states, states);
- }
- else {
- switch (shader) {
- case PIPE_SHADER_VERTEX:
- trace_dump_call_begin("pipe_context", "bind_vertex_sampler_states");
- break;
- case PIPE_SHADER_GEOMETRY:
- trace_dump_call_begin("pipe_context", "bind_geometry_sampler_states");
- break;
- case PIPE_SHADER_FRAGMENT:
- trace_dump_call_begin("pipe_context", "bind_fragment_sampler_states");
- break;
- default:
- debug_error("Unexpected shader in trace_context_bind_sampler_states()");
- }
+ trace_dump_arg(ptr, pipe);
+ trace_dump_arg(uint, shader);
+ trace_dump_arg(uint, start);
+ trace_dump_arg(uint, num_states);
+ trace_dump_arg_array(ptr, states, num_states);
- trace_dump_arg(ptr, pipe);
- trace_dump_arg(uint, num_states);
- trace_dump_arg_array(ptr, states, num_states);
-
- switch (shader) {
- case PIPE_SHADER_VERTEX:
- pipe->bind_vertex_sampler_states(pipe, num_states, states);
- break;
- case PIPE_SHADER_GEOMETRY:
- pipe->bind_geometry_sampler_states(pipe, num_states, states);
- break;
- case PIPE_SHADER_FRAGMENT:
- pipe->bind_fragment_sampler_states(pipe, num_states, states);
- break;
- default:
- debug_error("Unexpected shader in trace_context_bind_sampler_states()");
- }
- }
+ pipe->bind_sampler_states(pipe, shader, start, num_states, states);
trace_dump_call_end();
}
static INLINE void
-trace_context_bind_fragment_sampler_states(struct pipe_context *_pipe,
- unsigned num,
- void **states)
-{
- trace_context_bind_sampler_states(_pipe, PIPE_SHADER_FRAGMENT,
- 0, num, states);
-}
-
-
-static INLINE void
-trace_context_bind_vertex_sampler_states(struct pipe_context *_pipe,
- unsigned num,
- void **states)
-{
- trace_context_bind_sampler_states(_pipe, PIPE_SHADER_VERTEX,
- 0, num, states);
-}
-
-
-static INLINE void
-trace_context_bind_geometry_sampler_states(struct pipe_context *_pipe,
- unsigned num,
- void **states)
-{
- trace_context_bind_sampler_states(_pipe, PIPE_SHADER_GEOMETRY,
- 0, num, states);
-}
-
-
-static INLINE void
trace_context_delete_sampler_state(struct pipe_context *_pipe,
void *state)
{
@@ -1593,9 +1528,6 @@ trace_context_create(struct trace_screen *tr_scr,
TR_CTX_INIT(delete_blend_state);
TR_CTX_INIT(create_sampler_state);
TR_CTX_INIT(bind_sampler_states);
- TR_CTX_INIT(bind_fragment_sampler_states);
- TR_CTX_INIT(bind_vertex_sampler_states);
- TR_CTX_INIT(bind_geometry_sampler_states);
TR_CTX_INIT(delete_sampler_state);
TR_CTX_INIT(create_rasterizer_state);
TR_CTX_INIT(bind_rasterizer_state);