aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_atom_sampler.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-22 14:29:51 +0000
committermarha <marha@users.sourceforge.net>2011-05-22 14:29:51 +0000
commit016747a04df9d4474489fe3b3d1c0f11a713148b (patch)
tree69722f37ac06c00d6674c7bf2df6597753b418e6 /mesalib/src/mesa/state_tracker/st_atom_sampler.c
parent32a666fa1f26defd3b4e508b75f1acf6e2900a40 (diff)
parent52011cfedaa930d61d8f60b283a2051093727582 (diff)
downloadvcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.gz
vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.bz2
vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_sampler.c')
-rw-r--r--mesalib/src/mesa/state_tracker/st_atom_sampler.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
index e05316067..627a13387 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
@@ -133,6 +133,8 @@ static void convert_sampler(struct st_context *st,
}
msamp = _mesa_get_samplerobj(st->ctx, texUnit);
+
+ memset(sampler, 0, sizeof(*sampler));
sampler->wrap_s = gl_wrap_xlate(msamp->WrapS);
sampler->wrap_t = gl_wrap_xlate(msamp->WrapT);
sampler->wrap_r = gl_wrap_xlate(msamp->WrapR);
@@ -201,8 +203,6 @@ update_vertex_samplers(struct st_context *st)
for (su = 0; su < st->ctx->Const.MaxVertexTextureImageUnits; su++) {
struct pipe_sampler_state *sampler = st->state.vertex_samplers + su;
- memset(sampler, 0, sizeof(*sampler));
-
if (vprog->Base.SamplersUsed & (1 << su)) {
GLuint texUnit;
@@ -232,7 +232,6 @@ update_fragment_samplers(struct st_context *st)
for (su = 0; su < st->ctx->Const.MaxTextureImageUnits; su++) {
struct pipe_sampler_state *sampler = st->state.samplers + su;
- memset(sampler, 0, sizeof(*sampler));
if (fprog->Base.SamplersUsed & (1 << su)) {
GLuint texUnit;