Matteo Bruni : wined3d: Remove point size scaling hack.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri May 29 05:29:49 CDT 2015
Module: wine
Branch: master
Commit: b551da8eef4aaeea27207969c6f9065882f3f6be
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b551da8eef4aaeea27207969c6f9065882f3f6be
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Thu May 28 23:23:02 2015 +0200
wined3d: Remove point size scaling hack.
Not sure how this was supposed to work, according to the GL spec the
clamping to POINT_SIZE_RANGE happens after the scaling is applied.
---
dlls/wined3d/state.c | 39 +++++----------------------------------
1 file changed, 5 insertions(+), 34 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 28e26ab..40b04e7 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1507,40 +1507,11 @@ void state_pscale(struct wined3d_context *context, const struct wined3d_state *s
if (state->render_states[WINED3D_RS_POINTSCALEENABLE])
{
- DWORD h = state->viewport.height;
- GLfloat scaleFactor;
+ float scale_factor = state->viewport.height * state->viewport.height;
- if (pointSize.f < gl_info->limits.pointsize_min)
- {
- /* Minimum valid point size for OpenGL is driver specific. For Direct3D it is
- * 0.0f. This means that OpenGL will clamp really small point sizes to the
- * driver minimum. To correct for this we need to multiply by the scale factor when sizes
- * are less than 1.0f. scale_factor = 1.0f / point_size.
- */
- scaleFactor = pointSize.f / gl_info->limits.pointsize_min;
- /* Clamp the point size, don't rely on the driver to do it. MacOS says min point size
- * is 1.0, but then accepts points below that and draws too small points
- */
- pointSize.f = gl_info->limits.pointsize_min;
- }
- else if(pointSize.f > gl_info->limits.pointsize_max)
- {
- /* gl already scales the input to glPointSize,
- * d3d scales the result after the point size scale.
- * If the point size is bigger than the max size, use the
- * scaling to scale it bigger, and set the gl point size to max
- */
- scaleFactor = pointSize.f / gl_info->limits.pointsize_max;
- TRACE("scale: %f\n", scaleFactor);
- pointSize.f = gl_info->limits.pointsize_max;
- } else {
- scaleFactor = 1.0f;
- }
- scaleFactor = powf(h * scaleFactor, 2);
-
- att[0] = A.f / scaleFactor;
- att[1] = B.f / scaleFactor;
- att[2] = C.f / scaleFactor;
+ att[0] = A.f / scale_factor;
+ att[1] = B.f / scale_factor;
+ att[2] = C.f / scale_factor;
}
if (gl_info->supported[ARB_POINT_PARAMETERS])
@@ -1558,7 +1529,7 @@ void state_pscale(struct wined3d_context *context, const struct wined3d_state *s
WARN("POINT_PARAMETERS not supported in this version of opengl\n");
}
- gl_info->gl_ops.gl.p_glPointSize(pointSize.f);
+ gl_info->gl_ops.gl.p_glPointSize(max(pointSize.f, FLT_MIN));
checkGLcall("glPointSize(...);");
}
More information about the wine-cvs
mailing list