August 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add multisampling support.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 641f52ef96946112b35456d07e8c0cdbd3cd48bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=641f52ef96946112b35456d07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:05:03 2011 +0200 wined3d: Add multisampling support. --- dlls/wined3d/context.c | 34 +++++++++++++- dlls/wined3d/device.c | 26 +++++++++-- dlls/wined3d/directx.c | 36 +++++++++++++-- dlls/wined3d/surface.c | 92 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 15 ++++++- dlls/wined3d/utils.c | 10 +++-- dlls/wined3d/wined3d_private.h | 79 +++++++++++++++++++--------------- 7 files changed, 235 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=641f52ef96946112b3545…

1 0

Henri Verbeet : wined3d: Also print an attachment' s multisample type in context_check_fbo_status().
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 9aaf0a30b7209a94848b8a76c3d4e037dd8d556a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aaf0a30b7209a94848b8a76c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:04:59 2011 +0200 wined3d: Also print an attachment's multisample type in context_check_fbo_status(). --- dlls/wined3d/context.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 33b07ce..829c570 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -253,17 +253,17 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ attachment = context->current_fbo->render_targets[i]; if (attachment) { - FIXME("\tColor attachment %d: (%p) %s %ux%u\n", + FIXME("\tColor attachment %d: (%p) %s %ux%u %u samples.\n", i, attachment, debug_d3dformat(attachment->resource.format->id), - attachment->pow2Width, attachment->pow2Height); + attachment->pow2Width, attachment->pow2Height, attachment->resource.multisample_type); } } attachment = context->current_fbo->depth_stencil; if (attachment) { - FIXME("\tDepth attachment: (%p) %s %ux%u\n", + FIXME("\tDepth attachment: (%p) %s %ux%u %u samples.\n", attachment, debug_d3dformat(attachment->resource.format->id), - attachment->pow2Width, attachment->pow2Height); + attachment->pow2Width, attachment->pow2Height, attachment->resource.multisample_type); } } }

1 0

Henri Verbeet : wined3d: Introduce a separate function for attaching depth / stencil renderbuffers.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: eec2c634a6ba9f605dcfb4dab0b80e975bdde25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec2c634a6ba9f605dcfb4dab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:05:01 2011 +0200 wined3d: Introduce a separate function for attaching depth / stencil renderbuffers. --- dlls/wined3d/context.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b4788bd..a5f5861 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -111,6 +111,22 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) checkGLcall("glDeleteFramebuffers()"); } +static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_info, + GLenum fbo_target, DWORD format_flags, GLuint rb) +{ + if (format_flags & WINED3DFMT_FLAG_DEPTH) + { + gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rb); + checkGLcall("glFramebufferRenderbuffer()"); + } + + if (format_flags & WINED3DFMT_FLAG_STENCIL) + { + gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rb); + checkGLcall("glFramebufferRenderbuffer()"); + } +} + /* GL locking is done by the caller */ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, struct wined3d_surface *depth_stencil, DWORD location) @@ -125,19 +141,8 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, if (depth_stencil->current_renderbuffer) { - if (format_flags & WINED3DFMT_FLAG_DEPTH) - { - gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_DEPTH_ATTACHMENT, - GL_RENDERBUFFER, depth_stencil->current_renderbuffer->id); - checkGLcall("glFramebufferRenderbuffer()"); - } - - if (format_flags & WINED3DFMT_FLAG_STENCIL) - { - gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_STENCIL_ATTACHMENT, - GL_RENDERBUFFER, depth_stencil->current_renderbuffer->id); - checkGLcall("glFramebufferRenderbuffer()"); - } + context_attach_depth_stencil_rb(gl_info, fbo_target, + format_flags, depth_stencil->current_renderbuffer->id); } else {

1 0

Stefan Leichter : setupapi: Add pSetupFree|Malloc|Realloc to spec file and forward them.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: cb9fa1eb7aeb3d5d7e715aeee6e42200091a0d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9fa1eb7aeb3d5d7e715aeee… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 25 23:06:20 2011 +0200 setupapi: Add pSetupFree|Malloc|Realloc to spec file and forward them. --- dlls/setupapi/setupapi.spec | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9ad5a96..7202874 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -557,6 +557,7 @@ @ stub pSetupAppendStringToMultiSz @ stub pSetupDestroyRunOnceNodeList @ stub pSetupDirectoryIdToPath +@ stdcall pSetupFree(ptr) MyFree @ stdcall pSetupGetField(ptr long) @ stdcall pSetupGetGlobalFlags() @ stub pSetupGetOsLoaderDriveAndPath @@ -567,6 +568,8 @@ @ stdcall pSetupInstallCatalog(wstr wstr ptr) @ stdcall pSetupIsUserAdmin() IsUserAdmin @ stub pSetupMakeSurePathExists +@ stdcall pSetupMalloc(long) MyMalloc +@ stdcall pSetupRealloc(ptr long) MyRealloc @ stdcall pSetupSetGlobalFlags(long) @ stdcall pSetupSetQueueFlags(ptr long) @ stub pSetupSetSystemSourceFlags

1 0

Henri Verbeet : wined3d: Explicitly specify the resource location to context_attach_depth_stencil_fbo ().
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: be76133b7b497f66ada8b3052e95ff5e338a08c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be76133b7b497f66ada8b3052… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:05:00 2011 +0200 wined3d: Explicitly specify the resource location to context_attach_depth_stencil_fbo(). --- dlls/wined3d/context.c | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 829c570..b4788bd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -113,7 +113,7 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) /* GL locking is done by the caller */ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, - GLenum fbo_target, struct wined3d_surface *depth_stencil) + GLenum fbo_target, struct wined3d_surface *depth_stencil, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -141,22 +141,32 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, } else { - surface_prepare_texture(depth_stencil, context, FALSE); - - if (format_flags & WINED3DFMT_FLAG_DEPTH) + switch (location) { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, - depth_stencil->texture_target, depth_stencil->texture_name, - depth_stencil->texture_level); - checkGLcall("glFramebufferTexture2D()"); - } + case SFLAG_INTEXTURE: + case SFLAG_INSRGBTEX: + surface_prepare_texture(depth_stencil, context, FALSE); + + if (format_flags & WINED3DFMT_FLAG_DEPTH) + { + gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, + depth_stencil->texture_target, depth_stencil->texture_name, + depth_stencil->texture_level); + checkGLcall("glFramebufferTexture2D()"); + } + + if (format_flags & WINED3DFMT_FLAG_STENCIL) + { + gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, + depth_stencil->texture_target, depth_stencil->texture_name, + depth_stencil->texture_level); + checkGLcall("glFramebufferTexture2D()"); + } + break; - if (format_flags & WINED3DFMT_FLAG_STENCIL) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, - depth_stencil->texture_target, depth_stencil->texture_name, - depth_stencil->texture_level); - checkGLcall("glFramebufferTexture2D()"); + default: + ERR("Unsupported location %s (%#x).\n", debug_surflocation(location), location); + break; } } @@ -393,7 +403,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Apply depth targets */ if (entry->depth_stencil) surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]); - context_attach_depth_stencil_fbo(context, target, entry->depth_stencil); + context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, entry->location); entry->attached = TRUE; }

1 0

Henri Verbeet : wined3d: Enable multisampling by default.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 8a2b435dd354cd4eac7a7286dfb8b08c539dbab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a2b435dd354cd4eac7a7286d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:05:04 2011 +0200 wined3d: Enable multisampling by default. --- dlls/wined3d/wined3d_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index da6aa2a..282f52d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -84,7 +84,7 @@ struct wined3d_settings wined3d_settings = PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ - FALSE, /* Multisampling disabled by default. */ + TRUE, /* Multisampling enabled by default. */ FALSE, /* No strict draw ordering. */ FALSE, /* Try to render onscreen by default. */ }; @@ -329,10 +329,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if ( !get_config_key( hkey, appkey, "Multisampling", buffer, size) ) { - if (!strcmp(buffer,"enabled")) + if (!strcmp(buffer, "disabled")) { - TRACE("Allow multisampling\n"); - wined3d_settings.allow_multisampling = TRUE; + TRACE("Multisampling disabled.\n"); + wined3d_settings.allow_multisampling = FALSE; } } if (!get_config_key(hkey, appkey, "StrictDrawOrdering", buffer, size)

1 0

Henri Verbeet : wined3d: Get rid of the current multisampling support.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: bd5f9486829bfdcf9a77c7a4ca6e38dd1b2ffb97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5f9486829bfdcf9a77c7a4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:05:02 2011 +0200 wined3d: Get rid of the current multisampling support. It doesn't really work, and trying to make multisampling work with onscreen rendering is probably more trouble than it's worth, both for us and the driver. --- dlls/wined3d/context.c | 29 ++++------------ dlls/wined3d/directx.c | 78 ------------------------------------------- dlls/wined3d/wined3d_main.c | 2 +- 3 files changed, 8 insertions(+), 101 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a5f5861..b1c2f50 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1066,7 +1066,7 @@ void context_invalidate_state(struct wined3d_context *context, DWORD state) /* This function takes care of wined3d pixel format selection. */ static int context_choose_pixel_format(struct wined3d_device *device, HDC hdc, const struct wined3d_format *color_format, const struct wined3d_format *ds_format, - BOOL auxBuffers, int numSamples, BOOL findCompatible) + BOOL auxBuffers, BOOL findCompatible) { int iPixelFormat=0; unsigned int matchtry; @@ -1099,9 +1099,9 @@ static int context_choose_pixel_format(struct wined3d_device *device, HDC hdc, int i = 0; int nCfgs = device->adapter->nCfgs; - TRACE("ColorFormat=%s, DepthStencilFormat=%s, auxBuffers=%d, numSamples=%d, findCompatible=%d\n", - debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), - auxBuffers, numSamples, findCompatible); + TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, find_compatible %#x.\n", + device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), + auxBuffers, findCompatible); if (!getColorBits(color_format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { @@ -1171,7 +1171,7 @@ static int context_choose_pixel_format(struct wined3d_device *device, HDC hdc, continue; /* Check multisampling support */ - if(cfg->numSamples != numSamples) + if (cfg->numSamples) continue; /* When we have passed all the checks then we have found a format which matches our @@ -1236,7 +1236,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_context *ret; PIXELFORMATDESCRIPTOR pfd; BOOL auxBuffers = FALSE; - int numSamples = 0; int pixel_format; unsigned int s; int swap_interval; @@ -1287,28 +1286,14 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (color_format->id == WINED3DFMT_P8_UINT) color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); - /* D3D only allows multisampling when SwapEffect is set to WINED3DSWAPEFFECT_DISCARD. */ - if (swapchain->presentParms.MultiSampleType && (swapchain->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD)) - { - if (!gl_info->supported[ARB_MULTISAMPLE]) - WARN("The application is requesting multisampling without support.\n"); - else - { - TRACE("Requesting multisample type %#x.\n", swapchain->presentParms.MultiSampleType); - numSamples = swapchain->presentParms.MultiSampleType; - } - } - /* Try to find a pixel format which matches our requirements. */ - pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, - auxBuffers, numSamples, FALSE /* findCompatible */); + pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, FALSE); /* Try to locate a compatible format if we weren't able to find anything. */ if (!pixel_format) { TRACE("Trying to locate a compatible pixel format because an exact match failed.\n"); - pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, - auxBuffers, 0 /* numSamples */, TRUE /* findCompatible */); + pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, TRUE); } /* If we still don't have a pixel format, something is very wrong as ChoosePixelFormat barely fails */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a43dc9f..5887000 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3127,9 +3127,6 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 WINED3DDEVTYPE device_type, enum wined3d_format_id surface_format_id, BOOL windowed, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD *quality_levels) { - const struct wined3d_adapter *adapter; - const struct wined3d_format *format; - TRACE_(d3d_caps)("wined3d %p, adapter_idx %u, device_type %s, surface_format %s,\n" "windowed %#x, multisample_type %#x, quality_levels %p.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(surface_format_id), @@ -3138,87 +3135,12 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - /* TODO: Handle windowed, add more quality levels. */ - if (WINED3DMULTISAMPLE_NONE == multisample_type) { if (quality_levels) *quality_levels = 1; return WINED3D_OK; } - /* By default multisampling is disabled right now as it causes issues - * on some Nvidia driver versions and it doesn't work well in combination - * with FBOs yet. */ - if (!wined3d_settings.allow_multisampling) - return WINED3DERR_NOTAVAILABLE; - - adapter = &wined3d->adapters[adapter_idx]; - format = wined3d_get_format(&adapter->gl_info, surface_format_id); - if (!format) return WINED3DERR_INVALIDCALL; - - if (format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - { - const struct wined3d_pixel_format *cfgs; - unsigned int i, cfg_count; - - cfgs = adapter->cfgs; - cfg_count = adapter->nCfgs; - for (i = 0; i < cfg_count; ++i) - { - if(cfgs[i].numSamples != multisample_type) - continue; - - if (!wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], format)) - continue; - - TRACE("Found pixel format %u to support multisample_type %#x for format %s.\n", - cfgs[i].iPixelFormat, multisample_type, debug_d3dformat(surface_format_id)); - - if (quality_levels) *quality_levels = 1; - - return WINED3D_OK; - } - } - else if (format->flags & WINED3DFMT_FLAG_RENDERTARGET) - { - BYTE redSize, greenSize, blueSize, alphaSize, colorBits; - const struct wined3d_pixel_format *cfgs; - unsigned int i, cfg_count; - - if (!getColorBits(format, &redSize, &greenSize, &blueSize, &alphaSize, &colorBits)) - { - ERR("Unable to get color bits for format %s, can't check multisampling capability.\n", - debug_d3dformat(surface_format_id)); - return WINED3DERR_NOTAVAILABLE; - } - - cfgs = adapter->cfgs; - cfg_count = adapter->nCfgs; - for (i = 0; i < cfg_count; ++i) - { - if(cfgs[i].numSamples != multisample_type) - continue; - if(cfgs[i].redSize != redSize) - continue; - if(cfgs[i].greenSize != greenSize) - continue; - if(cfgs[i].blueSize != blueSize) - continue; - /* Not all drivers report alpha-less formats since they use 32-bit - * anyway, so accept alpha even if we didn't ask for it. */ - if(alphaSize && cfgs[i].alphaSize != alphaSize) - continue; - if (cfgs[i].colorSize != (format->byte_count << 3)) - continue; - - TRACE("Found pixel format %u to support multisample_type %#x for format %s.\n", - cfgs[i].iPixelFormat, multisample_type, debug_d3dformat(surface_format_id)); - - if (quality_levels) *quality_levels = 1; - - return WINED3D_OK; - } - } return WINED3DERR_NOTAVAILABLE; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 06af5b1..da6aa2a 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -84,7 +84,7 @@ struct wined3d_settings wined3d_settings = PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ - FALSE, /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ + FALSE, /* Multisampling disabled by default. */ FALSE, /* No strict draw ordering. */ FALSE, /* Try to render onscreen by default. */ };

1 0

Henri Verbeet : wined3d: Get rid of the location fixup in surface_blt_fbo() .
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 3b478afd10031a39fb3b92c6506de04c4e69b8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b478afd10031a39fb3b92c65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:04:58 2011 +0200 wined3d: Get rid of the location fixup in surface_blt_fbo(). --- dlls/wined3d/surface.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 49dbc68..ec3cf20 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1207,11 +1207,6 @@ static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREF break; } - if (src_location == SFLAG_INDRAWABLE && surface_is_offscreen(src_surface)) - src_location = SFLAG_INTEXTURE; - if (dst_location == SFLAG_INDRAWABLE && surface_is_offscreen(dst_surface)) - dst_location = SFLAG_INTEXTURE; - /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. (And is * in fact harmful if we're being called by surface_load_location() with

1 0

Henri Verbeet : wined3d: Get rid of the location fixup for ORM_FBO in surface_modify_location().
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: eac640532da26841b1ac41d01823c00270cc6376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac640532da26841b1ac41d01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:04:57 2011 +0200 wined3d: Get rid of the location fixup for ORM_FBO in surface_modify_location(). --- dlls/wined3d/surface.c | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c880e6e..49dbc68 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5793,20 +5793,9 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO TRACE("surface %p, location %s, persistent %#x.\n", surface, debug_surflocation(location), persistent); - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if (surface_is_offscreen(surface)) - { - /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same - * for offscreen targets. */ - if (location & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) - location |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); - } - else - { - TRACE("Surface %p is an onscreen surface.\n", surface); - } - } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface) + && (location & SFLAG_INDRAWABLE)) + ERR("Trying to invalidate the SFLAG_INDRAWABLE location of an offscreen surface.\n"); if (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) && gl_info->supported[EXT_TEXTURE_SRGB_DECODE])

1 0

Henri Verbeet : wined3d: Get rid of the location fixup for ORM_FBO in surface_load_location().
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 68a5305dfd6708045d72d7af0ecba2b778c349e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a5305dfd6708045d72d7af0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:04:56 2011 +0200 wined3d: Get rid of the location fixup for ORM_FBO in surface_load_location(). --- dlls/wined3d/surface.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 75e39fc..c880e6e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5908,6 +5908,12 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, UINT byte_count; BYTE *mem; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface)) + { + ERR("Trying to load offscreen surface into SFLAG_INDRAWABLE.\n"); + return WINED3DERR_INVALIDCALL; + } + if (wined3d_settings.rendertargetlock_mode == RTL_READTEX) surface_load_location(surface, SFLAG_INTEXTURE, NULL); @@ -6140,7 +6146,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c { struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - BOOL in_fbo = FALSE; HRESULT hr; TRACE("surface %p, location %s, rect %s.\n", surface, debug_surflocation(location), wine_dbgstr_rect(rect)); @@ -6161,22 +6166,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c } } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if (surface_is_offscreen(surface)) - { - /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same - * for offscreen targets. Prefer SFLAG_INTEXTURE. */ - if (location == SFLAG_INDRAWABLE) - location = SFLAG_INTEXTURE; - in_fbo = TRUE; - } - else - { - TRACE("Surface %p is an onscreen surface.\n", surface); - } - } - if (location == SFLAG_INSRGBTEX && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) location = SFLAG_INTEXTURE; @@ -6231,12 +6220,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c surface_evict_sysmem(surface); } - if (in_fbo && (surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) - { - /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ - surface->flags |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); - } - if (surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) {

1 0