AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/xorg: updates for CSO interface changes

Browse Source
This commit is contained in:
Brian Paul
2012-08-03 11:56:36 -06:00
parent 459dd56897
commit c61d3fe8bd
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/xorg/xorg_composite.c
+7 -5
View File
@@ -418,10 +418,12 @@ bind_samplers(struct exa_context *exa, int op,
exa->bound_sampler_views[1] = src_view;
}
cso_set_samplers(exa->renderer->cso, exa->num_bound_samplers,
cso_set_samplers(exa->renderer->cso, PIPE_SHADER_FRAGMENT,
exa->num_bound_samplers,
(const struct pipe_sampler_state **)samplers);
cso_set_fragment_sampler_views(exa->renderer->cso, exa->num_bound_samplers,
exa->bound_sampler_views);
cso_set_sampler_views(exa->renderer->cso, PIPE_SHADER_FRAGMENT,
exa->num_bound_samplers,
exa->bound_sampler_views);
}
@@ -550,8 +552,8 @@ boolean xorg_solid_bind_state(struct exa_context *exa,
renderer_bind_destination(exa->renderer, dst_surf,
pixmap->width, pixmap->height);
bind_blend_state(exa, PictOpSrc, NULL, NULL, NULL);
cso_set_samplers(exa->renderer->cso, 0, NULL);
cso_set_fragment_sampler_views(exa->renderer->cso, 0, NULL);
cso_set_samplers(exa->renderer->cso, PIPE_SHADER_FRAGMENT, 0, NULL);
cso_set_sampler_views(exa->renderer->cso, PIPE_SHADER_FRAGMENT, 0, NULL);
shader = xorg_shaders_get(exa->renderer->shaders, vs_traits, fs_traits);
cso_set_vertex_shader_handle(exa->renderer->cso, shader.vs);
src/gallium/state_trackers/xorg/xorg_xv.c
+2 -2
View File
@@ -482,9 +482,9 @@ bind_samplers(struct xorg_xv_port_priv *port)
samplers[2] = &sampler;
cso_set_samplers(port->r->cso, 3,
cso_set_samplers(port->r->cso, PIPE_SHADER_FRAGMENT, 3,
(const struct pipe_sampler_state **)samplers);
cso_set_fragment_sampler_views(port->r->cso, 3, dst_views);
cso_set_sampler_views(port->r->cso, PIPE_SHADER_FRAGMENT, 3, dst_views);
}
static int