diff options
| author | Jason Ekstrand <[email protected]> | 2016-04-01 14:59:38 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-04-01 15:16:21 -0700 |
| commit | 95106f6bfbbb87b702e4bbba98e2eaea71924cd9 (patch) | |
| tree | 9650d284ec7f7417b2bcf8a906dfa43dfc547cf7 /src/gallium/auxiliary/draw/draw_gs.c | |
| parent | cf2257069cbde19fd177a02c079206914aac5d14 (diff) | |
| parent | 14c46954c910efb1db94a068a866c7259deaa9d9 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_gs.c')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_gs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c index fcef31b4ff5..14db2d6f39d 100644 --- a/src/gallium/auxiliary/draw/draw_gs.c +++ b/src/gallium/auxiliary/draw/draw_gs.c @@ -681,7 +681,7 @@ void draw_geometry_shader_prepare(struct draw_geometry_shader *shader, if (!use_llvm && shader && shader->machine->Tokens != shader->state.tokens) { tgsi_exec_machine_bind_shader(shader->machine, shader->state.tokens, - draw->gs.tgsi.sampler); + draw->gs.tgsi.sampler, draw->gs.tgsi.image); } } |