Henri Verbeet : wined3d: Upload texture data through the texture ops in wined3d_cs_exec_update_sub_resource ().
Alexandre Julliard
julliard at winehq.org
Tue Jun 11 16:54:06 CDT 2019
Module: wine
Branch: master
Commit: f6b533700aea79ff42f76ec7750bf31b1532611f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6b533700aea79ff42f76ec7750bf31b1532611f
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Jun 11 01:03:30 2019 +0430
wined3d: Upload texture data through the texture ops in wined3d_cs_exec_update_sub_resource().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/cs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index a95ba50..05d3903 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -2340,11 +2340,11 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi
wined3d_texture_prepare_texture(texture, context, FALSE);
else
wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB);
- wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), FALSE);
wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front);
- wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, &src_box,
- &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front, FALSE);
+ texture->texture_ops->texture_upload_data(context, &addr, texture->resource.format, &src_box,
+ op->data.row_pitch, op->data.slice_pitch, texture, op->sub_resource_idx,
+ WINED3D_LOCATION_TEXTURE_RGB, box->left, box->top, box->front);
wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB);
wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB);
More information about the wine-cvs
mailing list