On 08.06.2015 10:01, Sergey Isakov wrote:
It is hard to distill what part of codes comes from where. My patches depends on previous patches and so they must be included too. OK, all copylefts must be included if I will know how to do this. If Christian Costa will say what to do I will do this.
Sure, let's hear his opinion.
On 08.06.2015, at 9:43, Nikolay Sivov wrote:
On 07.06.2015 23:02, Sergey Isakov wrote:
I decided to improve builtin d3dx9_36 library with support of more file formats, texture formats, volume textures.
It's not your work though, it looks to me like 3 or so patches from Christian Costa squashed together. Why didn't you mention it?
Hi Sergey,
He are my wine-staging patches you included in your patches:
Patch 1: - d3dx9_36: Align texture dimensions to block size for compressed textures in D3DXCheckTextureRequirements. - d3dx9_36: Add support for FOURCC surface to save_dds_surface_to_memory - d3dx9_36: Fix several issues in save_dds_surface_to_memory. - d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds file.
Patch 2: - d3dx9_36: Add dxtn support.
It seems also that patch 2 uses some code from Michael Muller's patches and it seems you intend to use them for the dxtn conversion in wined3d. - wined3d: Add support for DXTn software decoding through libtxc_dxtn. [rev 3] - wined3d: add DXT1 to B4G4R4A4, DXT1 to B5G5R5A1 and DXT3 to B4G4R4A4 conversion. - wined3d: Improve DXTn support and export conversion functions for d3dx9_36.
When using code from others, you need to mention its origin and and add the proper references to the authors. Moreover, you squashed different changes into single patches while the rule is to have one patch per change. I would like also the granularity of my patches to be kept. This is much better to discuss how to upstream these patches with the authors at #wine-staging. Note that before doing some DXTN work you should first implement the low level functions based on libtxc_dxtn and make sure they can be accepted (wined3d exports, legal issue, ...).
Christian
2015-06-08 9:09 GMT+02:00 Nikolay Sivov bunglehead@gmail.com:
On 08.06.2015 10:01, Sergey Isakov wrote:
It is hard to distill what part of codes comes from where. My patches depends on previous patches and so they must be included too. OK, all copylefts must be included if I will know how to do this. If Christian Costa will say what to do I will do this.
Sure, let's hear his opinion.
On 08.06.2015, at 9:43, Nikolay Sivov wrote:
On 07.06.2015 23:02, Sergey Isakov wrote:
I decided to improve builtin d3dx9_36 library with support of more file formats, texture formats, volume textures.
It's not your work though, it looks to me like 3 or so patches from Christian Costa squashed together. Why didn't you mention it?
Hi Christian, I am fully agree with you that I have to mention all contributors for this work. There is just a little problem for me is how to divide and rebase my sources to be applied to... to what? Currently I modified wine-stage sources and then make diff related to wine-hq. Then I extract only hunks related to the topic. I checked it can be applied. Wine-stage exists as patches not as complete sources and I can't do diff related to it. Also I don't know what is mean "one patch for change". This is one change. I know what is one idea so why I made two patches for these two ideas. About libtxc_dxtn I already did the job to embed them into wined3d by sources. If you want I can show how. So
- wined3d: Add support for DXTn software decoding through libtxc_dxtn. [rev 3]
-- The library is not linked. It compiled inside.
- wined3d: add DXT1 to B4G4R4A4, DXT1 to B5G5R5A1 and DXT3 to B4G4R4A4 conversion.
-- Only conversion to and from A8B8G8R8 used.
- wined3d: Improve DXTn support
-- On the way. There is no in my commit.
and export conversion functions for d3dx9_36.
-- Currently I commit this as a stub. (return NULL;)
About patch1 I shown many lacks in existing procedures. I corrected them, add missing and tested. OK, let divide on several pieces what is what, who made this, and how to join or split them.
If anybody help me to do the work I will be very thankful.
Anyway. Is there any movements to convince wine developer to accept DXTn support into mainstream? Is there anybody consults with justice? AFAIK there is no problem for wine to support DXTn. It is a problem for Game developer to create such textures while wine is allowed to interpret any input.
Also it will be OK for me if this patchset will be accepted into stage because it depends on it. I just can't understand how to make diff in this case.
Yours, Sergey
On 08.06.2015, at 12:48, Christian Costa wrote:
Hi Sergey,
He are my wine-staging patches you included in your patches:
Patch 1:
- d3dx9_36: Align texture dimensions to block size for compressed textures in D3DXCheckTextureRequirements.
- d3dx9_36: Add support for FOURCC surface to save_dds_surface_to_memory
- d3dx9_36: Fix several issues in save_dds_surface_to_memory.
- d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds file.
Patch 2:
- d3dx9_36: Add dxtn support.
It seems also that patch 2 uses some code from Michael Muller's patches and it seems you intend to use them for the dxtn conversion in wined3d.
- wined3d: Add support for DXTn software decoding through libtxc_dxtn. [rev 3]
- wined3d: add DXT1 to B4G4R4A4, DXT1 to B5G5R5A1 and DXT3 to B4G4R4A4 conversion.
- wined3d: Improve DXTn support and export conversion functions for d3dx9_36.
When using code from others, you need to mention its origin and and add the proper references to the authors. Moreover, you squashed different changes into single patches while the rule is to have one patch per change. I would like also the granularity of my patches to be kept. This is much better to discuss how to upstream these patches with the authors at #wine-staging. Note that before doing some DXTN work you should first implement the low level functions based on libtxc_dxtn and make sure they can be accepted (wined3d exports, legal issue, ...).
Christian
2015-06-08 9:09 GMT+02:00 Nikolay Sivov bunglehead@gmail.com: On 08.06.2015 10:01, Sergey Isakov wrote: It is hard to distill what part of codes comes from where. My patches depends on previous patches and so they must be included too. OK, all copylefts must be included if I will know how to do this. If Christian Costa will say what to do I will do this.
Sure, let's hear his opinion.
On 08.06.2015, at 9:43, Nikolay Sivov wrote:
On 07.06.2015 23:02, Sergey Isakov wrote: I decided to improve builtin d3dx9_36 library with support of more file formats, texture formats, volume textures.
It's not your work though, it looks to me like 3 or so patches from Christian Costa squashed together. Why didn't you mention it?
2015-06-08 13:06 GMT+02:00 Sergey Isakov isakov-sl@bk.ru:
Hi Christian, I am fully agree with you that I have to mention all contributors for this work. There is just a little problem for me is how to divide and rebase my sources to be applied to... to what? Currently I modified wine-stage sources and then make diff related to wine-hq. Then I extract only hunks related to the topic. I checked it can be applied. Wine-stage exists as patches not as complete sources and I can't do diff related to it.
To manage patchset I suggest to use stacked-git or similar tools and import the needed patches from wine-staging.
Also I don't know what is mean "one patch for change". This is one change.
I know what is one idea so why I made two patches for these two ideas.
Use a smaller granularity for your patches as I did. "one patch per change" means "don't use one patch for unrelated changes". Fixing alignment in D3DXCheckTextureRequirements is not the same as "Fix several issues in save_dds_surface_to_memory" which is not the same as the other patches. You will be asked to do that anyway as this is needed to ease review and have patches applied.
About libtxc_dxtn I already did the job to embed them into wined3d by sources. If you want I can show how. So
- wined3d: Add support for DXTn software decoding through libtxc_dxtn. [rev 3]
-- The library is not linked. It compiled inside.
- wined3d: add DXT1 to B4G4R4A4, DXT1 to B5G5R5A1 and DXT3 to B4G4R4A4 conversion.
-- Only conversion to and from A8B8G8R8 used.
- wined3d: Improve DXTn support
-- On the way. There is no in my commit.
and export conversion functions for d3dx9_36.
-- Currently I commit this as a stub. (return NULL;)
About patch1 I shown many lacks in existing procedures. I corrected them, add missing and tested. OK, let divide on several pieces what is what, who made this, and how to join or split them.
If anybody help me to do the work I will be very thankful.
I'm from wine-staging so it's better to see with winehq guys. You may consider integrating your changes in wine-staging first if you like and them into pure wine then. This way you can improve you patches and don't bother with the wine-staging patches you base your work on so your work have better chance to be accepted in pure wine afterwards.
Anyway. Is there any movements to convince wine developer to accept DXTn support into mainstream? Is there anybody consults with justice?
I don't know their position about that. There were some use of libtxc_dxtn in the past but removed afterwards. This may be for legal reason or not. The best thing is to ask them.
AFAIK there is no problem for wine to support DXTn. It is a problem for Game developer to create such textures while wine is allowed to interpret any input.
Not sure I understand but yeah DXTn is needed.
Also it will be OK for me if this patchset will be accepted into stage because it depends on it. I just can't understand how to make diff in this case.
You mean wine-staging? If so see above.
Christian
Yours, Sergey
On 08.06.2015, at 12:48, Christian Costa wrote:
Hi Sergey,
He are my wine-staging patches you included in your patches:
Patch 1:
- d3dx9_36: Align texture dimensions to block size for compressed textures in D3DXCheckTextureRequirements.
- d3dx9_36: Add support for FOURCC surface to save_dds_surface_to_memory
- d3dx9_36: Fix several issues in save_dds_surface_to_memory.
- d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds file.
Patch 2:
- d3dx9_36: Add dxtn support.
It seems also that patch 2 uses some code from Michael Muller's patches and it seems you intend to use them for the dxtn conversion in wined3d.
- wined3d: Add support for DXTn software decoding through libtxc_dxtn. [rev 3]
- wined3d: add DXT1 to B4G4R4A4, DXT1 to B5G5R5A1 and DXT3 to B4G4R4A4 conversion.
- wined3d: Improve DXTn support and export conversion functions for d3dx9_36.
When using code from others, you need to mention its origin and and add the proper references to the authors. Moreover, you squashed different changes into single patches while the rule is to have one patch per change. I would like also the granularity of my patches to be kept. This is much better to discuss how to upstream these patches with the authors at #wine-staging. Note that before doing some DXTN work you should first implement the low level functions based on libtxc_dxtn and make sure they can be accepted (wined3d exports, legal issue, ...).
Christian
2015-06-08 9:09 GMT+02:00 Nikolay Sivov bunglehead@gmail.com:
On 08.06.2015 10:01, Sergey Isakov wrote:
It is hard to distill what part of codes comes from where. My patches depends on previous patches and so they must be included too. OK, all copylefts must be included if I will know how to do this. If Christian Costa will say what to do I will do this.
Sure, let's hear his opinion.
On 08.06.2015, at 9:43, Nikolay Sivov wrote:
On 07.06.2015 23:02, Sergey Isakov wrote:
I decided to improve builtin d3dx9_36 library with support of more file formats, texture formats, volume textures.
It's not your work though, it looks to me like 3 or so patches from Christian Costa squashed together. Why didn't you mention it?
-
Christian Costa -
Nikolay Sivov -
Sergey Isakov