Henri Verbeet : wined3d: Surfaces always have a container in surface_internal_preload().
Alexandre Julliard
julliard at winehq.org
Tue Nov 19 13:28:35 CST 2013
Module: wine
Branch: master
Commit: 57292f94987e5dacad0d1458731b41e12e1d58a6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=57292f94987e5dacad0d1458731b41e12e1d58a6
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Nov 19 10:28:47 2013 +0100
wined3d: Surfaces always have a container in surface_internal_preload().
---
dlls/wined3d/surface.c | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 2999e62..20b5c5f 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3635,29 +3635,11 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined
void surface_internal_preload(struct wined3d_surface *surface,
struct wined3d_context *context, enum WINED3DSRGB srgb)
{
- TRACE("iface %p, srgb %#x.\n", surface, srgb);
-
- if (surface->container)
- {
- struct wined3d_texture *texture = surface->container;
-
- TRACE("Passing to container (%p).\n", texture);
- texture->texture_ops->texture_preload(texture, context, srgb);
- }
- else
- {
- TRACE("(%p) : About to load surface\n", surface);
+ struct wined3d_texture *texture = surface->container;
- surface_load(surface, srgb == SRGB_SRGB);
+ TRACE("iface %p, srgb %#x.\n", surface, srgb);
- if (surface->resource.pool == WINED3D_POOL_DEFAULT)
- {
- /* Tell opengl to try and keep this texture in video ram (well mostly) */
- GLclampf tmp;
- tmp = 0.9f;
- context->gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &surface->texture_name, &tmp);
- }
- }
+ texture->texture_ops->texture_preload(texture, context, srgb);
}
/* Read the framebuffer back into the surface */
More information about the wine-cvs
mailing list