Mesa (master): gallium/util: fix pipe_sampler_view_reference() calls
Brian Paul
brianp at kemper.freedesktop.org
Fri Jun 25 20:12:59 UTC 2010
Module: Mesa
Branch: master
Commit: 4ae530370d8b66092681b9e818012dcb205db518
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ae530370d8b66092681b9e818012dcb205db518
Author: Brian Paul <brianp at vmware.com>
Date: Fri Jun 25 14:12:30 2010 -0600
gallium/util: fix pipe_sampler_view_reference() calls
The conditionals aren't needed.
---
src/gallium/auxiliary/util/u_blitter.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index dfe2101..42d37cc 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -260,9 +260,7 @@ void util_blitter_destroy(struct blitter_context *blitter)
if (ctx->sampler_state[i])
pipe->delete_sampler_state(pipe, ctx->sampler_state[i]);
- if (ctx->sampler_view) {
- pipe_sampler_view_reference(&ctx->sampler_view, NULL);
- }
+ pipe_sampler_view_reference(&ctx->sampler_view, NULL);
pipe_resource_reference(&ctx->vbuf, NULL);
FREE(ctx);
@@ -736,10 +734,7 @@ void util_blitter_copy_region(struct blitter_context *blitter,
u_sampler_view_default_template(&viewTempl, src, src->format);
view = pipe->create_sampler_view(pipe, src, &viewTempl);
- if (ctx->sampler_view) {
- pipe_sampler_view_reference(&ctx->sampler_view, NULL);
- }
- ctx->sampler_view = view;
+ pipe_sampler_view_reference(&ctx->sampler_view, view);
/* Set rasterizer state, shaders, and textures. */
pipe->bind_rasterizer_state(pipe, ctx->rs_state);
More information about the mesa-commit
mailing list