ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Make some surface functions static.

This commit is contained in:
Francois Gouget 2012-06-12 10:24:18 +02:00 committed by Alexandre Julliard
parent 9a874aca8e
commit 4f17081652
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/surface.c
View File

@ -591,7 +591,7 @@ static void surface_evict_sysmem(struct wined3d_surface *surface)
} }
/* Context activation is done by the caller. */ /* 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); 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; 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) 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) struct wined3d_format *format, enum wined3d_conversion_type *conversion_type)
{ {
BOOL colorkey_active = need_alpha_ck && (surface->CKeyFlags & WINEDDSD_CKSRCBLT); BOOL colorkey_active = need_alpha_ck && (surface->CKeyFlags & WINEDDSD_CKSRCBLT);

4
dlls/wined3d/wined3d_private.h
View File

@ -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_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, HRESULT surface_color_fill(struct wined3d_surface *s,
const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN;
GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) 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; void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN;
BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN;
HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) 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, 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; void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN;
struct wined3d_vertex_declaration_element struct wined3d_vertex_declaration_element