Mesa (master): mesa: set TargetIndex in VDPAURegister*SurfaceNV (v2)

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 6a4dc1ad492d7d53c5c17e6eb975f0ed44b6741d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a4dc1ad492d7d53c5c17e6eb975f0ed44b6741d

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Oct 27 11:11:19 2015 +0100

mesa: set TargetIndex in VDPAURegister*SurfaceNV (v2)

We initialized Target, but not TargetIndex.
This is required since 7d7dd1871174905dfdd3ca874a09d9.

v2: do it in the right place. Noticed by Brian Paul.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92645

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/main/vdpau.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/vdpau.c b/src/mesa/main/vdpau.c
index 0efa56e..44be3a3 100644
--- a/src/mesa/main/vdpau.c
+++ b/src/mesa/main/vdpau.c
@@ -163,9 +163,10 @@ register_surface(struct gl_context *ctx, GLboolean isOutput,
          return (GLintptr)NULL;
       }
 
-      if (tex->Target == 0)
+      if (tex->Target == 0) {
          tex->Target = target;
-      else if (tex->Target != target) {
+         tex->TargetIndex = _mesa_tex_target_to_index(ctx, target);
+      } else if (tex->Target != target) {
          _mesa_unlock_texture(ctx, tex);
          free(surf);
          _mesa_error(ctx, GL_INVALID_OPERATION,