wined3d: Handle dcl_output_control_point_count instruction.
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>
This commit is contained in:
parent
ab27a5902d
commit
b0d2cf8e3f
|
@ -10290,7 +10290,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
|
||||||
/* WINED3DSIH_DCL_INPUT_SIV */ shader_glsl_nop,
|
/* WINED3DSIH_DCL_INPUT_SIV */ shader_glsl_nop,
|
||||||
/* WINED3DSIH_DCL_INTERFACE */ NULL,
|
/* WINED3DSIH_DCL_INTERFACE */ NULL,
|
||||||
/* WINED3DSIH_DCL_OUTPUT */ shader_glsl_nop,
|
/* WINED3DSIH_DCL_OUTPUT */ shader_glsl_nop,
|
||||||
/* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ NULL,
|
/* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ shader_glsl_nop,
|
||||||
/* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop,
|
/* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop,
|
||||||
/* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop,
|
/* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop,
|
||||||
/* WINED3DSIH_DCL_RESOURCE_RAW */ shader_glsl_nop,
|
/* WINED3DSIH_DCL_RESOURCE_RAW */ shader_glsl_nop,
|
||||||
|
|
|
@ -1053,6 +1053,13 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
|
||||||
FIXME("Invalid instruction %#x for shader type %#x.\n",
|
FIXME("Invalid instruction %#x for shader type %#x.\n",
|
||||||
ins.handler_idx, shader_version.type);
|
ins.handler_idx, shader_version.type);
|
||||||
}
|
}
|
||||||
|
else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT)
|
||||||
|
{
|
||||||
|
if (shader_version.type == WINED3D_SHADER_TYPE_HULL)
|
||||||
|
shader->u.hs.output_vertex_count = ins.declaration.count;
|
||||||
|
else
|
||||||
|
FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type);
|
||||||
|
}
|
||||||
else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY)
|
else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY)
|
||||||
{
|
{
|
||||||
if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY)
|
if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY)
|
||||||
|
|
|
@ -3708,17 +3708,18 @@ struct wined3d_vertex_shader
|
||||||
struct wined3d_shader_attribute attributes[MAX_ATTRIBS];
|
struct wined3d_shader_attribute attributes[MAX_ATTRIBS];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct wined3d_hull_shader
|
||||||
|
{
|
||||||
|
unsigned int output_vertex_count;
|
||||||
|
enum wined3d_tessellator_output_primitive tessellator_output_primitive;
|
||||||
|
enum wined3d_tessellator_partitioning tessellator_partitioning;
|
||||||
|
};
|
||||||
|
|
||||||
struct wined3d_domain_shader
|
struct wined3d_domain_shader
|
||||||
{
|
{
|
||||||
enum wined3d_tessellator_domain tessellator_domain;
|
enum wined3d_tessellator_domain tessellator_domain;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wined3d_hull_shader
|
|
||||||
{
|
|
||||||
enum wined3d_tessellator_output_primitive tessellator_output_primitive;
|
|
||||||
enum wined3d_tessellator_partitioning tessellator_partitioning;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct wined3d_geometry_shader
|
struct wined3d_geometry_shader
|
||||||
{
|
{
|
||||||
enum wined3d_primitive_type input_type;
|
enum wined3d_primitive_type input_type;
|
||||||
|
@ -3782,8 +3783,8 @@ struct wined3d_shader
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
struct wined3d_vertex_shader vs;
|
struct wined3d_vertex_shader vs;
|
||||||
struct wined3d_domain_shader ds;
|
|
||||||
struct wined3d_hull_shader hs;
|
struct wined3d_hull_shader hs;
|
||||||
|
struct wined3d_domain_shader ds;
|
||||||
struct wined3d_geometry_shader gs;
|
struct wined3d_geometry_shader gs;
|
||||||
struct wined3d_pixel_shader ps;
|
struct wined3d_pixel_shader ps;
|
||||||
struct wined3d_compute_shader cs;
|
struct wined3d_compute_shader cs;
|
||||||
|
|
Loading…
Reference in New Issue