Matteo Bruni : wined3d: Respect D3DRS_SRGBWRITEENABLE in clears.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Nov 30 09:54:02 CST 2015
Module: wine
Branch: master
Commit: 787a2716e1f7e3ade07b16c820ee2026153c80da
URL: http://source.winehq.org/git/wine.git/?a=commit;h=787a2716e1f7e3ade07b16c820ee2026153c80da
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Fri Nov 27 20:39:35 2015 +0100
wined3d: Respect D3DRS_SRGBWRITEENABLE in clears.
This only handles the case where ARB_framebuffer_sRGB and
EXT_texture_sRGB_decode are supported by the GL implementation.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/tests/visual.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++-
dlls/wined3d/context.c | 10 +++-
2 files changed, 159 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 7ab751c..e126258 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -873,7 +873,27 @@ done:
static void clear_test(void)
{
- /* Tests the correctness of clearing parameters */
+ static const D3DMATRIX mat =
+ {{{
+ 1.0f, 0.0f, 0.0f, 0.0f,
+ 0.0f, 1.0f, 0.0f, 0.0f,
+ 0.0f, 0.0f, 1.0f, 0.0f,
+ 0.0f, 0.0f, 0.0f, 1.0f,
+ }}};
+ static const struct
+ {
+ struct vec3 position;
+ DWORD diffuse;
+ }
+ quad[] =
+ {
+ {{-1.0f, -1.0f, 0.1f}, 0xff7f7f7f},
+ {{ 1.0f, -1.0f, 0.1f}, 0xff7f7f7f},
+ {{-1.0f, 1.0f, 0.1f}, 0xff7f7f7f},
+ {{ 1.0f, 1.0f, 0.1f}, 0xff7f7f7f},
+ };
+ IDirect3DSurface9 *surface0, *surface1, *backbuffer;
+ IDirect3DTexture9 *texture;
HRESULT hr;
D3DRECT rect[2];
D3DRECT rect_negneg;
@@ -885,6 +905,7 @@ static void clear_test(void)
IDirect3DDevice9 *device;
IDirect3D9 *d3d;
ULONG refcount;
+ D3DCAPS9 caps;
HWND window;
window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
@@ -1133,6 +1154,134 @@ static void clear_test(void)
IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
+ /* Test D3DRS_SRGBWRITEENABLE interactions with clears. */
+ hr = IDirect3DDevice9_GetDeviceCaps(device, &caps);
+ ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ color = getPixelColor(device, 320, 240);
+ ok(color_match(color, 0x007f7f7f, 1), "Clear has color %08x.\n", color);
+
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, TRUE);
+ ok(SUCCEEDED(hr), "Failed to enable sRGB write, hr %#x.\n", hr);
+
+ /* Draw something to make sure the SRGBWRITEENABLE setting is applied. */
+ hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat);
+ ok(SUCCEEDED(hr), "Failed to set world matrix, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE);
+ ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE);
+ ok(SUCCEEDED(hr), "Failed to disable z test, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE);
+ ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE);
+ ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE);
+ ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE);
+ ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE);
+ ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_BeginScene(device);
+ ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad));
+ ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_EndScene(device);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ color = getPixelColor(device, 320, 240);
+ if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_POSTBLENDSRGBCONVERT)
+ ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color);
+ else
+ todo_wine ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color);
+
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, FALSE);
+ ok(SUCCEEDED(hr), "Failed to disable sRGB write, hr %#x.\n", hr);
+
+ /* Switching to a new render target seems to be enough to make Windows pick
+ * up on the changed render state. */
+ hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 2, D3DUSAGE_RENDERTARGET,
+ D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL);
+ ok(SUCCEEDED(hr), "Failed to create the offscreen render target, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer);
+ ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr);
+ hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface0);
+ ok(SUCCEEDED(hr), "Failed to get offscreen surface, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface0);
+ ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer);
+ ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_StretchRect(device, surface0, NULL, backbuffer, NULL, D3DTEXF_NONE);
+ ok(SUCCEEDED(hr), "Failed to blit surface, hr %#x.\n", hr);
+
+ color = getPixelColor(device, 64, 64);
+ ok(color_match(color, 0x007f7f7f, 1), "Clear has color %08x.\n", color);
+
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, TRUE);
+ ok(SUCCEEDED(hr), "Failed to enable sRGB write, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface0);
+ ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_BeginScene(device);
+ ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad));
+ ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_EndScene(device);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer);
+ ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_StretchRect(device, surface0, NULL, backbuffer, NULL, D3DTEXF_NONE);
+ ok(SUCCEEDED(hr), "Failed to blit surface, hr %#x.\n", hr);
+
+ color = getPixelColor(device, 320, 240);
+ if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_POSTBLENDSRGBCONVERT)
+ ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color);
+ else
+ todo_wine ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color);
+
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, FALSE);
+ ok(SUCCEEDED(hr), "Failed to disable sRGB write, hr %#x.\n", hr);
+ /* Switching to another surface of the same texture is also enough to make
+ * the setting "stick". */
+ hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface1);
+ ok(SUCCEEDED(hr), "Failed to get offscreen surface, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface1);
+ ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr);
+
+ hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer);
+ ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice9_StretchRect(device, surface1, NULL, backbuffer, NULL, D3DTEXF_NONE);
+ ok(SUCCEEDED(hr), "Failed to blit surface, hr %#x.\n", hr);
+
+ color = getPixelColor(device, 320, 240);
+ ok(color_match(color, 0x007f7f7f, 1), "Clear has color %08x.\n", color);
+
+ IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
+
+ IDirect3DSurface9_Release(surface1);
+ IDirect3DSurface9_Release(surface0);
+ IDirect3DSurface9_Release(backbuffer);
+ IDirect3DTexture9_Release(texture);
refcount = IDirect3DDevice9_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
done:
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 5eeccab..1e357e7 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -2467,7 +2467,15 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win
* performance incredibly. */
gl_info->gl_ops.gl.p_glDisable(GL_BLEND);
gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST);
- checkGLcall("glEnable GL_SCISSOR_TEST");
+ if (gl_info->supported[ARB_FRAMEBUFFER_SRGB])
+ {
+ if (device->state.render_states[WINED3D_RS_SRGBWRITEENABLE])
+ gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB);
+ else
+ gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB);
+ context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE));
+ }
+ checkGLcall("setting up state for clear");
context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE));
context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE));
More information about the wine-cvs
mailing list