[PATCH 3/3] wined3d: Emulate fractional viewports if GL doesn't support them (v2).
Stefan Dösinger
stefan at codeweavers.com
Mon Sep 6 14:41:25 CDT 2021
This allows test_fractional_viewports to pass regardless of GL capabilies.
I don't think we can get rid of WINED3D_PIXEL_CENTER_INTEGER (and add +0.5
in the client libs) due to vpos in d3d9 shaders.
Signed-off-by: Stefan Dösinger <stefan at codeweavers.com>
---
Version 2: Make it depend on GL_VIEWPORT_SUBPIXEL_BITS instead of support
for GL_ARB_viewport_array. Floor viewport coordinates passed to GL if we
use GL_ARB_viewport_array but decide the subpixel support is insufficient.
---
dlls/wined3d/adapter_gl.c | 3 +++
dlls/wined3d/adapter_vk.c | 1 +
dlls/wined3d/state.c | 16 ++++++++++++++++
dlls/wined3d/wined3d_private.h | 14 +++++++++++---
4 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 72f46693274..4f1e78d8e48 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -991,6 +991,7 @@ static void quirk_broken_arb_fog(struct wined3d_gl_info *gl_info)
static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info)
{
+ gl_info->limits.viewport_subpixel_bits = 0;
if (gl_info->supported[ARB_CLIP_CONTROL])
{
TRACE("Disabling ARB_clip_control.\n");
@@ -3655,6 +3656,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
TRACE("Disabling ARB_clip_control because viewport subpixel bits < 8.\n");
gl_info->supported[ARB_CLIP_CONTROL] = FALSE;
}
+ gl_info->viewport_subpixel_bits = subpixel_bits;
}
if (gl_info->supported[ARB_CLIP_CONTROL] && !gl_info->supported[ARB_VIEWPORT_ARRAY])
{
@@ -5129,6 +5131,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_
d3d_info->clip_control = !!gl_info->supported[ARB_CLIP_CONTROL];
d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS);
d3d_info->scaled_resolve = !!gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE_BLIT_SCALED];
+ d3d_info->subpixel_viewport = gl_info->limits.viewport_subpixel_bits >= 8;
d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps);
d3d_info->filling_convention_nudge = gl_info->filling_convention_nudge;
diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index c7da02865ea..31f2b677b5f 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2172,6 +2172,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_
d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS);
d3d_info->scaled_resolve = false;
d3d_info->feature_level = feature_level_from_caps(&shader_caps);
+ d3d_info->subpixel_viewport = true;
d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB;
}
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 5c1c69fb650..85c80198ebf 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4202,6 +4202,22 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine
viewports[i * 4 + 1] = vp[i].y;
viewports[i * 4 + 2] = vp[i].width;
viewports[i * 4 + 3] = vp[i].height;
+
+ /* Don't pass fractionals to GL if we earlier decided not to use
+ * this functionality for two reasons: First, GL might offer us
+ * fewer than 8 bits, and still make use of the fractional, in
+ * addition to the emulation we apply in shader_get_position_fixup.
+ * Second, even if GL tells us it has no subpixel precision (Mac OS!)
+ * it might still do something with the fractional amount, e.g.
+ * round it upwards. I can't find any info on rounding in
+ * GL_ARB_viewport_array. */
+ if (!context->d3d_info->subpixel_viewport)
+ {
+ viewports[i * 4] = floor(viewports[i * 4]);
+ viewports[i * 4 + 1] = floor(viewports[i * 4 + 1]);
+ viewports[i * 4 + 2] = floor(viewports[i * 4 + 2]);
+ viewports[i * 4 + 3] = floor(viewports[i * 4 + 3]);
+ }
}
if (context->viewport_count > state->viewport_count)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index f305829475e..1673c55f71d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -239,6 +239,7 @@ struct wined3d_d3d_info
uint32_t clip_control : 1;
uint32_t full_ffp_varyings : 1;
uint32_t scaled_resolve : 1;
+ uint32_t subpixel_viewport : 1;
enum wined3d_feature_level feature_level;
DWORD multisample_draw_location;
@@ -3211,6 +3212,7 @@ struct wined3d_gl_limits
unsigned int framebuffer_width;
unsigned int framebuffer_height;
+ unsigned int viewport_subpixel_bits;
UINT glsl_varyings;
UINT glsl_vs_float_constants;
@@ -5661,7 +5663,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg)
static inline void shader_get_position_fixup(const struct wined3d_context *context,
const struct wined3d_state *state, unsigned int fixup_count, float *position_fixup)
{
- float center_offset;
+ float center_offset, x = 0.0f, y = 0.0f;
unsigned int i;
/* See get_projection_matrix() in utils.c for a discussion of the position fixup.
@@ -5678,8 +5680,14 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte
{
position_fixup[4 * i ] = 1.0f;
position_fixup[4 * i + 1] = 1.0f;
- position_fixup[4 * i + 2] = center_offset / state->viewports[i].width;
- position_fixup[4 * i + 3] = -center_offset / state->viewports[i].height;
+ if (!context->d3d_info->subpixel_viewport)
+ {
+ double dummy;
+ x = modf(state->viewports[i].x, &dummy) * 2.0f;
+ y = modf(state->viewports[i].y, &dummy) * 2.0f;
+ }
+ position_fixup[4 * i + 2] = (center_offset + x) / state->viewports[i].width;
+ position_fixup[4 * i + 3] = -(center_offset + y) / state->viewports[i].height;
if (context->render_offscreen)
{
--
2.32.0
More information about the wine-devel
mailing list