Module: wine Branch: master Commit: 4d162e2e6c767b5c88c4428426f12a97fbce2ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d162e2e6c767b5c88c4428426...
Author: Józef Kucia jkucia@codeweavers.com Date: Fri Jan 29 09:44:42 2016 +0100
wined3d: Add support for WINED3DFMT_R16_UNORM format.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/utils.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6891a1e..be6b32a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -104,6 +104,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_B10G10R10A2_UNORM, 10, 10, 10, 2, 20, 10, 0, 30, 4, 0, 0}, {WINED3DFMT_R16G16B16A16_UNORM, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, {WINED3DFMT_R8G8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 2, 0, 0}, + {WINED3DFMT_R16_UNORM, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, /* Luminance */ {WINED3DFMT_L8_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_L8A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 8, 2, 0, 0}, @@ -1129,6 +1130,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R16_UNORM, GL_R16, GL_R16, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, + GL_RED, GL_UNSIGNED_SHORT, 0, + ARB_TEXTURE_RG, NULL}, /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0,
-
Alexandre Julliard