Commit 4cfa13c5 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Invalidate pixel shader only when rasterization is toggled.

parent 9b8404bf
...@@ -648,7 +648,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s ...@@ -648,7 +648,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
{ {
const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY];
if (shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) if (is_rasterization_disabled(shader))
{ {
glEnable(GL_RASTERIZER_DISCARD); glEnable(GL_RASTERIZER_DISCARD);
checkGLcall("enable rasterizer discard"); checkGLcall("enable rasterizer discard");
......
...@@ -266,6 +266,7 @@ struct glsl_context_data ...@@ -266,6 +266,7 @@ struct glsl_context_data
{ {
struct glsl_shader_prog_link *glsl_program; struct glsl_shader_prog_link *glsl_program;
GLenum vertex_color_clamp; GLenum vertex_color_clamp;
BOOL rasterization_disabled;
}; };
struct glsl_ps_compiled_shader struct glsl_ps_compiled_shader
...@@ -8062,7 +8063,6 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context ...@@ -8062,7 +8063,6 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context
struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args)
{ {
struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers;
const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc;
const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps;
struct wined3d_string_buffer *buffer = &priv->shader_buffer; struct wined3d_string_buffer *buffer = &priv->shader_buffer;
const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_gl_info *gl_info = context->gl_info;
...@@ -8089,9 +8089,9 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context ...@@ -8089,9 +8089,9 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context
if (!gl_info->supported[ARB_CLIP_CONTROL]) if (!gl_info->supported[ARB_CLIP_CONTROL])
shader_addline(buffer, "uniform vec4 pos_fixup;\n"); shader_addline(buffer, "uniform vec4 pos_fixup;\n");
if (so_desc->rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) if (is_rasterization_disabled(shader))
{ {
shader_glsl_generate_stream_output_setup(priv, shader, so_desc); shader_glsl_generate_stream_output_setup(priv, shader, &shader->u.gs.so_desc);
} }
else else
{ {
...@@ -10013,7 +10013,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const ...@@ -10013,7 +10013,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
} }
/* A pixel shader is not used when rasterization is disabled. */ /* A pixel shader is not used when rasterization is disabled. */
if (gshader && gshader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) if (is_rasterization_disabled(gshader))
{ {
ps_id = 0; ps_id = 0;
ps_list = NULL; ps_list = NULL;
...@@ -11366,7 +11366,13 @@ static void glsl_vertex_pipe_hs(struct wined3d_context *context, ...@@ -11366,7 +11366,13 @@ static void glsl_vertex_pipe_hs(struct wined3d_context *context,
static void glsl_vertex_pipe_geometry_shader(struct wined3d_context *context, static void glsl_vertex_pipe_geometry_shader(struct wined3d_context *context,
const struct wined3d_state *state, DWORD state_id) const struct wined3d_state *state, DWORD state_id)
{ {
struct glsl_context_data *ctx_data = context->shader_backend_data;
BOOL rasterization_disabled;
rasterization_disabled = is_rasterization_disabled(state->shader[WINED3D_SHADER_TYPE_GEOMETRY]);
if (ctx_data->rasterization_disabled != rasterization_disabled)
context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL;
ctx_data->rasterization_disabled = rasterization_disabled;
if (state->shader[WINED3D_SHADER_TYPE_DOMAIN]) if (state->shader[WINED3D_SHADER_TYPE_DOMAIN])
context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_DOMAIN; context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_DOMAIN;
......
...@@ -4325,6 +4325,12 @@ static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struc ...@@ -4325,6 +4325,12 @@ static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struc
return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40);
} }
static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geometry_shader)
{
return geometry_shader
&& geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM;
}
static inline DWORD wined3d_extract_bits(const DWORD *bitstream, static inline DWORD wined3d_extract_bits(const DWORD *bitstream,
unsigned int offset, unsigned int count) unsigned int offset, unsigned int count)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment