Commit 32e46a98 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Get rid of the "device" parameter to context_bind_dummy_textures().

parent 2769bb1e
...@@ -1743,7 +1743,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC ...@@ -1743,7 +1743,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC
} }
/* Context activation is done by the caller. */ /* Context activation is done by the caller. */
void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) void context_bind_dummy_textures(const struct wined3d_context *context)
{ {
const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; const struct wined3d_dummy_textures *textures = &context->device->dummy_textures;
const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_gl_info *gl_info = context->gl_info;
...@@ -2287,7 +2287,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, ...@@ -2287,7 +2287,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context,
* are not created yet. In that case, they will be created (and bound) by * are not created yet. In that case, they will be created (and bound) by
* create_dummy_textures right after this context is initialized. */ * create_dummy_textures right after this context is initialized. */
if (device->dummy_textures.tex_2d) if (device->dummy_textures.tex_2d)
context_bind_dummy_textures(device, context); context_bind_dummy_textures(context);
/* Initialise all rectangles to avoid resetting unused ones later. */ /* Initialise all rectangles to avoid resetting unused ones later. */
gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0);
......
...@@ -738,7 +738,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ ...@@ -738,7 +738,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_
checkGLcall("create dummy textures"); checkGLcall("create dummy textures");
context_bind_dummy_textures(device, context); context_bind_dummy_textures(context);
} }
/* Context activation is done by the caller. */ /* Context activation is done by the caller. */
......
...@@ -2156,8 +2156,7 @@ void context_apply_ffp_blit_state(struct wined3d_context *context, ...@@ -2156,8 +2156,7 @@ void context_apply_ffp_blit_state(struct wined3d_context *context,
void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info,
unsigned int unit) DECLSPEC_HIDDEN; unsigned int unit) DECLSPEC_HIDDEN;
void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN;
void context_bind_dummy_textures(const struct wined3d_device *device, void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN;
const struct wined3d_context *context) DECLSPEC_HIDDEN;
void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN; void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN;
void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN;
void context_copy_bo_address(struct wined3d_context *context, void context_copy_bo_address(struct wined3d_context *context,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment