Module: wine Branch: master Commit: 5061abe43707db20d7dcfe94a2c63be6f3718401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5061abe43707db20d7dcfe94a2...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu Feb 2 12:43:38 2017 +0100
wined3d: Add ARB_compute_shader extension.
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
---
dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 14 insertions(+)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 54f1cc7..c47052c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -113,6 +113,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, + {"GL_ARB_compute_shader", ARB_COMPUTE_SHADER }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, @@ -2633,6 +2634,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glClipControl) /* GL_ARB_color_buffer_float */ USE_GL_FUNC(glClampColorARB) + /* GL_ARB_compute_shader */ + USE_GL_FUNC(glDispatchCompute) + USE_GL_FUNC(glDispatchComputeIndirect) /* GL_ARB_copy_buffer */ USE_GL_FUNC(glCopyBufferSubData) /* GL_ARB_debug_output */ @@ -3557,6 +3561,13 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_PIXEL], gl_max); } } + if (gl_info->supported[ARB_COMPUTE_SHADER]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMPUTE_UNIFORM_BLOCKS, &gl_max); + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE] = min(gl_max, WINED3D_MAX_CBS); + TRACE("Max compute uniform blocks: %u (%d).\n", + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE], gl_max); + } if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_UNIFORM_BLOCKS, &gl_max); @@ -3674,6 +3685,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)},
+ {ARB_COMPUTE_SHADER, MAKEDWORD_VERSION(4, 3)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f0c19fc..d8e8202 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8801,6 +8801,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * soon as we introduce them, adjusting the GL / GLSL version checks * accordingly. */ if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] + && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 88da05a..5f57a41 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -46,6 +46,7 @@ enum wined3d_gl_extension ARB_BLEND_FUNC_EXTENDED, ARB_CLIP_CONTROL, ARB_COLOR_BUFFER_FLOAT, + ARB_COMPUTE_SHADER, ARB_COPY_BUFFER, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT,