Flattening of ddraw directory and renaming of files
Hi, I plan to flatten the ddraw directory and perform some files renaming in it. The changes I'm thinking about are in the attached file. If you have suggestions (or objections), let me know. If this is ok, I plan to submit the changes soon. Bye, Christian struct_convert.c \ convert.c -> ddraw_utils.c helper.c / d3dexecutebuffer.c -> executebuffer.c d3dmaterial.c -> material.c d3dvertexbuffer.c -> vertexbuffer.c main.c -> * regsvr.c -> * d3dcommon.c -> d3d_utils.c d3dlight.c -> light.c d3dtexture.c -> texture.c d3dviewport.c -> viewport.c mesa.c -> opengl.c d3d_private.h -> * ddcomimpl.h -> * ddraw_private.h -> * gl_api.h -> * gl_private.h -> * mesa_private.h -> opengl_private.h d3ddevice/main.c -> device_main.c d3ddevice/main.h -> device_main.h d3ddevice/mesa.c -> device_opengl.c dclipper/main.c -> clipper.c dclipper/main.h -> clipper.h ddraw/hal.c -> ddraw_hal.h ddraw/hal.h -> ddraw_hal.c ddraw/main.c -> ddraw_main.c ddraw/main.h -> ddraw_main.h ddraw/thunks.c -> ddraw_thunks.c ddraw/user.c -> ddraw_user.c ddraw/user.h -> ddraw_user.h direct3d/main.c -> direct3d_main.c direct3d/main.h -> direct3d_main.h direct3d/mesa.c -> direct3d_opengl.c dpalette/hal.c -> palette_hal.c dpalette/hal.h -> palette_hal.h dpalette/main.c -> palette_main.c dpalette/main.h -> palette_main.h dsurface/dib.c -> surface_dib.c dsurface/dib.h -> surface_dib.h dsurface/fakezbuffer.c -> surface_fakezbuffer.c dsurface/fakezbuffer.h -> surface_fakezbuffer.h dsurface/gamma.c -> surface_gamma.c dsurface/hal.c -> surface_hal.c dsurface/hal.h -> surface_hal.h dsurface/main.c -> surface_main.c dsurface/main.h -> surface_main.h dsurface/thunks.c -> surface_thunks.c dsurface/thunks.h -> surface_thunks.h dsurface/user.c -> surface_user.c dsurface/user.h -> surface_user.h dsurface/wndproc.c -> surface_wndproc.c dsurface/wndproc.h -> surface_wndproc.h Note: * = no change
On Sun, 08 May 2005 13:22:20 +0100, Christian Costa wrote:
I plan to flatten the ddraw directory and perform some files renaming in it. The changes I'm thinking about are in the attached file. If you have suggestions (or objections), let me know.
No objection, I'm just curious as to the rationale. Why is surface_hal.c? better than surface/hal.c? thanks -mike
Mike Hearn wrote:
On Sun, 08 May 2005 13:22:20 +0100, Christian Costa wrote:
I plan to flatten the ddraw directory and perform some files renaming in it. The changes I'm thinking about are in the attached file. If you have suggestions (or objections), let me know.
No objection, I'm just curious as to the rationale. Why is surface_hal.c? better than surface/hal.c?
1) This removes the directories hierarchy (which is not really necessary) 2) You don't have several files with the same name (there are 6 main.c, 3 hal.c,... and when there are all opened for editing, this begins to be a little confusing) Bye, Christian
Christian Costa <titan.costa(a)wanadoo.fr> writes:
I plan to flatten the ddraw directory and perform some files renaming in it.
The changes I'm thinking about are in the attached file.
If you have suggestions (or objections), let me know.
While you are at it, it would be nice to merge the header files. We really don't need one header for each source file. -- Alexandre Julliard julliard(a)winehq.org
Alexandre Julliard wrote:
Christian Costa <titan.costa(a)wanadoo.fr> writes:
I plan to flatten the ddraw directory and perform some files renaming in it.
The changes I'm thinking about are in the attached file.
If you have suggestions (or objections), let me know.
While you are at it, it would be nice to merge the header files. We really don't need one header for each source file.
Good idea! I will see how this can be done and send another proposal. Bye, Christian
Christian Costa wrote:
Hi,
I plan to flatten the ddraw directory and perform some files renaming in it.
The changes I'm thinking about are in the attached file.
If you have suggestions (or objections), let me know.
If this is ok, I plan to submit the changes soon.
My only concern is that this would make any large outstanding patches to this area practically unappliable. I'm thinking particularly of Oliver's (still-unsubmitted?) work. AFAIK CVS doesn't cleanly track renames so poor Oliver would have to manually reproduce all the file-shuffling before his branch would be mergable. --adam
Hi
My only concern is that this would make any large outstanding patches to this area practically unappliable. I'm thinking particularly of Oliver's (still-unsubmitted?) work. AFAIK CVS doesn't cleanly track renames so poor Oliver would have to manually reproduce all the file-shuffling before his branch would be mergable.
Oliver's patch only impact d3d8/d3d9/wined3d directories So Christian can play with ddraw without problems :) Anyway it will be interesting to keep history for future ddraw changes :)
--adam
Regards, Raphael
Raphael wrote:
Hi
My only concern is that this would make any large outstanding patches to this area practically unappliable. I'm thinking particularly of Oliver's (still-unsubmitted?) work. AFAIK CVS doesn't cleanly track renames so poor Oliver would have to manually reproduce all the file-shuffling before his branch would be mergable.
Oliver's patch only impact d3d8/d3d9/wined3d directories So Christian can play with ddraw without problems :)
Yup! :-)
Anyway it will be interesting to keep history for future ddraw changes :)
That's true. IIRC, it's not in the ddraw to do list. :-) Bye, Christian
Oliver's patch only impact d3d8/d3d9/wined3d directories So Christian can play with ddraw without problems :)
Yup! :-)
Anyway it will be interesting to keep history for future ddraw changes :)
That's true. IIRC, it's not in the ddraw to do list. :-)
OK, i'll add it to your wiki todo list now :)
Bye, Christian
Regards, Raphael
Hi, After Alexandre's suggestion about merging header files, here is a 2nd proposal. I was considering having a header for each ddraw object but I'm not sure this is usefull. So basically, I would keep only 3 headers apart from ddcomimpl.h, gl_api.h and gl_private.h : - ddraw_private.h for all ddraw objects - d3d_private.h for all d3d objects - opengl_private.h for opengl part of d3d objects You will find operations in the attached file. Let me know if it looks correct or not. Bye, Christian struct_convert.c \ convert.c -> ddraw_utils.c helper.c / d3dexecutebuffer.c -> executebuffer.c d3dmaterial.c -> material.c d3dvertexbuffer.c -> vertexbuffer.c main.c -> * regsvr.c -> * d3dcommon.c -> d3d_utils.c d3dlight.c -> light.c d3dtexture.c -> texture.c d3dviewport.c -> viewport.c mesa.c -> opengl.c d3ddevice/main.c -> device_main.c d3ddevice/mesa.c -> device_opengl.c dclipper/main.c -> clipper.c ddraw/hal.c -> ddraw_hal.c ddraw/main.c -> ddraw_main.c ddraw/thunks.c -> ddraw_thunks.c ddraw/user.c -> ddraw_user.c direct3d/main.c -> direct3d_main.c direct3d/mesa.c -> direct3d_opengl.c dpalette/hal.c -> palette_hal.c dpalette/main.c -> palette_main.c dsurface/dib.c -> surface_dib.c dsurface/fakezbuffer.c -> surface_fakezbuffer.c dsurface/gamma.c -> surface_gamma.c dsurface/hal.c -> surface_hal.c dsurface/main.c -> surface_main.c dsurface/thunks.c -> surface_thunks.c dsurface/user.c -> surface_user.c dsurface/wndproc.c -> surface_wndproc.c ddcomimpl.h -> * gl_api.h -> * gl_private.h -> * mesa_private.h -> opengl_private.h d3ddevice/main.h \ d3d_private.h -> d3d_private.h direct3d/main.h / ddraw_private.h \ dclipper/main.h -> ddraw_private.h ddraw/hal.h | ddraw/main.h | ddraw/user.h | dpalette/hal.h | dpalette/main.h | dsurface/dib.h | dsurface/fakezbuffer.h | dsurface/hal.h | dsurface/main.h | dsurface/thunks.h | dsurface/user.h | dsurface/wndproc.h / Note: * = no change
participants (5)
-
Adam D. Moss -
Alexandre Julliard -
Christian Costa -
Mike Hearn -
Raphael