Mesa (master): st/mesa: remove sampler associated with buffer texture in pbo logic
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Dec 20 05:28:24 UTC 2018
Module: Mesa
Branch: master
Commit: 1250383e367fef6fdb954d69a7444634c6788f5d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1250383e367fef6fdb954d69a7444634c6788f5d
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri Dec 14 20:06:54 2018 -0500
st/mesa: remove sampler associated with buffer texture in pbo logic
A long time ago, when this was first implemented, not having a sampler
bound would cause problems on Fermi. I didn't work out the reasons, but
the solution was simple -- just put the samplers back in.
Since then, regular texturing paths appear to have lost their associated
samplers which required a fuller investigation and fix in nouveau. Now
that this is done, this code should no longer need a sampler state for
fetching texels from a buffer texture.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/mesa/state_tracker/st_cb_texture.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index b8cc616d8f..45918e425a 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1192,7 +1192,6 @@ try_pbo_upload_common(struct gl_context *ctx,
return false;
cso_save_state(cso, (CSO_BIT_FRAGMENT_SAMPLER_VIEWS |
- CSO_BIT_FRAGMENT_SAMPLERS |
CSO_BIT_VERTEX_ELEMENTS |
CSO_BIT_AUX_VERTEX_BUFFER_SLOT |
CSO_BIT_FRAMEBUFFER |
@@ -1216,8 +1215,6 @@ try_pbo_upload_common(struct gl_context *ctx,
{
struct pipe_sampler_view templ;
struct pipe_sampler_view *sampler_view;
- struct pipe_sampler_state sampler = {0};
- const struct pipe_sampler_state *samplers[1] = {&sampler};
memset(&templ, 0, sizeof(templ));
templ.target = PIPE_BUFFER;
@@ -1237,8 +1234,6 @@ try_pbo_upload_common(struct gl_context *ctx,
cso_set_sampler_views(cso, PIPE_SHADER_FRAGMENT, 1, &sampler_view);
pipe_sampler_view_reference(&sampler_view, NULL);
-
- cso_set_samplers(cso, PIPE_SHADER_FRAGMENT, 1, samplers);
}
/* Framebuffer_state */
More information about the mesa-commit
mailing list