ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Store the viewport in the wined3d_stateblock_state structure. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-02-07 00:31:49 +03:30 committed by Alexandre Julliard
parent 88d017aa7d
commit 032bac171b
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/wined3d/device.c
View File

@ -1926,10 +1926,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned
}
if (viewport_count)
memcpy(device->update_state->viewports, viewports, viewport_count * sizeof(*viewports));
else
memset(device->update_state->viewports, 0, sizeof(device->update_state->viewports));
device->update_state->viewport_count = viewport_count;
device->update_stateblock_state->viewport = viewports[0];
/* Handle recording of state blocks */
if (device->recording)
@ -1939,6 +1936,12 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned
return;
}
if (viewport_count)
memcpy(device->state.viewports, viewports, viewport_count * sizeof(*viewports));
else
memset(device->state.viewports, 0, sizeof(device->state.viewports));
device->state.viewport_count = viewport_count;
wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports);
}
@ -4523,6 +4526,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device
state->viewports[0].max_z = 1.0f;
state->viewport_count = 1;
wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports);
device->stateblock_state.viewport = state->viewports[0];
SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height);
state->scissor_rect_count = 1;

19
dlls/wined3d/stateblock.c
View File

@ -830,19 +830,12 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock)
stateblock->stateblock_state.material = state->material;
}
assert(src_state->viewport_count <= 1);
if (stateblock->changed.viewport
&& (src_state->viewport_count != stateblock->state.viewport_count
|| memcmp(src_state->viewports, stateblock->state.viewports,
src_state->viewport_count * sizeof(*stateblock->state.viewports))))
&& memcmp(&state->viewport, &stateblock->stateblock_state.viewport, sizeof(state->viewport)))
{
TRACE("Updating viewports.\n");
TRACE("Updating viewport.\n");
if ((stateblock->state.viewport_count = src_state->viewport_count))
memcpy(stateblock->state.viewports, src_state->viewports, sizeof(src_state->viewports));
else
memset(stateblock->state.viewports, 0, sizeof(*stateblock->state.viewports));
stateblock->stateblock_state.viewport = state->viewport;
}
if (stateblock->changed.scissorRect
@ -1134,7 +1127,11 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
}
if (stateblock->changed.viewport)
wined3d_device_set_viewports(device, stateblock->state.viewport_count, stateblock->state.viewports);
{
state->viewport = stateblock->stateblock_state.viewport;
wined3d_device_set_viewports(device, 1, &stateblock->stateblock_state.viewport);
}
if (stateblock->changed.scissorRect)
wined3d_device_set_scissor_rects(device, stateblock->state.scissor_rect_count,

1
dlls/wined3d/wined3d_private.h
View File

@ -2989,6 +2989,7 @@ struct wined3d_stateblock_state
struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1];
struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES];
struct wined3d_material material;
struct wined3d_viewport viewport;
};
struct wined3d_device