marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Introduce a separate structure for OpenGL context information. 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Henri Verbeet 2019-05-02 17:10:51 +04:30 committed by Alexandre Julliard
parent bad9cd29a8
commit 5cd787b341
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/context.c
View File

@ -1886,6 +1886,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
struct wined3d_texture *target, const struct wined3d_format *ds_format)
{
struct wined3d_device *device = swapchain->device;
struct wined3d_context_gl *context_gl;
struct wined3d_context *context;
DWORD state;
@ -1893,8 +1894,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
wined3d_from_cs(device->cs);
if (!(context = heap_alloc_zero(sizeof(*context))))
if (!(context_gl = heap_alloc_zero(sizeof(*context_gl))))
return NULL;
context = &context_gl->c;
list_init(&context->timestamp_queries);
list_init(&context->occlusion_queries);
@ -1977,7 +1979,7 @@ out:
wined3d_release_dc(swapchain->win_handle, context->hdc);
device->shader_backend->shader_free_context_data(context);
device->adapter->fragment_pipe->free_context_data(context);
heap_free(context);
heap_free(context_gl);
return NULL;
}

5
dlls/wined3d/wined3d_private.h
View File

@ -2029,6 +2029,11 @@ struct wined3d_context
unsigned int scissor_rect_count;
};
struct wined3d_context_gl
{
struct wined3d_context c;
};
struct wined3d_fb_state
{
struct wined3d_rendertarget_view *render_targets[MAX_RENDER_TARGET_VIEWS];