diff options
| author | Ilia Mirkin <[email protected]> | 2014-10-01 19:43:38 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2014-10-02 12:18:21 -0400 |
| commit | 786f01c492bb6a90a4835389666dd0c5c984ea6a (patch) | |
| tree | 7d11c59631d64f5345eb2ef43cbd7bd2eebc3b0c /src/gallium/auxiliary/hud | |
| parent | db8cd4d519d8b4cb2c05901e4f1a80a41ae67b2b (diff) | |
gallium/hud: use u_sampler_view_default_template helper
The existing code was not setting several fields, most importantly the
target, which is required on nv50/nvc0.
Signed-off-by: Ilia Mirkin <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/hud')
| -rw-r--r-- | src/gallium/auxiliary/hud/hud_context.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/hud/hud_context.c b/src/gallium/auxiliary/hud/hud_context.c index b6e018423ed..18a878118cb 100644 --- a/src/gallium/auxiliary/hud/hud_context.c +++ b/src/gallium/auxiliary/hud/hud_context.c @@ -44,6 +44,7 @@ #include "util/u_inlines.h" #include "util/u_memory.h" #include "util/u_math.h" +#include "util/u_sampler.h" #include "util/u_simple_shaders.h" #include "util/u_string.h" #include "util/u_upload_mgr.h" @@ -1050,12 +1051,8 @@ hud_create(struct pipe_context *pipe, struct cso_context *cso) } /* sampler view */ - memset(&view_templ, 0, sizeof(view_templ)); - view_templ.format = hud->font.texture->format; - view_templ.swizzle_r = PIPE_SWIZZLE_RED; - view_templ.swizzle_g = PIPE_SWIZZLE_GREEN; - view_templ.swizzle_b = PIPE_SWIZZLE_BLUE; - view_templ.swizzle_a = PIPE_SWIZZLE_ALPHA; + u_sampler_view_default_template( + &view_templ, hud->font.texture, hud->font.texture->format); hud->font_sampler_view = pipe->create_sampler_view(pipe, hud->font.texture, &view_templ); |