wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

wined3d-1DTextures: 0006,0007,0008 fix compiling-2

Browse Source
This commit is contained in:
gloriouseggroll 2018-02-19 14:50:34 -05:00
parent 0fb2bacdac
commit 5978ff107d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/wined3d-1DTextures/0006-wined3d-Implement-uploading-for-1d-textures.patch
View File

@ -55,7 +55,7 @@ index 90c18e8..93b41e9 100644
+ update_w = box->right - box->left;
+ }
+
+ if (format->convert)
+ if (format->upload)
+ {
+ unsigned int dst_row_pitch;
+
@ -67,7 +67,7 @@ index 90c18e8..93b41e9 100644
+ dst_row_pitch = update_w * format->conv_byte_count;
+
+ converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_row_pitch);
+ format->convert(data->addr, converted_mem, row_pitch, slice_pitch, dst_row_pitch, dst_row_pitch, update_w, 1, 1);
+ format->upload(data->addr, converted_mem, row_pitch, slice_pitch, dst_row_pitch, dst_row_pitch, update_w, 1, 1);
+ mem = converted_mem;
+ }
+

4
patches/wined3d-1DTextures/0007-wined3d-Implement-loading-from-system-memory-and-buf.patch
View File

@ -33,10 +33,10 @@ index 93b41e9..c5a4f0c 100644
+ return TRUE;
+ }
+
+ if ((texture->resource.access_flags & required_access) != required_access)
+ if ((texture->resource.access & required_access) != required_access)
+ {
+ ERR("Operation requires %#x access, but 1d texture only has %#x.\n",
+ required_access, texture->resource.access_flags);
+ required_access, texture->resource.access);
+ return FALSE;
+ }
+

2
patches/wined3d-1DTextures/0008-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch
View File

@ -28,7 +28,7 @@ index c5a4f0c..198d2a6 100644
+
+ sub_resource = &texture->sub_resources[sub_resource_idx];
+
+ if (format->convert)
+ if (format->upload)
+ {
+ FIXME("Attempting to download a converted 1d texture, format %s.\n",
+ debug_d3dformat(format->id));