=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Add GL_ARB_shader_viewport_layer_array extension.
Alexandre Julliard
julliard at winehq.org
Tue Sep 25 14:56:34 CDT 2018
Module: wine
Branch: master
Commit: dbaaee8e4d72b929e86c590a9e40c48ea86468c4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbaaee8e4d72b929e86c590a9e40c48ea86468c4
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Sep 25 12:10:12 2018 +0200
wined3d: Add GL_ARB_shader_viewport_layer_array extension.
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/adapter_gl.c | 1 +
dlls/wined3d/glsl_shader.c | 2 ++
dlls/wined3d/wined3d_gl.h | 1 +
3 files changed, 4 insertions(+)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 1d360d1..1722438 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -113,6 +113,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
{"GL_ARB_shader_storage_buffer_object", ARB_SHADER_STORAGE_BUFFER_OBJECT},
{"GL_ARB_shader_texture_image_samples", ARB_SHADER_TEXTURE_IMAGE_SAMPLES},
{"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD },
+ {"GL_ARB_shader_viewport_layer_array", ARB_SHADER_VIEWPORT_LAYER_ARRAY},
{"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 },
{"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK },
{"GL_ARB_shading_language_packing", ARB_SHADING_LANGUAGE_PACKING },
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 5234808..0db7fdc 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8140,6 +8140,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context
shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n");
if (shader_glsl_use_explicit_attrib_location(gl_info))
shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n");
+ if (gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY])
+ shader_addline(buffer, "#extension GL_ARB_shader_viewport_layer_array : enable\n");
/* Base Declarations */
shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx);
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 525c298..06aa21c 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -93,6 +93,7 @@ enum wined3d_gl_extension
ARB_SAMPLER_OBJECTS,
ARB_SEAMLESS_CUBE_MAP,
ARB_SHADER_ATOMIC_COUNTERS,
+ ARB_SHADER_VIEWPORT_LAYER_ARRAY,
ARB_SHADER_BIT_ENCODING,
ARB_SHADER_IMAGE_LOAD_STORE,
ARB_SHADER_IMAGE_SIZE,
More information about the wine-cvs
mailing list