[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit bcff7a1016bf7abc9a11874ba78cfaf530b72732
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Mar 8 20:27:14 2012 +0100

    wined3d: Use ARB_texture_rg for WINED3DFMT_R16G16_UNORM textures when available.
    (cherry picked from commit 6eb5c891ac367588f3060edf5a22f7c33549cf91)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index e570a13..76a1af3 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -729,6 +729,10 @@ static const struct wined3d_format_texture_info format_texture_info[] =
             GL_RGB,                     GL_UNSIGNED_SHORT,                6,
             WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING,
             WINED3D_GL_EXT_NONE,        convert_r16g16},
+    {WINED3DFMT_R16G16_UNORM,           GL_RG16,                          GL_RG16,                                0,
+            GL_RG,                      GL_UNSIGNED_SHORT,                0,
+            WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET,
+            ARB_TEXTURE_RG,             NULL},
     {WINED3DFMT_B10G10R10A2_UNORM,      GL_RGB10_A2,                      GL_RGB10_A2,                            0,
             GL_BGRA,                    GL_UNSIGNED_INT_2_10_10_10_REV,   0,
             WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET,

-- 
Debian Wine packaging