Module: wine Branch: stable Commit: 8be01c226e2819957b9656b123dc4e180a8cbdcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be01c226e2819957b9656b123...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu Jan 26 13:07:33 2017 +0100
wined3d: Implement buffer samplers.
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 (cherry picked from commit 63b8360e4daeb6a1b86be1a400db9c32ad042be4) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/wined3d/glsl_shader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fedc216..78e1764 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -59,7 +59,7 @@ static const struct resource_type_info[] = { {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ - {1, 1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, 1, "Buffer"}, /* WINED3D_SHADER_RESOURCE_BUFFER */ {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ {2, 2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ @@ -2032,6 +2032,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shadow_sampler = glsl_is_shadow_sampler(shader, ps_args, entry->resource_idx, entry->sampler_idx); switch (reg_maps->resource_info[entry->resource_idx].type) { + case WINED3D_SHADER_RESOURCE_BUFFER: + sampler_type = "samplerBuffer"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: if (shadow_sampler) sampler_type = "sampler1DShadow";