Mesa (master): mesa: pass target through to driver when choosing texture format

[Ilia Mirkin]

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

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Tue May  6 02:51:45 2014 -0400

mesa: pass target through to driver when choosing texture format

This only matters for TextureView where the texObj's target has not been
set yet, in all other instances, texObj->target should be the same as
the passed-in target parameter.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/main/teximage.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index c7f301c..845ba80 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3024,7 +3024,7 @@ _mesa_choose_texture_format(struct gl_context *ctx,
    }
 
    /* choose format from scratch */
-   f = ctx->Driver.ChooseTextureFormat(ctx, texObj->Target, internalFormat,
+   f = ctx->Driver.ChooseTextureFormat(ctx, target, internalFormat,
                                        format, type);
    ASSERT(f != MESA_FORMAT_NONE);
    return f;