From: Henri Verbeet hverbeet@codeweavers.com
Much like we do for e.g. shader_glsl_generate_vertex_shader(). --- dlls/wined3d/glsl_shader.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 933f134830a..4b857d33f73 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7661,13 +7661,14 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in
/* Context activation is done by the caller. */ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_gl *context_gl, - struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, - const struct wined3d_shader *shader, const struct ps_compile_args *args, - struct ps_np2fixup_info *np2fixup_info) + struct shader_glsl_priv *priv, const struct wined3d_shader *shader, + const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) { const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_version *version = ®_maps->shader_version; const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_string_buffer *buffer = &priv->shader_buffer; const char *prefix = shader_glsl_get_prefix(version->type); BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); unsigned int i, extra_constants_needed = 0; @@ -8537,8 +8538,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g }
static GLuint find_glsl_fragment_shader(const struct wined3d_context_gl *context_gl, - struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, - struct wined3d_shader *shader, + struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { struct glsl_ps_compiled_shader *gl_shaders, *new_array; @@ -8602,8 +8602,8 @@ static GLuint find_glsl_fragment_shader(const struct wined3d_context_gl *context memset(np2fixup, 0, sizeof(*np2fixup)); *np2fixup_info = args->np2_fixup ? np2fixup : NULL;
- string_buffer_clear(buffer); - ret = shader_glsl_generate_fragment_shader(context_gl, buffer, string_buffers, shader, args, np2fixup); + string_buffer_clear(&priv->shader_buffer); + ret = shader_glsl_generate_fragment_shader(context_gl, priv, shader, args, np2fixup); gl_shaders[shader_data->num_gl_shaders++].id = ret;
return ret; @@ -10368,8 +10368,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; find_ps_compile_args(state, pshader, context_gl->c.stream_info.position_transformed, &ps_compile_args, &context_gl->c); - ps_id = find_glsl_fragment_shader(context_gl, &priv->shader_buffer, &priv->string_buffers, - pshader, &ps_compile_args, &np2fixup_info); + ps_id = find_glsl_fragment_shader(context_gl, priv, pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; } else if (priv->fragment_pipe == &glsl_fragment_pipe
From: Henri Verbeet hverbeet@codeweavers.com
--- dlls/wined3d/glsl_shader.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b857d33f73..886be9eea45 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8496,12 +8496,13 @@ static void shader_glsl_generate_shader_epilogue(const struct wined3d_shader_con
/* Context activation is done by the caller. */ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_gl *context_gl, - struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, - const struct wined3d_shader *shader) + struct shader_glsl_priv *priv, const struct wined3d_shader *shader) { const struct wined3d_shader_thread_group_size *thread_group_size = &shader->u.cs.thread_group_size; + struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_string_buffer *buffer = &priv->shader_buffer; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; unsigned int i; @@ -10177,7 +10178,7 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, TRACE("Compiling compute shader %p.\n", shader);
string_buffer_clear(buffer); - shader_id = shader_glsl_generate_compute_shader(context_gl, buffer, &priv->string_buffers, shader); + shader_id = shader_glsl_generate_compute_shader(context_gl, priv, shader); gl_shaders[shader_data->num_gl_shaders++].id = shader_id;
program_id = GL_EXTCALL(glCreateProgram());
From: Henri Verbeet hverbeet@codeweavers.com
Note that this won't compile very many shaders until vkd3d-shader's GLSL support is much more complete. --- dlls/wined3d/glsl_shader.c | 222 +++++++++++++++++++++++++++++++++ dlls/wined3d/shader.c | 22 ++++ dlls/wined3d/shader_spirv.c | 22 ---- dlls/wined3d/wined3d_main.c | 5 + dlls/wined3d/wined3d_private.h | 3 + 5 files changed, 252 insertions(+), 22 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 886be9eea45..fc42b7a2b35 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -125,6 +125,8 @@ struct constant_heap /* GLSL shader private data */ struct shader_glsl_priv { + bool use_vkd3d; + struct wined3d_string_buffer shader_buffer; struct wined3d_string_buffer_list string_buffers; struct wine_rb_tree program_lookup; @@ -634,6 +636,202 @@ void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint pro print_glsl_info_log(gl_info, program, TRUE); }
+static struct vkd3d_shader_resource_binding *create_resource_bindings(const struct wined3d_gl_info *gl_info, + enum wined3d_shader_type shader_type, unsigned int *count) +{ + struct vkd3d_shader_resource_binding *bindings; + enum vkd3d_shader_visibility visibility; + unsigned int base, i; + + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, shader_type, &base, count); + if (!(bindings = calloc(*count, sizeof(*bindings)))) + return NULL; + + visibility = vkd3d_shader_visibility_from_wined3d(shader_type); + for (i = 0; i < *count; ++i) + { + bindings[i].type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; + bindings[i].register_space = 0; + bindings[i].register_index = i; + bindings[i].shader_visibility = visibility; + bindings[i].flags = VKD3D_SHADER_BINDING_FLAG_BUFFER; + bindings[i].binding.set = 0; + bindings[i].binding.binding = base + i; + bindings[i].binding.count = 1; + } + + return bindings; +} + +static struct vkd3d_shader_combined_resource_sampler *create_combined_resource_sampler_bindings( + const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, unsigned int *count) +{ + struct vkd3d_shader_combined_resource_sampler *bindings; + unsigned int bind_idx, shader_sampler_count, base, i; + struct wined3d_shader_sampler_map_entry *entry; + enum vkd3d_shader_visibility visibility; + const unsigned int *tex_unit_map; + + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, + &shader->reg_maps.shader_version, &base, count); + + shader_sampler_count = shader->reg_maps.sampler_map.count; + if (shader_sampler_count > *count) + { + FIXME("Shader %p needs %u samplers, but only %u are supported.\n", + shader, shader_sampler_count, *count); + return NULL; + } + *count = min(shader_sampler_count, *count); + + if (!(bindings = calloc(*count, sizeof(*bindings)))) + return NULL; + + visibility = vkd3d_shader_visibility_from_wined3d(shader->reg_maps.shader_version.type); + for (i = 0; i < *count; ++i) + { + entry = &shader->reg_maps.sampler_map.entries[i]; + bind_idx = base + entry->bind_idx; + if (tex_unit_map) + bind_idx = tex_unit_map[bind_idx]; + + bindings[i].resource_space = 0; + bindings[i].resource_index = entry->resource_idx; + bindings[i].sampler_space = 0; + bindings[i].sampler_index = entry->sampler_idx; + bindings[i].shader_visibility = visibility; + bindings[i].flags = VKD3D_SHADER_BINDING_FLAG_IMAGE; + bindings[i].binding.set = 0; + bindings[i].binding.binding = bind_idx; + bindings[i].binding.count = 1; + } + + return bindings; +} + +static GLuint shader_glsl_generate_vkd3d_shader(const struct wined3d_context_gl *context_gl, + struct shader_glsl_priv *priv, const struct wined3d_shader *shader, GLenum gl_shader_type) +{ + const struct wined3d_shader_version *version = &shader->reg_maps.shader_version; + struct vkd3d_shader_combined_resource_sampler *combined_samplers; + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct vkd3d_shader_transform_feedback_info xfb_info; + unsigned int binding_count, combined_sampler_count; + struct vkd3d_shader_interface_info interface_info; + const struct wined3d_stream_output_desc *so_desc; + struct vkd3d_shader_resource_binding *bindings; + struct vkd3d_shader_compile_info info; + struct vkd3d_shader_code glsl; + GLuint shader_id; + char *messages; + int ret; + + static const struct vkd3d_shader_compile_option compile_options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_6}, + }; + + if (version->type == WINED3D_SHADER_TYPE_GEOMETRY && (so_desc = shader->u.gs.so_desc)) + { + xfb_info.type = VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO; + xfb_info.next = NULL; + xfb_info.elements = (const struct vkd3d_shader_transform_feedback_element *)so_desc->elements; + xfb_info.element_count = so_desc->element_count; + xfb_info.buffer_strides = so_desc->buffer_strides; + xfb_info.buffer_stride_count = so_desc->buffer_stride_count; + + interface_info.next = &xfb_info; + } + else + { + interface_info.next = NULL; + } + + if (!(bindings = create_resource_bindings(gl_info, version->type, &binding_count))) + { + ERR("Failed to create resource bindings.\n"); + return 0; + } + + if (!(combined_samplers = create_combined_resource_sampler_bindings(context_gl, shader, &combined_sampler_count))) + { + ERR("Failed to create combined sampler bindings.\n"); + free(bindings); + return 0; + } + + interface_info.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; + interface_info.bindings = bindings; + interface_info.binding_count = binding_count; + interface_info.push_constant_buffers = NULL; + interface_info.push_constant_buffer_count = 0; + interface_info.combined_samplers = combined_samplers; + interface_info.combined_sampler_count = combined_sampler_count; + interface_info.uav_counters = NULL; + interface_info.uav_counter_count = 0; + + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + info.next = &interface_info; + if (shader->source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE) + { + info.source.code = shader->function; + info.source.size = shader->functionLength; + } + else + { + info.source.code = shader->byte_code; + info.source.size = shader->byte_code_size; + } + info.source_type = shader->source_type; + info.target_type = VKD3D_SHADER_TARGET_GLSL; + info.options = compile_options; + info.option_count = ARRAY_SIZE(compile_options); + info.log_level = VKD3D_SHADER_LOG_WARNING; + info.source_name = NULL; + + ret = vkd3d_shader_compile(&info, &glsl, &messages); + if (messages && *messages && FIXME_ON(d3d_shader)) + { + const char *ptr, *end, *line; + + FIXME("Shader log:\n"); + ptr = messages; + end = ptr + strlen(ptr); + while ((line = wined3d_get_line(&ptr, end))) + { + FIXME(" %.*s", (int)(ptr - line), line); + } + FIXME("\n"); + } + vkd3d_shader_free_messages(messages); + free(combined_samplers); + free(bindings); + + if (ret < 0) + { + ERR("Failed to compile shader, ret %d.\n", ret); + return 0; + } + + if (!(shader_id = GL_EXTCALL(glCreateShader(gl_shader_type)))) + { + ERR("Failed to create shader.\n"); + vkd3d_shader_free_shader_code(&glsl); + return 0; + } + + TRACE("Compiling shader object %u.\n", shader_id); + GL_EXTCALL(glShaderSource(shader_id, 1, (const GLchar **)&glsl.code, (const GLint *)&glsl.size)); + checkGLcall("glShaderSource"); + GL_EXTCALL(glCompileShader(shader_id)); + checkGLcall("glCompileShader"); + print_glsl_info_log(gl_info, shader_id, FALSE); + + vkd3d_shader_free_shader_code(&glsl); + + return shader_id; +} + static BOOL shader_glsl_use_layout_qualifier(const struct wined3d_gl_info *gl_info) { /* Layout qualifiers were introduced in GLSL 1.40. The Nvidia Legacy GPU @@ -7676,6 +7874,9 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ GLuint shader_id; uint32_t map;
+ if (priv->use_vkd3d) + return shader_glsl_generate_vkd3d_shader(context_gl, priv, shader, GL_FRAGMENT_SHADER); + memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; priv_ctx.cur_ps_args = args; @@ -8041,6 +8242,9 @@ static GLuint shader_glsl_generate_vertex_shader(const struct wined3d_context_gl GLuint shader_id; unsigned int i;
+ if (priv->use_vkd3d) + return shader_glsl_generate_vkd3d_shader(context_gl, priv, shader, GL_VERTEX_SHADER); + memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; priv_ctx.cur_vs_args = args; @@ -8186,6 +8390,9 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context_gl * GLuint shader_id; unsigned int i;
+ if (priv->use_vkd3d) + return shader_glsl_generate_vkd3d_shader(context_gl, priv, shader, GL_TESS_CONTROL_SHADER); + memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; @@ -8280,6 +8487,9 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id;
+ if (priv->use_vkd3d) + return shader_glsl_generate_vkd3d_shader(context_gl, priv, shader, GL_TESS_EVALUATION_SHADER); + memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; priv_ctx.cur_ds_args = args; @@ -8379,6 +8589,9 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_ unsigned int i, j; GLuint shader_id;
+ if (shader->function && priv->use_vkd3d) + return shader_glsl_generate_vkd3d_shader(context_gl, priv, shader, GL_GEOMETRY_SHADER); + memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; @@ -8507,6 +8720,9 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g GLuint shader_id; unsigned int i;
+ if (priv->use_vkd3d) + return shader_glsl_generate_vkd3d_shader(context_gl, priv, shader, GL_COMPUTE_SHADER); + memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; @@ -11156,6 +11372,12 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win if (!(priv = calloc(1, sizeof(*priv)))) return E_OUTOFMEMORY;
+ if (wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_GLSL_VKD3D) + { + TRACE("Using %s.\n", vkd3d_shader_get_version(NULL, NULL)); + priv->use_vkd3d = true; + } + string_buffer_list_init(&priv->string_buffers);
if (!(vertex_priv = vertex_pipe->vp_alloc(&glsl_shader_backend, priv))) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 78b92526f03..e6a3b4a33bb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -306,6 +306,28 @@ const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HA return shader_opcode_names[handler_idx]; }
+enum vkd3d_shader_visibility vkd3d_shader_visibility_from_wined3d(enum wined3d_shader_type shader_type) +{ + switch (shader_type) + { + case WINED3D_SHADER_TYPE_VERTEX: + return VKD3D_SHADER_VISIBILITY_VERTEX; + case WINED3D_SHADER_TYPE_HULL: + return VKD3D_SHADER_VISIBILITY_HULL; + case WINED3D_SHADER_TYPE_DOMAIN: + return VKD3D_SHADER_VISIBILITY_DOMAIN; + case WINED3D_SHADER_TYPE_GEOMETRY: + return VKD3D_SHADER_VISIBILITY_GEOMETRY; + case WINED3D_SHADER_TYPE_PIXEL: + return VKD3D_SHADER_VISIBILITY_PIXEL; + case WINED3D_SHADER_TYPE_COMPUTE: + return VKD3D_SHADER_VISIBILITY_COMPUTE; + default: + ERR("Invalid shader type %s.\n", debug_shader_type(shader_type)); + return VKD3D_SHADER_VISIBILITY_ALL; + } +} + static const char *shader_semantic_name_from_usage(enum wined3d_decl_usage usage) { if (usage >= ARRAY_SIZE(semantic_names)) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 4e9b291a0ce..38d4dc0d81d 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -116,28 +116,6 @@ struct wined3d_shader_spirv_shader_interface struct vkd3d_shader_transform_feedback_info xfb_info; };
-static enum vkd3d_shader_visibility vkd3d_shader_visibility_from_wined3d(enum wined3d_shader_type shader_type) -{ - switch (shader_type) - { - case WINED3D_SHADER_TYPE_VERTEX: - return VKD3D_SHADER_VISIBILITY_VERTEX; - case WINED3D_SHADER_TYPE_HULL: - return VKD3D_SHADER_VISIBILITY_HULL; - case WINED3D_SHADER_TYPE_DOMAIN: - return VKD3D_SHADER_VISIBILITY_DOMAIN; - case WINED3D_SHADER_TYPE_GEOMETRY: - return VKD3D_SHADER_VISIBILITY_GEOMETRY; - case WINED3D_SHADER_TYPE_PIXEL: - return VKD3D_SHADER_VISIBILITY_PIXEL; - case WINED3D_SHADER_TYPE_COMPUTE: - return VKD3D_SHADER_VISIBILITY_COMPUTE; - default: - ERR("Invalid shader type %s.\n", debug_shader_type(shader_type)); - return VKD3D_SHADER_VISIBILITY_ALL; - } -} - static void shader_spirv_handle_instruction(const struct wined3d_shader_instruction *ins) { } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 458d560c539..cd20fe8b80d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -353,6 +353,11 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if (!get_config_key(hkey, appkey, env, "shader_backend", buffer, size)) { + if (!stricmp(buffer, "glsl-vkd3d")) + { + ERR_(winediag)("Using the vkd3d-shader GLSL shader backend.\n"); + wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL_VKD3D; + } if (!stricmp(buffer, "glsl")) { ERR_(winediag)("Using the GLSL shader backend.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ef99272b53..c4ddfede5ba 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -466,6 +466,7 @@ enum wined3d_shader_backend { WINED3D_SHADER_BACKEND_AUTO, WINED3D_SHADER_BACKEND_GLSL, + WINED3D_SHADER_BACKEND_GLSL_VKD3D, };
#define WINED3D_CSMT_ENABLE 0x00000001 @@ -4330,6 +4331,8 @@ HRESULT shader_generate_code(const struct wined3d_shader *shader, struct wined3d const DWORD *start, const DWORD *end); BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage);
+enum vkd3d_shader_visibility vkd3d_shader_visibility_from_wined3d(enum wined3d_shader_type shader_type); + static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) { switch (reg->type)
This merge request was approved by Elizabeth Figura.
-
Elizabeth Figura (＠zfigura) -
Henri Verbeet
-
Henri Verbeet (＠hverbeet)