st/wgl: pass st_context_iface into stw_st_framebuffer_present_locked
We're going to need this to be able to resolve MSAA buffers. Acked-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4926>
This commit is contained in:
committed by
Marge Bot
parent
808eb20186
commit
947bb04fcc
@@ -656,7 +656,7 @@ DrvSwapBuffers(HDC hdc)
|
||||
wait_swap_interval(fb);
|
||||
}
|
||||
|
||||
return stw_st_swap_framebuffer_locked(hdc, fb->stfb);
|
||||
return stw_st_swap_framebuffer_locked(hdc, ctx->st, fb->stfb);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -175,6 +175,7 @@ stw_st_framebuffer_validate(struct st_context_iface *stctx,
|
||||
*/
|
||||
static bool
|
||||
stw_st_framebuffer_present_locked(HDC hdc,
|
||||
struct st_context_iface *stctx,
|
||||
struct st_framebuffer_iface *stfb,
|
||||
enum st_attachment_type statt)
|
||||
{
|
||||
@@ -212,7 +213,7 @@ stw_st_framebuffer_flush_front(struct st_context_iface *stctx,
|
||||
|
||||
hDC = GetDC(stwfb->fb->hWnd);
|
||||
|
||||
ret = stw_st_framebuffer_present_locked(hDC, &stwfb->base, statt);
|
||||
ret = stw_st_framebuffer_present_locked(hDC, stctx, &stwfb->base, statt);
|
||||
|
||||
ReleaseDC(stwfb->fb->hWnd, hDC);
|
||||
|
||||
@@ -268,7 +269,8 @@ stw_st_destroy_framebuffer_locked(struct st_framebuffer_iface *stfb)
|
||||
* Swap the buffers of the given framebuffer.
|
||||
*/
|
||||
bool
|
||||
stw_st_swap_framebuffer_locked(HDC hdc, struct st_framebuffer_iface *stfb)
|
||||
stw_st_swap_framebuffer_locked(HDC hdc, struct st_context_iface *stctx,
|
||||
struct st_framebuffer_iface *stfb)
|
||||
{
|
||||
struct stw_st_framebuffer *stwfb = stw_st_framebuffer(stfb);
|
||||
unsigned front = ST_ATTACHMENT_FRONT_LEFT, back = ST_ATTACHMENT_BACK_LEFT;
|
||||
@@ -293,7 +295,7 @@ stw_st_swap_framebuffer_locked(HDC hdc, struct st_framebuffer_iface *stfb)
|
||||
stwfb->texture_mask = mask;
|
||||
|
||||
front = ST_ATTACHMENT_FRONT_LEFT;
|
||||
return stw_st_framebuffer_present_locked(hdc, &stwfb->base, front);
|
||||
return stw_st_framebuffer_present_locked(hdc, stctx, &stwfb->base, front);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -47,7 +47,8 @@ void
|
||||
stw_st_destroy_framebuffer_locked(struct st_framebuffer_iface *stfb);
|
||||
|
||||
bool
|
||||
stw_st_swap_framebuffer_locked(HDC hdc, struct st_framebuffer_iface *stfb);
|
||||
stw_st_swap_framebuffer_locked(HDC hdc, struct st_context_iface *stctx,
|
||||
struct st_framebuffer_iface *stfb);
|
||||
|
||||
struct pipe_resource *
|
||||
stw_get_framebuffer_resource(struct st_framebuffer_iface *stfb,
|
||||
|
||||
Reference in New Issue
Block a user