Henri Verbeet : wined3d: Get rid of surface_bind().
Alexandre Julliard
julliard at winehq.org
Thu Nov 21 14:07:46 CST 2013
Module: wine
Branch: master
Commit: 2e63e8f9cca29ffbdf418cca6e137c5b5c110418
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e63e8f9cca29ffbdf418cca6e137c5b5c110418
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Nov 21 00:10:19 2013 +0100
wined3d: Get rid of surface_bind().
---
dlls/wined3d/surface.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index a339f02..a3877ce 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -595,14 +595,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface)
}
/* Context activation is done by the caller. */
-static void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb)
-{
- TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb);
-
- wined3d_texture_bind(surface->container, context, srgb);
-}
-
-/* Context activation is done by the caller. */
static void surface_bind_and_dirtify(struct wined3d_surface *surface,
struct wined3d_context *context, BOOL srgb)
{
@@ -621,7 +613,7 @@ static void surface_bind_and_dirtify(struct wined3d_surface *surface,
if (active_sampler != WINED3D_UNMAPPED_STAGE)
context_invalidate_state(context, STATE_SAMPLER(active_sampler));
- surface_bind(surface, context, srgb);
+ wined3d_texture_bind(surface->container, context, srgb);
}
static void surface_force_reload(struct wined3d_surface *surface)
@@ -2083,7 +2075,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
surface_prepare_texture(dst_surface, context, FALSE);
else
surface_load_location(dst_surface, SFLAG_INTEXTURE);
- surface_bind(dst_surface, context, FALSE);
+ wined3d_texture_bind(dst_surface->container, context, FALSE);
data.buffer_object = src_surface->pbo;
data.addr = src_surface->resource.allocatedMemory;
More information about the wine-cvs
mailing list