From: Elizabeth Figura zfigura@codeweavers.com
--- dlls/wined3d/glsl_shader.c | 10 ++-------- dlls/wined3d/shader.c | 2 -- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 08e7d359bf6..b401a7afffb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8517,16 +8517,10 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl switch (args->tessellator_output_primitive) { case WINED3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: - if (args->render_offscreen) - shader_addline(buffer, ", ccw"); - else - shader_addline(buffer, ", cw"); + shader_addline(buffer, ", ccw"); break; case WINED3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: - if (args->render_offscreen) - shader_addline(buffer, ", cw"); - else - shader_addline(buffer, ", ccw"); + shader_addline(buffer, ", cw"); break; case WINED3D_TESSELLATOR_OUTPUT_POINT: shader_addline(buffer, ", point_mode"); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2b78c2df150..8cdb045c685 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2762,8 +2762,6 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 : pixel_shader ? pixel_shader->limits->packed_input : shader->limits->packed_output; args->next_shader_type = geometry_shader ? WINED3D_SHADER_TYPE_GEOMETRY : WINED3D_SHADER_TYPE_PIXEL;
- args->render_offscreen = 1; - init_interpolation_compile_args(args->interpolation_mode, args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, context->d3d_info);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a28255e2d1d..1f2b6ff4723 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1531,8 +1531,7 @@ struct ds_compile_args enum wined3d_tessellator_partitioning tessellator_partitioning; unsigned int output_count : 16; unsigned int next_shader_type : 3; - unsigned int render_offscreen : 1; - unsigned int padding : 12; + unsigned int padding : 13; uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; };