[PATCH 5/5] wined3d: Always enable GL_PROGRAM_POINT_SIZE in the GLSL backend.
Matteo Bruni
mbruni at codeweavers.com
Thu May 28 16:23:06 CDT 2015
Core contexts don't support clamping of the point size to
GL_POINT_SIZE_MIN / GL_POINT_SIZE_MAX.
Incidentally this mostly fixes per-vertex point sizes for vertex shader
version 1 and 2.
---
dlls/wined3d/glsl_shader.c | 66 ++++++++++++++++++++----------------------
dlls/wined3d/shader.c | 6 ++++
dlls/wined3d/state.c | 8 ++---
dlls/wined3d/wined3d_private.h | 16 ++++------
4 files changed, 47 insertions(+), 49 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 93863d0..318860f 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -205,6 +205,7 @@ struct shader_glsl_ctx_priv {
struct glsl_context_data
{
struct glsl_shader_prog_link *glsl_program;
+ BOOL backend_init_done;
};
struct glsl_ps_compiled_shader
@@ -1498,6 +1499,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
{
const struct wined3d_shader_version *version = ®_maps->shader_version;
const struct wined3d_state *state = &shader->device->state;
+ const struct vs_compile_args *vs_args = ctx_priv->cur_vs_args;
const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args;
const struct wined3d_gl_info *gl_info = context->gl_info;
const struct wined3d_fb_state *fb = &shader->device->fb;
@@ -1728,6 +1730,15 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, e->register_idx);
}
+ if (vs_args->point_size && !vs_args->per_vertex_point_size)
+ {
+ shader_addline(buffer, "uniform struct\n{\n");
+ shader_addline(buffer, " float size;\n");
+ shader_addline(buffer, " float size_min;\n");
+ shader_addline(buffer, " float size_max;\n");
+ shader_addline(buffer, "} ffp_point;\n");
+ }
+
shader_addline(buffer, "uniform vec4 posFixup;\n");
shader_addline(buffer, "void order_ps_input(in vec4[%u]);\n", shader->limits->packed_output);
}
@@ -5182,6 +5193,9 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context
if (args->clip_enabled)
shader_addline(buffer, "gl_ClipVertex = gl_Position;\n");
+ if (args->point_size && !args->per_vertex_point_size)
+ shader_addline(buffer, "gl_PointSize = clamp(ffp_point.size, ffp_point.size_min, ffp_point.size_max);\n");
+
/* Write the final position.
*
* OpenGL coordinates specify the center of the pixel while d3d coords specify
@@ -5318,9 +5332,14 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context,
}
static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new,
- const DWORD use_map) {
+ const DWORD use_map)
+{
if((stored->swizzle_map & use_map) != new->swizzle_map) return FALSE;
if((stored->clip_enabled) != new->clip_enabled) return FALSE;
+ if (stored->point_size != new->point_size)
+ return FALSE;
+ if (stored->per_vertex_point_size != new->per_vertex_point_size)
+ return FALSE;
return stored->fog_src == new->fog_src;
}
@@ -6987,6 +7006,13 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex
GLuint program_id = 0, prev_id = 0;
GLenum old_vertex_color_clamp, current_vertex_color_clamp;
+ if (!ctx_data->backend_init_done)
+ {
+ gl_info->gl_ops.gl.p_glEnable(GL_PROGRAM_POINT_SIZE);
+ checkGLcall("GL_PROGRAM_POINT_SIZE");
+ ctx_data->backend_init_done = TRUE;
+ }
+
priv->vertex_pipe->vp_enable(gl_info, !use_vs(state));
priv->fragment_pipe->enable_extension(gl_info, !use_ps(state));
@@ -7645,14 +7671,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend =
shader_glsl_has_ffp_proj_control,
};
-static void glsl_vertex_pipe_vp_enable(const struct wined3d_gl_info *gl_info, BOOL enable)
-{
- if (enable)
- gl_info->gl_ops.gl.p_glEnable(GL_VERTEX_PROGRAM_POINT_SIZE_ARB);
- else
- gl_info->gl_ops.gl.p_glDisable(GL_VERTEX_PROGRAM_POINT_SIZE_ARB);
- checkGLcall("GL_VERTEX_PROGRAM_POINT_SIZE_ARB");
-}
+static void glsl_vertex_pipe_vp_enable(const struct wined3d_gl_info *gl_info, BOOL enable) {}
static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps)
{
@@ -7835,10 +7854,7 @@ static void glsl_vertex_pipe_viewport(struct wined3d_context *context,
glsl_vertex_pipe_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION));
if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE))
&& state->render_states[WINED3D_RS_POINTSCALEENABLE])
- {
- state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE));
context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE;
- }
context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POS_FIXUP;
}
@@ -7860,25 +7876,10 @@ static void glsl_vertex_pipe_light(struct wined3d_context *context,
context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_LIGHTS;
}
-static void glsl_vertex_pipe_pointsize_arb(struct wined3d_context *context,
- const struct wined3d_state *state, DWORD state_id)
-{
- context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE;
- state_psizemin_arb(context, state, state_id);
-}
-
-static void glsl_vertex_pipe_pointsize_ext(struct wined3d_context *context,
- const struct wined3d_state *state, DWORD state_id)
-{
- context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE;
- state_psizemin_ext(context, state, state_id);
-}
-
-static void glsl_vertex_pipe_pointsize_w(struct wined3d_context *context,
+static void glsl_vertex_pipe_pointsize(struct wined3d_context *context,
const struct wined3d_state *state, DWORD state_id)
{
context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE;
- state_psizemin_w(context, state, state_id);
}
static void glsl_vertex_pipe_pointscale(struct wined3d_context *context,
@@ -7886,7 +7887,6 @@ static void glsl_vertex_pipe_pointscale(struct wined3d_context *context,
{
if (!use_vs(state))
context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE;
- state_pscale(context, state, state_id);
}
static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] =
@@ -7985,18 +7985,14 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] =
{STATE_RENDER(WINED3D_RS_AMBIENTMATERIALSOURCE), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE },
{STATE_RENDER(WINED3D_RS_EMISSIVEMATERIALSOURCE), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE },
{STATE_RENDER(WINED3D_RS_VERTEXBLEND), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE },
- {STATE_RENDER(WINED3D_RS_POINTSIZE), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE },
- {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), glsl_vertex_pipe_pointsize_arb}, ARB_POINT_PARAMETERS },
- {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), glsl_vertex_pipe_pointsize_ext}, EXT_POINT_PARAMETERS },
- {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), glsl_vertex_pipe_pointsize_w}, WINED3D_GL_EXT_NONE },
+ {STATE_RENDER(WINED3D_RS_POINTSIZE), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, WINED3D_GL_EXT_NONE },
+ {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), glsl_vertex_pipe_pointsize}, WINED3D_GL_EXT_NONE },
{STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_pointsprite }, ARB_POINT_SPRITE },
{STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_pointsprite_w }, WINED3D_GL_EXT_NONE },
{STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), glsl_vertex_pipe_pointscale}, WINED3D_GL_EXT_NONE },
{STATE_RENDER(WINED3D_RS_POINTSCALE_A), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE },
{STATE_RENDER(WINED3D_RS_POINTSCALE_B), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE },
{STATE_RENDER(WINED3D_RS_POINTSCALE_C), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE },
- {STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, ARB_POINT_PARAMETERS },
- {STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, EXT_POINT_PARAMETERS },
{STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, WINED3D_GL_EXT_NONE },
{STATE_RENDER(WINED3D_RS_TWEENFACTOR), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE },
{STATE_RENDER(WINED3D_RS_INDEXEDVERTEXBLENDENABLE), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE },
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 279ec42..1aef6a5 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -550,6 +550,8 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w
case WINED3DSPR_RASTOUT:
if (reg->idx[0].offset == 1)
reg_maps->fog = 1;
+ if (reg->idx[0].offset == 2)
+ reg_maps->point_size = 1;
break;
case WINED3DSPR_MISCTYPE:
@@ -764,6 +766,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
shader_signature_from_semantic(&output_signature_elements[reg_idx], semantic);
if (semantic->usage == WINED3D_DECL_USAGE_FOG)
reg_maps->fog = 1;
+ if (semantic->usage == WINED3D_DECL_USAGE_PSIZE)
+ reg_maps->point_size = 1;
break;
case WINED3DSPR_SAMPLER:
@@ -2213,6 +2217,8 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3
== WINED3D_FOG_NONE ? VS_FOG_COORD : VS_FOG_Z;
args->clip_enabled = state->render_states[WINED3D_RS_CLIPPING]
&& state->render_states[WINED3D_RS_CLIPPLANEENABLE];
+ args->point_size = state->gl_primitive_type == GL_POINTS;
+ args->per_vertex_point_size = shader->reg_maps.point_size;
args->swizzle_map = swizzle_map;
}
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 37f4498..e042add 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1417,7 +1417,7 @@ static void state_normalize(struct wined3d_context *context, const struct wined3
}
}
-void state_psizemin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
+static void state_psizemin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
float min, max;
@@ -1429,7 +1429,7 @@ void state_psizemin_w(struct wined3d_context *context, const struct wined3d_stat
FIXME("WINED3D_RS_POINTSIZE_MAX value %.8e not supported on this OpenGL implementation.\n", max);
}
-void state_psizemin_ext(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
+static void state_psizemin_ext(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
const struct wined3d_gl_info *gl_info = context->gl_info;
float min, max;
@@ -1442,7 +1442,7 @@ void state_psizemin_ext(struct wined3d_context *context, const struct wined3d_st
checkGLcall("glPointParameterfEXT(...)");
}
-void state_psizemin_arb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
+static void state_psizemin_arb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
const struct wined3d_gl_info *gl_info = context->gl_info;
float min, max;
@@ -1455,7 +1455,7 @@ void state_psizemin_arb(struct wined3d_context *context, const struct wined3d_st
checkGLcall("glPointParameterfARB(...)");
}
-void state_pscale(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
+static void state_pscale(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
const struct wined3d_gl_info *gl_info = context->gl_info;
float att[3];
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 75fc2be..45cfe2e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -640,7 +640,8 @@ struct wined3d_shader_reg_maps
WORD usesifc : 1;
WORD usescall : 1;
WORD usespow : 1;
- WORD padding : 3;
+ WORD point_size : 1;
+ WORD padding : 2;
DWORD rt_mask; /* Used render targets, 32 max. */
@@ -841,10 +842,13 @@ enum fog_src_type {
VS_FOG_COORD = 1
};
-struct vs_compile_args {
+struct vs_compile_args
+{
BYTE fog_src;
BYTE clip_enabled;
WORD swizzle_map; /* MAX_ATTRIBS, 16 */
+ BOOL point_size;
+ BOOL per_vertex_point_size;
};
struct wined3d_context;
@@ -2836,18 +2840,10 @@ void state_clipping(struct wined3d_context *context,
const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
void clipplane(struct wined3d_context *context,
const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
-void state_psizemin_w(struct wined3d_context *context,
- const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
-void state_psizemin_ext(struct wined3d_context *context,
- const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
-void state_psizemin_arb(struct wined3d_context *context,
- const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
void state_pointsprite_w(struct wined3d_context *context,
const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
void state_pointsprite(struct wined3d_context *context,
const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
-void state_pscale(struct wined3d_context *context,
- const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
BOOL getColorBits(const struct wined3d_format *format,
BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) DECLSPEC_HIDDEN;
--
2.3.6
More information about the wine-patches
mailing list