Module: wine Branch: master Commit: 2b40957a1a895ec9508b5b0a9ea37977384cae9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b40957a1a895ec9508b5b0a9e...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Mar 16 18:16:59 2016 +0100
wined3d: Get resource info from the texture in surface_set_compatible_renderbuffer().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4423f99..ae89aef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1506,13 +1506,13 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P /* Context activation is done by the caller. */ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) { - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = &surface->container->resource.device->adapter->gl_info; struct wined3d_renderbuffer_entry *entry; GLuint renderbuffer = 0; unsigned int src_width, src_height; unsigned int width, height;
- if (rt && rt->resource.format->id != WINED3DFMT_NULL) + if (rt && rt->container->resource.format->id != WINED3DFMT_NULL) { width = rt->pow2Width; height = rt->pow2Height; @@ -1553,7 +1553,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - surface->resource.format->glInternal, width, height); + surface->container->resource.format->glInternal, width, height);
entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); entry->width = width;