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
