=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Add support for multisample samplers.

Alexandre Julliard julliard at winehq.org
Mon Feb 5 16:48:26 CST 2018


Module: wine
Branch: master
Commit: 780ec0c1f932476c9a33cac8aa6adf78b74c2b28
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=780ec0c1f932476c9a33cac8aa6adf78b74c2b28

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Mon Feb  5 13:13:38 2018 +0100

wined3d: Add support for multisample samplers.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/glsl_shader.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index e18a99f..03684b6 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2591,6 +2591,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
                     sampler_type = "samplerCubeArray";
                 break;
 
+            case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS:
+                sampler_type = "sampler2DMS";
+                break;
+
+            case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY:
+                sampler_type = "sampler2DMSArray";
+                break;
+
             default:
                 sampler_type = "unsupported_sampler";
                 FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[entry->resource_idx].type);
@@ -7446,6 +7454,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer,
         shader_addline(buffer, "#extension GL_ARB_texture_cube_map_array : enable\n");
     if (gl_info->supported[ARB_TEXTURE_GATHER])
         shader_addline(buffer, "#extension GL_ARB_texture_gather : enable\n");
+    if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE])
+        shader_addline(buffer, "#extension GL_ARB_texture_multisample : 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])




More information about the wine-cvs mailing list