[PATCH 1/5] wined3d: Add support for WINED3DFMT_R16_UINT format.
Józef Kucia
jkucia at codeweavers.com
Tue Feb 9 03:53:12 CST 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/wined3d/directx.c | 2 ++
dlls/wined3d/utils.c | 5 +++++
dlls/wined3d/wined3d_gl.h | 1 +
3 files changed, 8 insertions(+)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 329da15..2a0c40f 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3562,6 +3562,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD
if (gl_version >= MAKEDWORD_VERSION(2, 0))
gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE;
+ if (gl_version >= MAKEDWORD_VERSION(3, 0))
+ gl_info->supported[WINED3D_GL_VERSION_3_0] = TRUE;
if (gl_version >= MAKEDWORD_VERSION(3, 2))
gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 4d00281..f5eadf5 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -199,6 +199,7 @@ static const struct wined3d_format_base_flags format_base_flags[] =
{WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT},
{WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_FLAG_INTEGER},
{WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_FLAG_INTEGER},
+ {WINED3DFMT_R16_UINT, WINED3DFMT_FLAG_INTEGER},
};
struct wined3d_format_block_info
@@ -1138,6 +1139,10 @@ static const struct wined3d_format_texture_info format_texture_info[] =
WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING
| WINED3DFMT_FLAG_RENDERTARGET,
ARB_TEXTURE_RG, NULL},
+ {WINED3DFMT_R16_UINT, GL_R16UI, GL_R16UI, 0,
+ GL_RED_INTEGER, GL_UNSIGNED_SHORT, 0,
+ WINED3DFMT_FLAG_TEXTURE,
+ WINED3D_GL_VERSION_3_0, NULL},
/* Luminance */
{WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0,
GL_LUMINANCE, GL_UNSIGNED_BYTE, 0,
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index be4e308..4ecee13 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -168,6 +168,7 @@ enum wined3d_gl_extension
WINED3D_GL_NORMALIZED_TEXRECT,
WINED3D_GL_LEGACY_CONTEXT,
WINED3D_GL_VERSION_2_0,
+ WINED3D_GL_VERSION_3_0,
WINED3D_GL_VERSION_3_2,
WINED3D_GL_EXT_COUNT,
--
2.4.10
More information about the wine-patches
mailing list