Francois Gouget : wined3d: Make some surface functions static.
Alexandre Julliard
julliard at winehq.org
Tue Jun 12 13:36:32 CDT 2012
Module: wine
Branch: master
Commit: 4f17081652ca3022d77543d0ceef080847342511
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f17081652ca3022d77543d0ceef080847342511
Author: Francois Gouget <fgouget at free.fr>
Date: Tue Jun 12 10:24:18 2012 +0200
wined3d: Make some surface functions static.
---
dlls/wined3d/surface.c | 6 +++---
dlls/wined3d/wined3d_private.h | 4 ----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 890d0de..e479486 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -591,7 +591,7 @@ static void surface_evict_sysmem(struct wined3d_surface *surface)
}
/* Context activation is done by the caller. */
-void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb)
+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);
@@ -1795,7 +1795,7 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win
surface->flags &= ~SFLAG_PBO;
}
-BOOL surface_init_sysmem(struct wined3d_surface *surface)
+static BOOL surface_init_sysmem(struct wined3d_surface *surface)
{
if (!surface->resource.allocatedMemory)
{
@@ -2392,7 +2392,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi
}
}
-HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing,
+static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing,
struct wined3d_format *format, enum wined3d_conversion_type *conversion_type)
{
BOOL colorkey_active = need_alpha_ck && (surface->CKeyFlags & WINEDDSD_CKSRCBLT);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 6632f6e..4b5176d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2085,11 +2085,9 @@ static inline GLuint surface_get_texture_name(const struct wined3d_surface *surf
}
void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3d_box *dirty_rect) DECLSPEC_HIDDEN;
-void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
HRESULT surface_color_fill(struct wined3d_surface *s,
const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN;
GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN;
-BOOL surface_init_sysmem(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN;
BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN;
HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN;
@@ -2182,8 +2180,6 @@ enum wined3d_conversion_type
WINED3D_CT_CK_ARGB32,
};
-HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing,
- struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) DECLSPEC_HIDDEN;
void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN;
struct wined3d_vertex_declaration_element
More information about the wine-cvs
mailing list