wined3d: Add ARB_shading_language_packing extension.

For f32tof16 and f16tof32 instructions. 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>

wined3d: Add ARB_shading_language_packing extension.
1ea53005 · Józef Kucia · Alexandre Julliard · 84a290c1 · 1ea53005 · 1ea53005
Commit 1ea53005 authored Jan 28, 2017 by Józef Kucia Committed by Alexandre Julliard Jan 30, 2017
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

directx.c dlls/wined3d/directx.c +2 -0

glsl_shader.c dlls/wined3d/glsl_shader.c +4 -1

wined3d_gl.h dlls/wined3d/wined3d_gl.h +1 -0

No files found.
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -150,6 +150,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
    {"GL_ARB_shader_image_size",            ARB_SHADER_IMAGE_SIZE         },
    {"GL_ARB_shader_texture_lod",           ARB_SHADER_TEXTURE_LOD        },
    {"GL_ARB_shading_language_100",         ARB_SHADING_LANGUAGE_100      },
+    {"GL_ARB_shading_language_packing",     ARB_SHADING_LANGUAGE_PACKING  },
    {"GL_ARB_shadow",                       ARB_SHADOW                    },
    {"GL_ARB_stencil_texturing",            ARB_STENCIL_TEXTURING         },
    {"GL_ARB_sync",                         ARB_SYNC                      },
@@ -3656,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD 
        {ARB_INTERNALFORMAT_QUERY,         MAKEDWORD_VERSION(4, 2)},
        {ARB_MAP_BUFFER_ALIGNMENT,         MAKEDWORD_VERSION(4, 2)},
        {ARB_SHADER_IMAGE_LOAD_STORE,      MAKEDWORD_VERSION(4, 2)},
+        {ARB_SHADING_LANGUAGE_PACKING,     MAKEDWORD_VERSION(4, 2)},
        {ARB_TEXTURE_COMPRESSION_BPTC,     MAKEDWORD_VERSION(4, 2)},
        {ARB_TEXTURE_STORAGE,              MAKEDWORD_VERSION(4, 2)},


--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -6130,6 +6130,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer,
        shader_addline(buffer, "#extension GL_ARB_shader_image_load_store : enable\n");
    if (gl_info->supported[ARB_SHADER_IMAGE_SIZE])
        shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n");
+    if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING])
+        shader_addline(buffer, "#extension GL_ARB_shading_language_packing : enable\n");
    if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS])
        shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n");
    if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT])
@@ -8728,7 +8730,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s
    if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3]
            && gl_info->supported[ARB_DERIVATIVE_CONTROL]
            && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]
-            && gl_info->supported[ARB_SHADER_IMAGE_SIZE])
+            && gl_info->supported[ARB_SHADER_IMAGE_SIZE]
+            && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING])
        shader_model = 5;
    else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2]
            && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS]

--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -83,6 +83,7 @@ enum wined3d_gl_extension
    ARB_SHADER_IMAGE_SIZE,
    ARB_SHADER_TEXTURE_LOD,
    ARB_SHADING_LANGUAGE_100,
+    ARB_SHADING_LANGUAGE_PACKING,
    ARB_SHADOW,
    ARB_STENCIL_TEXTURING,
    ARB_SYNC,